Merge pull request #72 from compolabs/fix/1186-bug-create-switch

[1186] Working on fix for wallets

Author: EchoDex

src/blockchain/FuelNetwork.ts

@@ -17,7 +17,7 @@ import BN from "@src/utils/BN";
 import {
   CONTRACT_ADDRESSES,
   INDEXER_URL,
-  NETWORKS,
+  NETWORK,
   PYTH_URL,
   TOKENS_BY_ASSET_ID,
   TOKENS_BY_SYMBOL,
@@ -39,13 +39,13 @@ export class FuelNetwork {
   private walletManager = new WalletManager();
   private orderbookSdk: SparkOrderBookSdk;
 
-  public network = NETWORKS[0];
+  public network = NETWORK;
 
   private constructor() {
     makeObservable(this.walletManager);
 
     this.orderbookSdk = new SparkOrderBookSdk({
-      networkUrl: NETWORKS[0].url,
+      networkUrl: NETWORK.url,
       contractAddresses: CONTRACT_ADDRESSES,
       indexerApiUrl: INDEXER_URL,
       pythUrl: PYTH_URL,

src/blockchain/constants.ts

@@ -16,12 +16,10 @@ export interface Network {
   url: string;
 }
 
-export const NETWORKS: Network[] = [
-  {
-    name: "Fuel",
-    url: "https://testnet.fuel.network/v1/graphql",
-  },
-];
+export const NETWORK: Network = {
+  name: "Fuel",
+  url: "https://beta-5.fuel.network/graphql",
+};
 
 export const EXPLORER_URL = "https://app.fuel.network/";
 

src/components/Header/ConnectedWallet.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from "react";
 import styled from "@emotion/styled";
-import { useDisconnect } from "@fuels/react";
 import copy from "copy-to-clipboard";
 import { observer } from "mobx-react";
 
@@ -23,8 +22,7 @@ import ConnectedWalletButton from "./ConnectedWalletButton";
 
 const ConnectedWallet: React.FC = observer(() => {
   const { accountStore, notificationStore, balanceStore } = useStores();
-  const { address } = useWallet();
-  const { disconnect } = useDisconnect();
+  const { address, disconnect } = useWallet();
 
   const [isFocused, setIsFocused] = useState(false);
 
@@ -60,7 +58,7 @@ const ConnectedWallet: React.FC = observer(() => {
     },
     {
       icon: logoutIcon,
-      action: () => disconnect(),
+      action: () => disconnectWallet(),
       title: "Disconnect",
       active: true,
     },

src/components/Modal/AccountInfoSheet.tsx

@@ -1,6 +1,5 @@
 import React from "react";
 import styled from "@emotion/styled";
-import { useDisconnect } from "@fuels/react";
 import copy from "copy-to-clipboard";
 
 import copyIcon from "@src/assets/icons/copy.svg";
@@ -24,9 +23,8 @@ interface Props {
 }
 
 const AccountInfoSheet: React.FC<Props> = ({ isOpen, onClose }) => {
+  const { disconnect } = useWallet();
   const { accountStore, notificationStore, balanceStore } = useStores();
-  const { balance } = useWallet();
-  const { disconnect } = useDisconnect();
 
   const bcNetwork = FuelNetwork.getInstance();
 

src/hooks/useWallet.ts

@@ -7,6 +7,7 @@ import {
   useIsConnected,
   useWallet as useFuelWallet,
 } from "@fuels/react";
+import { useDisconnect } from "@fuels/react";
 
 interface ICurrentConnector {
   logo: string;
@@ -23,6 +24,7 @@ export const useWallet = () => {
   const { connect, isConnecting, isLoading: isLoadingConnectors } = useConnectUI();
   const { isConnected, refetch: refetchConnected } = useIsConnected();
   const { account, isLoading: isLoadingAccount, isFetching: isFetchingAccount } = useAccount();
+  const { disconnect } = useDisconnect();
 
   const address = account ?? "";
 
@@ -70,6 +72,7 @@ export const useWallet = () => {
     isLoadingConnectors,
     wallet,
     connect,
+    disconnect,
     refetchConnected,
     refetchWallet,
   };