From ba0af727dcb7815f3fa15503ff0379ca9409a054 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Mon, 28 Sep 2020 10:31:00 -0400
Subject: [PATCH] refactor: add funciton to change the username instead of
 using a global

---
 ui/app/AppLayouts/Chat/components/NicknamePopup.qml | 8 +++++---
 ui/app/AppLayouts/Chat/components/ProfilePopup.qml  | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/components/NicknamePopup.qml b/ui/app/AppLayouts/Chat/components/NicknamePopup.qml
index 1ad6a6eb05..c39ad4f7dc 100644
--- a/ui/app/AppLayouts/Chat/components/NicknamePopup.qml
+++ b/ui/app/AppLayouts/Chat/components/NicknamePopup.qml
@@ -10,6 +10,8 @@ ModalPopup {
     property int nicknameLength: nicknameInput.textField.text.length
     readonly property int maxNicknameLength: 32
     property bool nicknameTooLong: nicknameLength > maxNicknameLength
+    property var changeUsername: function () {}
+    property var changeNickname: function () {}
 
     id: popup
     width: 400
@@ -91,12 +93,12 @@ ModalPopup {
                 // Change username title only if it was not an ENS name
                  if (nicknameInput.textField.text === "") {
                      // If we removed the nickname, go back to showing the alias
-                     userName = alias
+                     popup.changeUsername(alias)
                  } else {
-                     userName = nicknameInput.textField.text
+                     popup.changeUsername(nicknameInput.textField.text)
                  }
             }
-            nickname = nicknameInput.textField.text
+            popup.changeNickname(nicknameInput.textField.text)
             profileModel.changeContactNickname(fromAuthor, nicknameInput.textField.text)
             popup.close()
         }
diff --git a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
index dbaece3fb5..7d0eb976b4 100644
--- a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
+++ b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
@@ -305,6 +305,12 @@ ModalPopup {
 
         NicknamePopup {
             id: nicknamePopup
+            changeUsername: function (newUsername) {
+                popup.userName = newUsername
+            }
+            changeNickname: function (newNickname) {
+                popup.nickname = newNickname
+            }
         }
     }