From 85b0d802622afbfbfffd161ed5437f79779e8fbf Mon Sep 17 00:00:00 2001
From: Alexander Zaytsev <nqst@users.noreply.github.com>
Date: Mon, 26 Jan 2026 16:29:03 +0100
Subject: [PATCH 1/6] Adjust dialog transition styles

---
 app/assets/stylesheets/dialog.css | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/dialog.css b/app/assets/stylesheets/dialog.css
index 1336cad9b7..97f2e7a769 100644
--- a/app/assets/stylesheets/dialog.css
+++ b/app/assets/stylesheets/dialog.css
@@ -7,17 +7,16 @@
   :is(.dialog) {
     border: 0;
     opacity: 0;
-    transform: scale(0.2);
-    transform-origin: top center;
-    transition: var(--dialog-duration) allow-discrete;
-    transition-property: display, opacity, overlay, transform;
+    transform: scale(0.9);
+    transform-origin: center;
+    transition: var(--dialog-duration) ease-out allow-discrete;
+    transition-property: opacity, overlay, transform;
 
     &::backdrop {
       background-color: var(--color-black);
-      opacity: 0;
-      transform: scale(1);
-      transition: var(--dialog-duration) allow-discrete;
-      transition-property: display, opacity, overlay;
+      opacity: 0.4;
+      transition: var(--dialog-duration) ease-out allow-discrete;
+      transition-property: opacity, overlay;
     }
 
     &[open] {
@@ -32,11 +31,11 @@
     @starting-style {
       &[open] {
         opacity: 0;
-        transform: scale(0.2);
+        transform: scale(0.9);
       }
 
       &[open]::backdrop {
-        opacity: 0;
+        opacity: 0.4;
       }
     }
   }

From 0d4f4c831e7f27e605ef1d507863d4be2ac7522c Mon Sep 17 00:00:00 2001
From: Alexander Zaytsev <nqst@users.noreply.github.com>
Date: Mon, 26 Jan 2026 21:54:01 +0100
Subject: [PATCH 2/6] Make QR dialogs smaller on desktop

---
 app/views/account/join_codes/show.html.erb | 2 +-
 app/views/users/_transfer.html.erb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb
index f3cfb1e377..ffde42a4f5 100644
--- a/app/views/account/join_codes/show.html.erb
+++ b/app/views/account/join_codes/show.html.erb
@@ -39,7 +39,7 @@
         <span>Get QR code</span>
       <% end %>
 
-      <dialog class="dialog panel shadow" data-dialog-target="dialog">
+      <dialog class="dialog panel shadow" data-dialog-target="dialog" style="--panel-size: 50ch;">
         <p class="margin-none-block-start"><strong>Scan this code with the camera on your mobile device</strong></p>
 
         <%= qr_code_image(url) %>
diff --git a/app/views/users/_transfer.html.erb b/app/views/users/_transfer.html.erb
index 13f895ebc7..9e00cf9055 100644
--- a/app/views/users/_transfer.html.erb
+++ b/app/views/users/_transfer.html.erb
@@ -18,7 +18,7 @@
         <span class="for-screen-reader">Display auto-login QR code</span>
       <% end %>
 
-      <dialog class="dialog panel shadow" data-dialog-target="dialog">
+      <dialog class="dialog panel shadow" data-dialog-target="dialog" style="--panel-size: 50ch;">
         <%= qr_code_image(url) %>
 
         <form method="dialog" class="margin-block-start flex justify-center">

From 850762cd4eab3cfbfde6b7e8b5930eee588dfb83 Mon Sep 17 00:00:00 2001
From: Alexander Zaytsev <nqst@users.noreply.github.com>
Date: Mon, 26 Jan 2026 21:54:36 +0100
Subject: [PATCH 3/6] Replace `[x]` button with Done button

---
 app/views/users/_transfer.html.erb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_transfer.html.erb b/app/views/users/_transfer.html.erb
index 9e00cf9055..c67949ec91 100644
--- a/app/views/users/_transfer.html.erb
+++ b/app/views/users/_transfer.html.erb
@@ -22,9 +22,8 @@
         <%= qr_code_image(url) %>
 
         <form method="dialog" class="margin-block-start flex justify-center">
-          <button class="btn" data-controller="tooltip">
-            <%= icon_tag "remove" %>
-            <span class="for-screen-reader">Close dialog</span>
+          <button class="btn">
+            <span>Done</span>
           </button>
         </form>
       </dialog>

From 09f9b7fb4561293fa4b14fd57c1925e6f4546b66 Mon Sep 17 00:00:00 2001
From: Alexander Zaytsev <nqst@users.noreply.github.com>
Date: Mon, 26 Jan 2026 21:59:04 +0100
Subject: [PATCH 4/6] Adjust copy in QR code dialogs

---
 app/views/account/join_codes/show.html.erb | 2 +-
 app/views/users/_transfer.html.erb         | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb
index ffde42a4f5..ce7d479a20 100644
--- a/app/views/account/join_codes/show.html.erb
+++ b/app/views/account/join_codes/show.html.erb
@@ -40,7 +40,7 @@
       <% end %>
 
       <dialog class="dialog panel shadow" data-dialog-target="dialog" style="--panel-size: 50ch;">
-        <p class="margin-none-block-start"><strong>Scan this code with the camera on your mobile device</strong></p>
+        <p class="margin-none-block-start txt-balance"><strong>Scan this code to join <%= Current.account.name %>:</strong></p>
 
         <%= qr_code_image(url) %>
 
diff --git a/app/views/users/_transfer.html.erb b/app/views/users/_transfer.html.erb
index c67949ec91..4158605300 100644
--- a/app/views/users/_transfer.html.erb
+++ b/app/views/users/_transfer.html.erb
@@ -19,6 +19,10 @@
       <% end %>
 
       <dialog class="dialog panel shadow" data-dialog-target="dialog" style="--panel-size: 50ch;">
+        <p class="margin-none-block-start txt-balance">
+          <strong>Scan this code to instantly log in on another device:</strong>
+        </p>
+
         <%= qr_code_image(url) %>
 
         <form method="dialog" class="margin-block-start flex justify-center">
@@ -34,4 +38,4 @@
       <span class="for-screen-reader">Copy auto-login link</span>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>

From ea1b6830f400b8ac4ee664558d82dff581312a40 Mon Sep 17 00:00:00 2001
From: Alexander Zaytsev <nqst@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:23:33 +0100
Subject: [PATCH 5/6] Adjust animations, use explicit transition properties

---
 app/assets/stylesheets/dialog.css | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/dialog.css b/app/assets/stylesheets/dialog.css
index 97f2e7a769..22574979d8 100644
--- a/app/assets/stylesheets/dialog.css
+++ b/app/assets/stylesheets/dialog.css
@@ -7,35 +7,41 @@
   :is(.dialog) {
     border: 0;
     opacity: 0;
-    transform: scale(0.9);
+    transform: scale(0.85);
     transform-origin: center;
-    transition: var(--dialog-duration) ease-out allow-discrete;
-    transition-property: opacity, overlay, transform;
+    transition-behavior: allow-discrete;
+    transition-duration: calc(var(--dialog-duration) / 2); /* Faster closing */
+    transition-property: display, opacity, overlay, transform;
+    transition-timing-function: ease-out;
 
     &::backdrop {
       background-color: var(--color-black);
-      opacity: 0.4;
-      transition: var(--dialog-duration) ease-out allow-discrete;
-      transition-property: opacity, overlay;
+      opacity: 0;
+      transition-behavior: allow-discrete;
+      transition-duration: calc(var(--dialog-duration) / 2);
+      transition-property: display, opacity, overlay;
+      transition-timing-function: ease-out;
     }
 
     &[open] {
       opacity: 1;
       transform: scale(1);
+      transition-duration: var(--dialog-duration); /* Normal opening speed */
 
       &::backdrop {
         opacity: 0.5;
+        transition-duration: var(--dialog-duration);
       }
     }
 
     @starting-style {
       &[open] {
         opacity: 0;
-        transform: scale(0.9);
+        transform: scale(0.85);
       }
 
       &[open]::backdrop {
-        opacity: 0.4;
+        opacity: 0;
       }
     }
   }

From c1ac9d981e4f7dc4cc068346557f2ecf1270b7a5 Mon Sep 17 00:00:00 2001
From: Alexander Zaytsev <nqst@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:46:42 +0100
Subject: [PATCH 6/6] Format

---
 app/views/account/join_codes/show.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb
index ce7d479a20..aa7ed7d87a 100644
--- a/app/views/account/join_codes/show.html.erb
+++ b/app/views/account/join_codes/show.html.erb
@@ -40,7 +40,9 @@
       <% end %>
 
       <dialog class="dialog panel shadow" data-dialog-target="dialog" style="--panel-size: 50ch;">
-        <p class="margin-none-block-start txt-balance"><strong>Scan this code to join <%= Current.account.name %>:</strong></p>
+        <p class="margin-none-block-start txt-balance">
+          <strong>Scan this code to join <%= Current.account.name %>:</strong>
+        </p>
 
         <%= qr_code_image(url) %>