From 684a1ce913863dff7d958e9be7a5f30e2418d67e Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Mon, 4 Apr 2022 12:55:56 -0400
Subject: [PATCH] fix(wallet-emoji): fix wallet emoji save by only saving the
 utf char

Fixes #5161
---
 .../Chat/popups/community/CreateChannelPopup.qml       |  8 +-------
 ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml    | 10 ++++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
index 3b47a4b06c..f78a901a74 100644
--- a/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
@@ -23,7 +23,6 @@ StatusModal {
     property string channelColor: ""
     property bool emojiPopupOpened: false
     property var emojiPopup: null
-    readonly property string emojiRegexStr: 'alt="(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])"'
     readonly property var communityColorValidator: Utils.Validate.NoEmpty
                                                    | Utils.Validate.TextHexColor
 
@@ -279,12 +278,7 @@ StatusModal {
                     return
                 }
                 let error = "";
-                let emoji =  popup.contentItem.channelName.input.icon.emoji
-                // Extract the UTF emoji from the `img` tag so that we only store the emoi and not the full image
-                const found = RegExp(emojiRegexStr, 'g').exec(emoji);
-                if (found) {
-                    emoji = found[1]
-                }
+                let emoji =  StatusQUtils.Emoji.deparseFromParse(popup.contentItem.channelName.input.icon.emoji)
 
                 if (!isEdit) {
                     //popup.contentItem.communityColor.color.toString().toUpperCase()
diff --git a/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml b/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
index 8427da3d27..52686a792f 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
@@ -187,24 +187,26 @@ StatusModal {
                     return loading = false
                 }
 
+                let emoji =  StatusQUtils.Emoji.deparseFromParse(accountNameInput.input.icon.emoji)
+
                 var errMessage = ""
                 if(advancedSelection.expandableItem) {
                     switch(advancedSelection.expandableItem.addAccountType) {
                     case AdvancedAddAccountView.AddAccountType.GenerateNew:
-                        errMessage = RootStore.generateNewAccount(passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, accountNameInput.input.icon.emoji)
+                        errMessage = RootStore.generateNewAccount(passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, emoji)
                         break
                     case AdvancedAddAccountView.AddAccountType.ImportSeedPhrase:
-                        errMessage = RootStore.addAccountsFromSeed(advancedSelection.expandableItem.mnemonicText, passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, accountNameInput.input.icon.emoji)
+                        errMessage = RootStore.addAccountsFromSeed(advancedSelection.expandableItem.mnemonicText, passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, emoji)
                         break
                     case AdvancedAddAccountView.AddAccountType.ImportPrivateKey:
-                        errMessage = RootStore.addAccountsFromPrivateKey(advancedSelection.expandableItem.privateKey, passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, accountNameInput.input.icon.emoji)
+                        errMessage = RootStore.addAccountsFromPrivateKey(advancedSelection.expandableItem.privateKey, passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, emoji)
                         break
                     case AdvancedAddAccountView.AddAccountType.WatchOnly:
                         errMessage = RootStore.addWatchOnlyAccount(advancedSelection.expandableItem.watchAddress, accountNameInput.text, colorSelectionGrid.selectedColor, accountNameInput.input.icon.emoji)
                         break
                     }
                 } else {
-                    errMessage = RootStore.generateNewAccount(passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, accountNameInput.input.icon.emoji)
+                    errMessage = RootStore.generateNewAccount(passwordInput.text, accountNameInput.text, colorSelectionGrid.selectedColor, emoji)
                 }
 
                 loading = false