Add names to wallet list info in backups v2 (#5692)

* add names to wallet info in backups v2 * cleanup * more cleanup
rainbow-me · May 7, 2024 · d4cc1df · d4cc1df
1 parent af27740
commit d4cc1df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/screens/SettingsSheet/components/Backups/ViewWalletBackup.tsx b/src/screens/SettingsSheet/components/Backups/ViewWalletBackup.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 import { RouteProp, useRoute } from '@react-navigation/native';
 import ContextMenuButton from '@/components/native-context-menu/contextMenu';
 import { ContextCircleButton } from '@/components/context-menu';
@@ -272,7 +273,7 @@ const ViewWalletBackup = () => {
                   // If we found it and it's not damaged use it to create the new account
                   if (wallet && !wallet.damaged) {
                     const newWallets = await dispatch(createAccountForWallet(wallet.id, color, name));
-                    // @ts-ignore
+                    // @ts-expect-error - no params
                     await initializeWallet();
                     // If this wallet was previously backed up to the cloud
                     // We need to update userData backup so it can be restored too
@@ -296,7 +297,7 @@ const ViewWalletBackup = () => {
                       clearCallbackOnStartCreation: true,
                     });
                     await dispatch(walletsLoadState(profilesEnabled));
-                    // @ts-ignore
+                    // @ts-expect-error - no params
                     await initializeWallet();
                   }
                 } catch (e) {
@@ -538,12 +539,14 @@ const ViewWalletBackup = () => {
                   disabled
                   leftComponent={<WalletAvatar account={account} />}
                   labelComponent={
-                    account.label.endsWith('.eth') ? <MenuItem.Label text={abbreviations.address(account.address, 3, 5) || ''} /> : null
+                    account.label.endsWith('.eth') || account.label !== '' ? (
+                      <MenuItem.Label text={abbreviations.address(account.address, 3, 5) || ''} />
+                    ) : null
                   }
                   titleComponent={
                     <MenuItem.Title
                       text={
-                        account.label.endsWith('.eth')
+                        account.label.endsWith('.eth') || account.label !== ''
                           ? abbreviations.abbreviateEnsForDisplay(removeFirstEmojiFromString(account.label), 20) ?? ''
                           : abbreviations.address(account.address, 3, 5) ?? ''
                       }

diff --git a/src/screens/SettingsSheet/components/Backups/WalletsAndBackup.tsx b/src/screens/SettingsSheet/components/Backups/WalletsAndBackup.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 import React, { useCallback, useMemo } from 'react';
 import { cloudPlatform } from '@/utils/platform';
 import Menu from '../Menu';
@@ -74,7 +75,7 @@ const WalletPill = ({ account }: WalletPillProps) => {
       <Text color={'secondary (Deprecated)'} size="11pt" weight="semibold">
         {label.endsWith('.eth')
           ? abbreviations.abbreviateEnsForDisplay(label, 8, 4) ?? ''
-          : abbreviations.address(account.address, 3, 5) ?? ''}
+          : abbreviations.address(label !== '' ? label : account.address, 3, 5) ?? ''}
       </Text>
     </Box>
   );
@@ -222,7 +223,7 @@ export const WalletsAndBackup = () => {
 
       await dispatch(walletsLoadState(profilesEnabled));
 
-      // @ts-ignore
+      // @ts-expect-error - no params
       await initializeWallet();
     } catch (err) {
       logger.error(new RainbowError('Failed to create new secret phrase'), {
@@ -661,12 +662,13 @@ export const WalletsAndBackup = () => {
     backupAllNonBackedUpWalletsTocloud,
     sortedWallets,
     onCreateNewSecretPhrase,
+    onViewCloudBackups,
+    manageCloudBackups,
     navigate,
     onNavigateToWalletView,
     allBackedUp,
+    mostRecentBackup,
     lastBackupDate,
-    onViewCloudBackups,
-    manageCloudBackups,
     onPressLearnMoreAboutCloudBackups,
   ]);