Merge branch 'develop' into yomo-1943

Emurgo · Oct 2, 2024 · 47c2127 · 47c2127
2 parents aa5cca0 + 83f4065
commit 47c2127
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 40 deletions.
diff --git a/apps/wallet-mobile/src/features/Settings/PrivacyMode/PrivacyMode.tsx b/apps/wallet-mobile/src/features/Settings/PrivacyMode/PrivacyMode.tsx
@@ -68,6 +68,6 @@ export const usePrivacyMode = () => {
     isTogglePrivacyModeLoading,
     setPrivacyModeOff: () => writePrivacyMode('HIDDEN'),
     setPrivacyModeOn: () => writePrivacyMode('SHOWN'),
-    privacyPlaceholder: '*.******',
+    privacyPlaceholder: '******',
   }
 }
diff --git a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx b/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
@@ -59,6 +59,7 @@ export const RemoveWalletScreen = () => {
             <Spacer height={24} />
 
             <WalletNameInput
+              placeholder={strings.walletName}
               value={typedWalletName}
               onChangeText={setTypedWalletName}
               right={typedWalletName === meta.name ? <Checkmark /> : undefined}

diff --git a/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx b/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
@@ -55,7 +55,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
                 ? totalAdaSum != null
                   ? formatAdaWithText(asQuantity(totalAdaSum), wallet.portfolioPrimaryTokenInfo)
                   : '-'
-                : '**.******'}
+                : '******'}
             </Text>
           </View>
         </View>
@@ -82,7 +82,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
                 ? totalRewards != null
                   ? formatAdaWithText(asQuantity(totalRewards), wallet.portfolioPrimaryTokenInfo)
                   : '-'
-                : '**.******'}
+                : '******'}
             </Text>
           </View>
         </View>
@@ -109,7 +109,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
                 ? totalDelegated != null
                   ? formatAdaWithText(asQuantity(totalDelegated), wallet.portfolioPrimaryTokenInfo)
                   : '-'
-                : '**.******'}
+                : '******'}
             </Text>
           </View>
         </View>

diff --git a/...t-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json b/...t-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
@@ -4,104 +4,104 @@
     "defaultMessage": "!!!If you wish to permanently delete the wallet make sure you have written down the mnemonic.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 109,
+      "line": 110,
       "column": 25,
-      "index": 3918
+      "index": 3965
     },
     "end": {
-      "line": 112,
+      "line": 113,
       "column": 3,
-      "index": 4112
+      "index": 4159
     }
   },
   {
     "id": "components.settings.removewalletscreen.descriptionParagraph2",
     "defaultMessage": "!!!To confirm this operation type the wallet name below.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 113,
+      "line": 114,
       "column": 25,
-      "index": 4139
+      "index": 4186
     },
     "end": {
-      "line": 116,
+      "line": 117,
       "column": 3,
-      "index": 4296
+      "index": 4343
     }
   },
   {
     "id": "components.settings.removewalletscreen.walletName",
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 117,
+      "line": 118,
       "column": 14,
-      "index": 4312
+      "index": 4359
     },
     "end": {
-      "line": 120,
+      "line": 121,
       "column": 3,
-      "index": 4416
+      "index": 4463
     }
   },
   {
     "id": "components.settings.removewalletscreen.walletNameInput",
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 121,
+      "line": 122,
       "column": 19,
-      "index": 4437
+      "index": 4484
     },
     "end": {
-      "line": 124,
+      "line": 125,
       "column": 3,
-      "index": 4546
+      "index": 4593
     }
   },
   {
     "id": "components.settings.removewalletscreen.walletNameMismatchError",
     "defaultMessage": "!!!Wallet name does not match",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 125,
+      "line": 126,
       "column": 27,
-      "index": 4575
+      "index": 4622
     },
     "end": {
-      "line": 128,
+      "line": 129,
       "column": 3,
-      "index": 4707
+      "index": 4754
     }
   },
   {
     "id": "components.settings.removewalletscreen.remove",
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 129,
+      "line": 130,
       "column": 10,
-      "index": 4719
+      "index": 4766
     },
     "end": {
-      "line": 132,
+      "line": 133,
       "column": 3,
-      "index": 4821
+      "index": 4868
     }
   },
   {
     "id": "components.settings.removewalletscreen.hasWrittenDownMnemonic",
     "defaultMessage": "!!!I have written down mnemonic of this wallet and understand that I cannot recover the wallet without it.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 133,
+      "line": 134,
       "column": 26,
-      "index": 4849
+      "index": 4896
     },
     "end": {
-      "line": 137,
+      "line": 138,
       "column": 3,
-      "index": 5063
+      "index": 5110
     }
   }
 ]
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 180,
       "column": 9,
-      "index": 5288
+      "index": 5279
     },
     "end": {
       "line": 183,
       "column": 3,
-      "index": 5390
+      "index": 5381
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 184,
       "column": 16,
-      "index": 5408
+      "index": 5399
     },
     "end": {
       "line": 187,
       "column": 3,
-      "index": 5518
+      "index": 5509
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 188,
       "column": 18,
-      "index": 5538
+      "index": 5529
     },
     "end": {
       "line": 191,
       "column": 3,
-      "index": 5652
+      "index": 5643
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 192,
       "column": 23,
-      "index": 5677
+      "index": 5668
     },
     "end": {
       "line": 195,
       "column": 3,
-      "index": 5789
+      "index": 5780
     }
   }
 ]