Update orai-token-inspector to version 0.2.5; implement temporary dis…

…ablement of BTC functionality across multiple components

package.json

@@ -25,7 +25,7 @@
     "@oraichain/kawaiiverse-txs": "^0.0.3",
     "@oraichain/orai-bitcoin": "2.0.0",
     "@oraichain/oraidex-common": "2.0.6",
-    "@oraichain/orai-token-inspector": "^0.2.3",
+    "@oraichain/orai-token-inspector": "^0.2.5",
     "@oraichain/oraidex-common-ui": "1.0.11",
     "@oraichain/oraidex-contracts-sdk": "1.0.55",
     "@oraichain/oraidex-universal-swap": "1.3.1",

src/libs/cw-bitcoin/models/cw-bitcoin-client.ts

@@ -13,6 +13,8 @@ export class CwBitcoinClient implements CwBitcoinClientInterface {
   public depositAddress: DepositSuccess | null = null;
 
   public async generateAddress(dest: Dest) {
+    // FIXME: TURN OFF BTC NOW
+    return null;
     try {
       // @ts-ignore-check
       const config = {

src/libs/nomic/models/nomic-client/nomic-client.ts

@@ -32,6 +32,8 @@ export class NomicClient implements NomicClientInterface {
     );
   }
   public async getRecoveredAddress(accAddress: string) {
+    // FIXME: TURN OFF BTC NOW
+    return null
     return await fetch(`${Config.restUrl}/bitcoin/recovery_address/${accAddress}?network=${btcNetwork}`, {
       method: 'GET'
     }).then((data) => data.json());
@@ -50,6 +52,7 @@ export class NomicClient implements NomicClientInterface {
   }
 
   public async generateAddress() {
+    return null;
     const isKeplrActive = await window.Keplr.getKeplr();
     if (isKeplrActive) {
       // @ts-ignore-check

src/pages/Balance/helpers.ts

@@ -717,6 +717,9 @@ export const useGetWithdrawlFeesBitcoinV2 = ({
 };
 
 export const useDepositFeesBitcoinV2 = (enabled: boolean) => {
+  // FIXME: TURN OFF BTC NOW
+  return null
+
   const getDepositFeeBTC = async () => {
     try {
       const { data } = await axios({

src/pages/Balance/index.tsx

@@ -27,9 +27,7 @@ import RefreshIcon from 'assets/icons/reload.svg?react';
 import { BitcoinUnit } from 'bitcoin-units';
 import classNames from 'classnames';
 import CheckBox from 'components/CheckBox';
-import LoadingBox from 'components/LoadingBox';
 import { SelectTokenModal } from 'components/Modals/SelectTokenModal';
-import SearchInput from './SearchInput';
 import { displayToast, TToastType } from 'components/Toasts/Toast';
 import TokenBalance from 'components/TokenBalance';
 import { CwBitcoinContext } from 'context/cw-bitcoin-context';
@@ -74,7 +72,7 @@ import isEqual from 'lodash/isEqual';
 import { refreshBalances } from 'pages/UniversalSwap/helpers';
 import { ORAICHAIN_RELAYER_ADDRESS, SOL_RELAYER_ADDRESS, Web3SolanaProgramInteraction } from 'program/web3';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { getSubAmountDetails } from 'rest/api';
 import { RootState } from 'store/configure';
@@ -93,18 +91,20 @@ import {
 } from './helpers';
 import useTonBridgeHandler from './hooks/useTonBridgeHandler';
 import KwtModal from './KwtModal';
+import SearchInput from './SearchInput';
 import StuckOraib from './StuckOraib';
 import useGetOraiBridgeBalances from './StuckOraib/useGetOraiBridgeBalances';
 import TokenItem, { TokenItemProps } from './TokenItem';
 import { TokenItemBtc } from './TokenItem/TokenItemBtc';
 // import { SolanaNetworkConfig } from '@oraichain/orai-token-inspector';
+import { CHAIN } from '@oraichain/orai-token-inspector';
+import loadingGif from 'assets/gif/loading-page.gif';
+import CloseIcon from 'assets/icons/close-icon.svg?react';
 import OraiDarkIcon from 'assets/icons/oraichain.svg?react';
+import { FallbackEmptyData } from 'components/FallbackEmptyData';
 import { getTokenInspectorInstance } from 'initTokenInspector';
 import { onChainTokenToTokenItem } from 'reducer/onchainTokens';
-import loadingGif from 'assets/gif/loading-page.gif';
-import { FallbackEmptyData } from 'components/FallbackEmptyData';
-import CloseIcon from 'assets/icons/close-icon.svg?react';
-import { CHAIN } from '@oraichain/orai-token-inspector';
+import { addToOraichainTokens, addToOtherChainTokens } from 'reducer/token';
 
 interface BalanceProps {}
 export const isMaintainBridge = false;
@@ -123,6 +123,7 @@ const Balance: React.FC<BalanceProps> = () => {
   const nomic = useContext(NomicContext);
   const cwBitcoinContext = useContext(CwBitcoinContext);
   const [walletByNetworks] = useWalletReducer('walletsByNetwork');
+  const dispatch = useDispatch();
 
   // state internal
   const [loadingRefresh, setLoadingRefresh] = useState(false);
@@ -220,8 +221,13 @@ const Balance: React.FC<BalanceProps> = () => {
           const inspectedToken = res.fromToken;
           const toTokens = res.toTokens;
           if (toTokens) setToTokens(toTokens);
-          if (inspectedToken.chainId === 'Oraichain') setTokens([[], [onChainTokenToTokenItem(inspectedToken)]]);
-          else setTokens([[onChainTokenToTokenItem(inspectedToken)], []]);
+          if (inspectedToken.chainId === 'Oraichain') {
+            setTokens([[], [onChainTokenToTokenItem(inspectedToken)]]);
+            dispatch(addToOraichainTokens([inspectedToken]));
+          } else {
+            setTokens([[onChainTokenToTokenItem(inspectedToken)], []]);
+            dispatch(addToOtherChainTokens([inspectedToken]));
+          }
         } else {
           setTokens(foundTokens);
         }
@@ -230,6 +236,7 @@ const Balance: React.FC<BalanceProps> = () => {
         setTokens([[], []]);
       } finally {
         setLoadingInspector(false);
+        await loadTokenAmounts({ metamaskAddress, tronAddress, oraiAddress, btcAddress, solAddress, tonAddress });
       }
     })();
   }, [searchTokenAddress, filterNetworkUI]);

src/pages/BitcoinDashboardV2/hooks/lcd.hook.ts

@@ -292,6 +292,7 @@ export interface ConfigResponse {
 }
 
 const getContractConfig = async (): Promise<ConfigResponse> => {
+  return null
   try {
     const res = await axios.get('/contract/config', {
       params: {}

src/reducer/token.ts

@@ -1,7 +1,7 @@
-import { createSlice } from '@reduxjs/toolkit';
-import type { PayloadAction } from '@reduxjs/toolkit';
 import { ConfigResponse } from '@oraichain/common-contracts-sdk/build/CwIcs20Latest.types';
 import { TokenItemType } from '@oraichain/oraidex-common';
+import type { PayloadAction } from '@reduxjs/toolkit';
+import { createSlice } from '@reduxjs/toolkit';
 
 export interface TokenState {
   amounts: AmountDetails;
@@ -99,7 +99,10 @@ export const tokenSlice = createSlice({
         state.allOtherChainTokens = [
           ...state.allOtherChainTokens,
           ...action.payload.filter(
-            (token: TokenItemType) => !state.allOtherChainTokens.find((t) => t.denom === token.denom)
+            (token: TokenItemType) =>
+              !state.allOtherChainTokens.find(
+                (t) => t?.denom === token?.denom || t?.contractAddress === token?.contractAddress
+              )
           )
         ];
       } catch (error) {
@@ -109,7 +112,10 @@ export const tokenSlice = createSlice({
     updateAddedTokens: (state, action: PayloadAction<any>) => {
       state.addedTokens = [
         ...state.addedTokens,
-        ...action.payload.filter((token: TokenItemType) => !state.addedTokens.find((t) => t.denom === token.denom))
+        ...action.payload.filter(
+          (token: TokenItemType) =>
+            !state.addedTokens.find((t) => t?.denom === token?.denom || t?.contractAddress === token?.contractAddress)
+        )
       ];
     }
   }

yarn.lock

@@ -3924,10 +3924,10 @@
     serialize-error "^8.1.0"
     varuint-bitcoin "^1.1.2"
 
-"@oraichain/orai-token-inspector@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@oraichain/orai-token-inspector/-/orai-token-inspector-0.2.3.tgz#f25cfb2250b37ec7c0b2c8d0499560cd7ab999d1"
-  integrity sha512-uIXYvI3fFJKXEMeBsxh2NniKY/yC5xkC6M4n7wYVBMiGg0qjBwXGaLbZ8MgY3okzInuvkGW8lI87+y/xAYvIhw==
+"@oraichain/orai-token-inspector@^0.2.5":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@oraichain/orai-token-inspector/-/orai-token-inspector-0.2.5.tgz#342934db7070b17c7a18cab1cfe0f0120446cbd6"
+  integrity sha512-7agqwqFK7SR0ZbR5qftnyNqWyZ2ShzrfHBw4v4R5FxXinXUE4gnYaWchNqYjQ27HXxPXwDIo3GjB2WALfnOPZQ==
   dependencies:
     "@keplr-wallet/types" "0.12.141"
     "@metaplex-foundation/mpl-token-metadata" "^3.3.0"
@@ -3942,7 +3942,7 @@
     "@ton-api/ton-adapter" "^0.3.0"
     "@ton/core" "^0.59.0"
     "@ton/ton" "^15.1.0"
-    bech32 "^2.0.0"
+    bech32 "1.1.4"
     ethers "5.7.2"
     ton-crypto "^3.2.0"