Merge branch 'onekey' into feat/ln-check-balance

OneKeyHQ · Oct 13, 2023 · cd67117 · cd67117
2 parents e645cd2 + 70843ae
commit cd67117
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/packages/engine/src/index.ts b/packages/engine/src/index.ts
@@ -1550,7 +1550,19 @@ class Engine {
     if (typeof accountId !== 'undefined') {
       if (withMain) {
         if (!tokens.find((t) => t.isNative) && !isAllNetworks(networkId)) {
-          tokens.unshift(await this.generateNativeTokenByNetworkId(networkId));
+          const nativeTokensInSimpleDB = await simpleDb.token.getTokens({
+            networkId,
+            query: {
+              isNative: true,
+            },
+          });
+          if (nativeTokensInSimpleDB?.length > 0) {
+            tokens.unshift(nativeTokensInSimpleDB[0]);
+          } else {
+            tokens.unshift(
+              await this.generateNativeTokenByNetworkId(networkId),
+            );
+          }
         }
         return tokens;
       }