fix: conflicts

enkryptcom · Feb 13, 2025 · 2171ae8 · 2171ae8
2 parents d11eca8 + 73f87c2
commit 2171ae8
Show file tree

Hide file tree

Showing 4 changed files with 610 additions and 6 deletions.
diff --git a/packages/extension/src/ui/action/views/settings/views/settings-backups/index.vue b/packages/extension/src/ui/action/views/settings/views/settings-backups/index.vue
@@ -42,7 +42,7 @@
             class="settings-container__backup-item"
           >
             <div>
-              <h4>{{ concatId(entity.userId) }}</h4>
+              <h4>{{ generateRandomNameWithSeed('_', entity.userId) }}</h4>
               <p>Last backup on: {{ formatDate(entity.updatedAt) }}</p>
             </div>
             <div class="settings-container__backup-status">
@@ -80,6 +80,7 @@ import SettingsInnerHeader from '@action/views/settings/components/settings-inne
 import SettingsSwitch from '@action/views/settings/components/settings-switch.vue';
 import deleteIcon from '@/ui/action/icons/actions/trash.vue';
 import BalanceLoader from '@action/icons/common/balance-loader.vue';
+import { generateRandomNameWithSeed } from '@enkryptcom/utils';
 
 const backupState = new BackupState();
 const loading = ref(true);
@@ -107,10 +108,6 @@ const toggleBackups = async (checked: boolean) => {
   loading.value = false;
 };
 
-const concatId = (userId: string) => {
-  return `${userId.slice(0, 12)}...${userId.slice(-4)}`;
-};
-
 const deleteBackup = async (userId: string) => {
   loading.value = true;
   await backupState.deleteBackup(userId);
@@ -138,7 +135,7 @@ const formatDate = (dateString: string) => {
     margin: 0 32px 12px 32px;
 
     &-container {
-      height: 288; // adding a small cutoff to let user know there's more
+      height: 288px; // adding a small cutoff to let user know there's more
       overflow-y: auto;
     }
 

diff --git a/packages/extension/src/ui/onboard/restore-wallet/backup-detected.vue b/packages/extension/src/ui/onboard/restore-wallet/backup-detected.vue
@@ -14,6 +14,7 @@
             'backup-detected__backup-item',
           ]"
         >
+          {{ generateRandomNameWithSeed('_', backup.userId) }} -
           {{ new Date(backup.updatedAt).toLocaleString() }}
         </a>
       </div>
@@ -43,6 +44,7 @@ import BackupState from '@/libs/backup-state';
 import { ListBackupType } from '@/libs/backup-state/types';
 import { useRouter } from 'vue-router';
 import { routes } from '../restore-wallet/routes';
+import { generateRandomNameWithSeed } from '@enkryptcom/utils';
 
 const selectedBackup = ref<ListBackupType>();
 const backups = ref<ListBackupType[]>([]);

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -18,6 +18,7 @@ import {
   naclEncrypt,
   NACL_VERSION,
 } from "./nacl-encrypt-decrypt";
+import { generateRandomNameWithSeed } from "./random-names";
 
 const bufferToHex = (buf: Buffer | Uint8Array, nozerox = false): string =>
   nozerox
@@ -54,4 +55,5 @@ export {
   naclDecrypt,
   naclEncrypt,
   NACL_VERSION,
+  generateRandomNameWithSeed,
 };