From b2ab3a455a2acb4ccb5caf4c2a57af6ee3bd9115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= <michalcieslak@status.im>
Date: Fri, 17 May 2024 16:34:25 +0200
Subject: [PATCH] feat(StatusLetterIdenticon): make
 useAcronymForLetterIdenticon mode charactersLen unaware

---
 .../Components/StatusLetterIdenticon.qml      | 20 ++++++++++++-------
 .../controls/SavedAddressesDelegate.qml       |  7 -------
 .../popups/AddEditSavedAddressPopup.qml       |  7 +------
 .../AppLayouts/Wallet/popups/ReceiveModal.qml |  8 +-------
 .../Wallet/popups/RemoveSavedAddressPopup.qml |  7 -------
 5 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml b/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml
index fa88696bd8..60a831f67b 100644
--- a/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml
+++ b/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml
@@ -13,6 +13,13 @@ Rectangle {
     property int letterSize: 21
     property int charactersLen: 1
     property color letterIdenticonColor: Theme.palette.miscColor5
+
+    // In this mode, one or two letters are used depending on words used:
+    // John -> J
+    // John Smith -> JS
+    // John Smith Junior -> JS
+    //
+    // characterLen is ignored
     property bool useAcronymForLetterIdenticon: false
     property bool strictBackgroundColor: !useAcronymForLetterIdenticon
 
@@ -57,19 +64,18 @@ Rectangle {
         }
 
         text: {
-            let parts = root.name.split(" ")
-            if (root.useAcronymForLetterIdenticon && parts.length > 1) {
-                let word = ""
-                for (let i=0; i<root.charactersLen; i++) {
-                    if (i >= parts.length) {
-                        return word
-                    }
+            const parts = root.name.split(" ")
 
+            if (root.useAcronymForLetterIdenticon) {
+                let word = ""
+
+                for (let i = 0; i < Math.min(parts.length, 2); i++) {
                     let shift = (parts[i].charAt(0) === "#") ||
                                 (parts[i].charAt(0) === "@")
 
                     word += parts[i].substring(shift, shift + 1).toUpperCase()
                 }
+
                 return word
             }
 
diff --git a/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml b/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml
index 740e7076ec..a44e75e13c 100644
--- a/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml
+++ b/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml
@@ -62,13 +62,6 @@ StatusListItem {
         width: 40
         height: 40
         color: Utils.getColorForId(root.colorId)
-        charactersLen: {
-            let parts = root.name.split(" ")
-            if (parts.length > 1) {
-                return 2
-            }
-            return 1
-        }
         isLetterIdenticon: true
         useAcronymForLetterIdenticon: true
     }
diff --git a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
index c320248de9..063bd3b514 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
@@ -563,12 +563,7 @@ StatusModal {
                             color: model.color
                             isLetterIdenticon: !model.icon
                             useAcronymForLetterIdenticon: model.type === AddEditSavedAddressPopup.CardType.SavedAddress
-                            charactersLen: {
-                                if (model.type === AddEditSavedAddressPopup.CardType.SavedAddress && model.title.split(" ").length == 1) {
-                                    return 1
-                                }
-                                return 2
-                            }
+                            charactersLen: 2
                         }
                     }
                 }
diff --git a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
index d200ed1d7e..6cc0539536 100644
--- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
@@ -231,13 +231,7 @@ StatusModal {
                         name: !root.selectedAccount.name && !root.selectedAccount.emoji? "status-logo-icon" : ""
                         color: !root.selectedAccount.name && !root.selectedAccount.emoji? "transparent" : Utils.getColorForId(root.selectedAccount.colorId)
                         emoji: root.selectedAccount.emoji
-                        charactersLen: {
-                            let parts = root.selectedAccount.name.split(" ")
-                            if (parts.length > 1) {
-                                return 2
-                            }
-                            return 1
-                        }
+                        charactersLen: 1
                         isLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji
                         useAcronymForLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji
                     }
diff --git a/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml
index e2dc8eac0b..cb0ab236a8 100644
--- a/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml
+++ b/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml
@@ -54,13 +54,6 @@ StatusDialog {
             name: root.name
             asset {
                 color: Utils.getColorForId(root.colorId)
-                charactersLen: {
-                    let parts = root.name.split(" ")
-                    if (parts.length > 1) {
-                        return 2
-                    }
-                    return 1
-                }
                 isLetterIdenticon: true
                 useAcronymForLetterIdenticon: true
             }