fix: fix for upgrade

unisat-wallet · Aug 18, 2024 · fdfe590 · fdfe590
1 parent 80c9d79
commit fdfe590
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
@@ -2003,7 +2003,6 @@ export class WalletController extends BaseController {
     const timeId = preferenceService.getAutoLockTimeId();
     const timeConfig = AUTO_LOCKTIMES[timeId] || AUTO_LOCKTIMES[DEFAULT_LOCKTIME_ID];
     this.timer = setTimeout(() => {
-      console.log('timeout setLocked!');
       this.lockWallet();
     }, timeConfig.time);
   };

diff --git a/src/ui/pages/BRC20/BRC20TokenScreen.tsx b/src/ui/pages/BRC20/BRC20TokenScreen.tsx
@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js';
 import { useEffect, useMemo, useState } from 'react';
 
-import { brc20Utils } from '@/shared/lib/brc20-utils';
 import { AddressTokenSummary, Inscription } from '@/shared/types';
 import { Button, Column, Content, Header, Icon, Layout, Row, Text } from '@/ui/components';
 import { useTools } from '@/ui/components/ActionComponent';
@@ -84,7 +83,7 @@ export default function BRC20TokenScreen() {
 
   const enableMint = useMemo(() => {
     let enable = false;
-    if (brc20Utils.is5Byte(ticker)) {
+    if (tokenSummary.tokenBalance.selfMint) {
       if (tokenSummary.tokenInfo.holder == account.address) {
         if (tokenSummary.tokenInfo.totalMinted != tokenSummary.tokenInfo.totalSupply) {
           enable = true;

diff --git a/src/ui/pages/Main/WalletTabScreen/OrdinalsTab.tsx b/src/ui/pages/Main/WalletTabScreen/OrdinalsTab.tsx
@@ -17,7 +17,11 @@ export function OrdinalsTab() {
 
   const chain = useChain();
 
-  const tabKey = useOrdinalsAssetTabKey();
+  let tabKey = useOrdinalsAssetTabKey();
+  if (chain.isFractal && tabKey === OrdinalsAssetTabKey.BRC20_5BYTE) {
+    tabKey = OrdinalsAssetTabKey.BRC20;
+  }
+
   const dispatch = useAppDispatch();
 
   const tabItems = useMemo(() => {
@@ -43,6 +47,7 @@ export function OrdinalsTab() {
     }
     return items;
   }, [addressSummary, chain]);
+
   return (
     <Column>
       <Row justifyBetween>
@@ -57,7 +62,7 @@ export function OrdinalsTab() {
         />
       </Row>
 
-      {tabItems[tabKey].children}
+      {tabItems[tabKey] ? tabItems[tabKey].children : null}
     </Column>
   );
 }
diff --git a/src/ui/state/settings/hooks.ts b/src/ui/state/settings/hooks.ts
@@ -46,11 +46,9 @@ export function useAddressType() {
 
 export function useNetworkType() {
   const accountsState = useSettingsState();
-  if (
-    accountsState.chainType === ChainType.BITCOIN_MAINNET ||
-    accountsState.chainType === ChainType.FRACTAL_BITCOIN_MAINNET
-  ) {
-    return NetworkType.MAINNET;
+  const chain = CHAINS_MAP[accountsState.chainType];
+  if (chain) {
+    return chain.networkType;
   } else {
     return NetworkType.TESTNET;
   }