fix: cr commnets, store timestamp 0 for imported accounts

anoma · Dec 19, 2024 · b632b0e · b632b0e
1 parent 8145873
commit b632b0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/apps/extension/src/background/keyring/keyring.ts b/apps/extension/src/background/keyring/keyring.ts
@@ -113,7 +113,7 @@ export class KeyRing {
       path: bip44Path,
       type: AccountType.Ledger,
       source: "imported",
-      timestamp: new Date().getTime(),
+      timestamp: 0,
     };
 
     const sensitive = await this.vaultService.encryptSensitiveData({
@@ -162,8 +162,8 @@ export class KeyRing {
     await this.vaultService.assertIsUnlocked();
 
     const keys = this.sdkService.getSdk().getKeys();
-    const timestamp = new Date().getTime();
     const source = flow === "create" ? "generated" : "imported";
+    const timestamp = source === "generated" ? new Date().getTime() : 0;
 
     const { sk, text, passphrase, accountType } = ((): {
       sk: string;
@@ -449,7 +449,7 @@ export class KeyRing {
       );
     }
 
-    const timestamp = new Date().getTime();
+    const timestamp = source === "generated" ? new Date().getTime() : 0;
     const derivedAccount = await this.persistAccount(
       type === AccountType.ShieldedKeys ? zip32Path : derivationPath,
       parentId,

diff --git a/apps/extension/src/utils/index.ts b/apps/extension/src/utils/index.ts
@@ -185,12 +185,13 @@ export const toPublicAccount = (derivedAccount: DerivedAccount): Account => {
     alias,
     address,
     type,
-    pseudoExtendedKey,
     source,
-    timestamp,
   };
   if (isShielded) {
     account.viewingKey = owner;
+    account.pseudoExtendedKey = pseudoExtendedKey;
+    account.source = source;
+    account.timestamp = timestamp;
   } else {
     account.publicKey = publicKey;
   }

diff --git a/apps/namadillo/src/atoms/balance/atoms.ts b/apps/namadillo/src/atoms/balance/atoms.ts
@@ -43,10 +43,10 @@ const toDatedKeypair = async (
   api: DefaultApi,
   { viewingKey, source, timestamp }: Account
 ): Promise<DatedViewingKey> => {
-  if (!viewingKey) {
+  if (typeof viewingKey === "undefined") {
     throw new Error("Viewing key not found");
   }
-  if (!timestamp) {
+  if (typeof timestamp === "undefined") {
     throw new Error("Timestamp not found");
   }
   let height = 0;