Merge branch 'feature/evm' of github.com:DeFiCh/wallet into pierregee…

…/test-e2e-runner
BirthdayResearch · Oct 18, 2023 · 31e9b77 · 31e9b77
2 parents dca49dc + 660876a
commit 31e9b77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/mobile-app/app/contexts/CustomServiceProvider.tsx b/mobile-app/app/contexts/CustomServiceProvider.tsx
@@ -92,12 +92,12 @@ function getBlockscoutUrl(network: EnvironmentNetwork) {
     case EnvironmentNetwork.RemotePlayground:
     case EnvironmentNetwork.DevNet:
     case EnvironmentNetwork.Changi:
-      return "http://34.87.158.111:4000"; // TODO: add final blockscout url for playground and devnet
-    case EnvironmentNetwork.TestNet:
       return "https://blockscout.changi.ocean.jellyfishsdk.com";
+    case EnvironmentNetwork.TestNet:
+      return "https://blockscout.testnet.ocean.jellyfishsdk.com";
     case EnvironmentNetwork.MainNet:
     default:
-      return "https://blockscout.changi.ocean.jellyfishsdk.com";
+      return "https://blockscout.mainnet.ocean.jellyfishsdk.com";
   }
 }
 
@@ -111,7 +111,7 @@ function getEthRpcUrl(network: EnvironmentNetwork) {
     case EnvironmentNetwork.Changi:
       return "http://34.34.156.49:20551"; // TODO: add final eth rpc url for changi, devnet and remote playground
     case EnvironmentNetwork.TestNet:
-      return "https://changi.dfi.team"; // TODO: add final eth rpc url for testnet, with proper domain name
+      return "http://34.38.30.102:18551"; // TODO: add final eth rpc url for testnet, with proper domain name
     case EnvironmentNetwork.MainNet:
     default:
       return "https://changi.dfi.team"; // TODO: add final eth rpc url for mainnet, with proper domain name

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/TokenBalance.ts b/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/TokenBalance.ts
@@ -1,14 +1,9 @@
 import { useSelector } from "react-redux";
 import BigNumber from "bignumber.js";
 import { RootState } from "@store";
-import {
-  WalletToken,
-  dexPricesSelectorByDenomination,
-  tokensSelector,
-} from "@waveshq/walletkit-ui/dist/store";
+import { WalletToken, tokensSelector } from "@waveshq/walletkit-ui/dist/store";
 import { useMemo } from "react";
 import { DomainType } from "@contexts/DomainContext";
-import { useDenominationCurrency } from "./PortfolioCurrency";
 import { useEvmTokenBalances } from "./EvmTokenBalances";
 
 export interface DomainToken {
@@ -30,14 +25,9 @@ export function useTokenBalance(): {
   dvmTokens: DomainToken[];
   evmTokens: DomainToken[];
 } {
-  const { denominationCurrency } = useDenominationCurrency();
-
   const tokens = useSelector((state: RootState) =>
     tokensSelector(state.wallet),
   );
-  const prices = useSelector((state: RootState) =>
-    dexPricesSelectorByDenomination(state.wallet, denominationCurrency),
-  );
 
   const { evmTokens } = useEvmTokenBalances();
   const mapDomainToken = (token: WalletToken) => {
@@ -94,7 +84,7 @@ export function useTokenBalance(): {
         dvmTokens: [],
       },
     );
-  }, [prices, tokens]);
+  }, [tokens]);
 
   return {
     dvmTokens,