From 3218dc0211ac717230fe03fad82681a626d968b5 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Mon, 23 Dec 2019 16:54:19 +0100
Subject: [PATCH] Improve account setup success screen

---
 main/data/manage_accounts/add_account_dialog.ui     | 6 +++---
 main/src/ui/manage_accounts/add_account_dialog.vala | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/data/manage_accounts/add_account_dialog.ui b/main/data/manage_accounts/add_account_dialog.ui
index f96a168f..ad141b4a 100644
--- a/main/data/manage_accounts/add_account_dialog.ui
+++ b/main/data/manage_accounts/add_account_dialog.ui
@@ -520,10 +520,9 @@
                                         <child>
                                             <object class="GtkBox" id="success_box">
                                                 <property name="margin">50</property>
-                                                <property name="margin-top">5</property>
-                                                <property name="margin-bottom">5</property>
+                                                <property name="margin-top">10</property>
+                                                <property name="margin-bottom">10</property>
                                                 <property name="orientation">vertical</property>
-                                                <property name="spacing">10</property>
                                                 <property name="valign">center</property>
                                                 <property name="visible">True</property>
                                                 <child>
@@ -560,6 +559,7 @@
                                                         <property name="xalign">0.5</property>
                                                         <property name="yalign">0.5</property>
                                                         <property name="use-markup">True</property>
+                                                        <property name="justify">center</property>
                                                         <property name="visible">True</property>
                                                         <style>
                                                             <class name="dim-label"/>
diff --git a/main/src/ui/manage_accounts/add_account_dialog.vala b/main/src/ui/manage_accounts/add_account_dialog.vala
index 5dd6621b..459e91d3 100644
--- a/main/src/ui/manage_accounts/add_account_dialog.vala
+++ b/main/src/ui/manage_accounts/add_account_dialog.vala
@@ -191,7 +191,7 @@ public class AddAccountDialog : Gtk.Dialog {
         animate_window_resize(register_box);
     }
 
-    private void show_success() {
+    private void show_success(Account account) {
         success_box.visible = true;
         stack.visible_child_name = "success";
         sign_in_jid_box.visible = false;
@@ -199,7 +199,7 @@ public class AddAccountDialog : Gtk.Dialog {
         sign_in_password_box.visible = false;
         create_account_box.visible = false;
         register_box.visible = false;
-        success_description.label = _("You can now start using %s").printf("<b>" + Markup.escape_text(jid_entry.text) + "</b>");
+        success_description.label = _("You can now start using %s").printf("<b>" + Markup.escape_text(account.bare_jid.to_string()) + "</b>");
 
         set_default(success_continue_button);
     }
@@ -261,7 +261,7 @@ public class AddAccountDialog : Gtk.Dialog {
             }
         } else {
             add_activate_account(account);
-            show_success();
+            show_success(account);
         }
     }
 
@@ -343,7 +343,7 @@ public class AddAccountDialog : Gtk.Dialog {
             }
             Account account = new Account(new Jid.components(username, server_jid.domainpart, null), null, password, null);
             add_activate_account(account);
-            show_success();
+            show_success(account);
         } else {
             display_notification(error);
         }