tests: using wrong constant in partial_tx

Author: r4mmer

__tests__/storage/memory_store.test.js

@@ -161,12 +161,11 @@ test('history methods', async () => {
 test('token methods', async () => {
   const store = new MemoryStore();
 
-  // Starts with HTR
-  expect(store.tokens.size).toEqual(1);
-  expect(store.tokens.get('00')).toBeDefined();
+  // Starts empty
+  expect(store.tokens.size).toEqual(0);
 
   await store.saveToken({ uid: '01', name: 'Token 01', symbol: 'TK01' });
-  expect(store.tokens.size).toEqual(2);
+  expect(store.tokens.size).toEqual(1);
   expect(store.tokens.get('01')).toBeDefined();
   expect(store.tokensMetadata.get('01')).toBeUndefined();
   await store.saveToken(
@@ -182,7 +181,7 @@ test('token methods', async () => {
       },
     }
   );
-  expect(store.tokens.size).toEqual(3);
+  expect(store.tokens.size).toEqual(2);
   expect(store.tokens.get('02')).toBeDefined();
   expect(store.tokensMetadata.get('02')).toBeDefined();
 
@@ -208,6 +207,7 @@ test('token methods', async () => {
   }
   expect(registered).toHaveLength(1);
 
+  await store.saveToken({ uid: '00', name: 'Hathor', symbol: 'HTR' });
   await store.editTokenMeta('00', {
     numTransactions: 10,
     balance: { tokens: { locked: 1, unlocked: 2 } },

src/models/partial_tx.ts

@@ -23,6 +23,7 @@ import txApi from '../api/txApi';
 import {
   DEFAULT_TX_VERSION,
   NATIVE_TOKEN_UID,
+  TOKEN_INDEX_MASK,
   TOKEN_AUTHORITY_MASK,
   TOKEN_MELT_MASK,
   TOKEN_MINT_MASK,
@@ -484,7 +485,7 @@ export class PartialTx {
             const tokenUid =
               utxo.token_data === 0
                 ? NATIVE_TOKEN_UID
-                : get(data, `tx.tokens[${(utxo.token_data & TOKEN_AUTHORITY_MASK) - 1}].uid`);
+                : get(data, `tx.tokens[${(utxo.token_data & TOKEN_INDEX_MASK) - 1}].uid`);
 
             const isAuthority = (utxo.token_data & TOKEN_AUTHORITY_MASK) > 0;
             const isMint = isAuthority && (utxo.value & TOKEN_MINT_MASK) > 0;

src/utils/storage.ts

@@ -24,7 +24,7 @@ import walletApi from '../api/wallet';
 import helpers from './helpers';
 import transactionUtils from './transaction';
 import { deriveAddressP2PKH, deriveAddressP2SH } from './address';
-import { MAX_ADDRESSES_GET, LOAD_WALLET_MAX_RETRY, LOAD_WALLET_RETRY_SLEEP } from '../constants';
+import { NATIVE_TOKEN_UID, MAX_ADDRESSES_GET, LOAD_WALLET_MAX_RETRY, LOAD_WALLET_RETRY_SLEEP } from '../constants';
 
 /**
  * Derive requested addresses (if not already loaded), save them on storage then return them.
@@ -403,6 +403,15 @@ async function updateTokensData(storage: IStorage, tokens: Set<string>): Promise
   > {
     let retryCount = 0;
 
+    if (uid === NATIVE_TOKEN_UID) {
+      const nativeToken = storage.config.getNativeTokenData();
+      return {
+        success: true,
+        name: nativeToken.name,
+        symbol: nativeToken.symbol,
+      };
+    }
+
     while (retryCount <= 5) {
       try {
         // Fetch and return the api response