diff --git a/src/App.tsx b/src/App.tsx index 07f5ba4..89be187 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -75,7 +75,7 @@ const App = (): React.JSX.Element => { case NETWORK_METHODS.GET_NETWORKS: const retrievedNetworks = await retrieveNetworksData(); const currentNetworkId = networksData.find( - networkData => networkData.networkId === selectedNetwork.networkId, + networkData => networkData.networkId === selectedNetwork!.networkId, )?.networkId; const formattedResponse = formatJsonRpcResult(id, { diff --git a/src/components/Accounts.tsx b/src/components/Accounts.tsx index 3568504..d43b586 100644 --- a/src/components/Accounts.tsx +++ b/src/components/Accounts.tsx @@ -54,7 +54,7 @@ const Accounts = ({ currentIndex, updateIndex }: AccountsProps) => { optionalNamespaces, requiredNamespaces, networksData, - selectedNetwork, + selectedNetwork!, accounts, currentIndex, ); @@ -145,7 +145,7 @@ const Accounts = ({ currentIndex, updateIndex }: AccountsProps) => { mode="contained" onPress={() => { setHdDialog(true); - setPathCode(`m/44'/${selectedNetwork.coinType}'/`); + setPathCode(`m/44'/${selectedNetwork!.coinType}'/`); }}> Add Account from HD path diff --git a/src/components/NetworkDropdown.tsx b/src/components/NetworkDropdown.tsx index b672285..12f7e76 100644 --- a/src/components/NetworkDropdown.tsx +++ b/src/components/NetworkDropdown.tsx @@ -20,7 +20,7 @@ const NetworkDropdown = ({ updateNetwork }: NetworkDropdownProps) => { return ( setExpanded(!expanded)}> {networksData.map(networkData => ( diff --git a/src/components/PairingModal.tsx b/src/components/PairingModal.tsx index d29bc6a..e100759 100644 --- a/src/components/PairingModal.tsx +++ b/src/components/PairingModal.tsx @@ -100,7 +100,7 @@ const PairingModal = ({ optionalNamespaces, requiredNamespaces, networksData, - selectedNetwork, + selectedNetwork!, accounts, currentIndex, ); diff --git a/src/context/NetworksContext.tsx b/src/context/NetworksContext.tsx index 75f28be..8a023ad 100644 --- a/src/context/NetworksContext.tsx +++ b/src/context/NetworksContext.tsx @@ -11,8 +11,10 @@ const NetworksContext = createContext<{ setNetworksData: React.Dispatch>; networkType: string; setNetworkType: (networkType: string) => void; - selectedNetwork: NetworksDataState; - setSelectedNetwork: React.Dispatch>; + selectedNetwork?: NetworksDataState; + setSelectedNetwork: React.Dispatch< + React.SetStateAction + >; }>({ currentIndex: 0, setCurrentIndex: () => {}, @@ -33,9 +35,7 @@ const NetworksProvider = ({ children }: { children: any }) => { const [networksData, setNetworksData] = useState([]); const [currentIndex, setCurrentIndex] = useState(0); const [networkType, setNetworkType] = useState(EIP155); - const [selectedNetwork, setSelectedNetwork] = useState( - {} as NetworksDataState, - ); + const [selectedNetwork, setSelectedNetwork] = useState(); useEffect(() => { const fetchData = async () => { diff --git a/src/screens/AddNetwork.tsx b/src/screens/AddNetwork.tsx index 608299e..23cf623 100644 --- a/src/screens/AddNetwork.tsx +++ b/src/screens/AddNetwork.tsx @@ -85,7 +85,7 @@ const AddNetwork = () => { setValue('networkName', ethChainDetails.name); setValue('rpcUrl', ethChainDetails.rpc[0]); setValue('blockExplorerUrl', ethChainDetails.explorers?.[0].url || ''); - setValue('coinType', String(ethChainDetails.slip44)); + setValue('coinType', String(ethChainDetails.slip44 ?? '60')); setValue('currencySymbol', ethChainDetails.nativeCurrency.symbol); return; } @@ -99,7 +99,7 @@ const AddNetwork = () => { setValue('rpcUrl', cosmosChainDetails.apis?.rpc?.[0]?.address || ''); setValue('blockExplorerUrl', cosmosChainDetails.explorers?.[0].url || ''); setValue('addressPrefix', cosmosChainDetails.bech32_prefix); - setValue('coinType', String(cosmosChainDetails.slip44)); + setValue('coinType', String(cosmosChainDetails.slip44 ?? '118')); setValue('nativeDenom', cosmosChainDetails.fees?.fee_tokens[0].denom || ''); }, CHAINID_DEBOUNCE_DELAY); diff --git a/src/screens/SignRequest.tsx b/src/screens/SignRequest.tsx index 861272f..8464e92 100644 --- a/src/screens/SignRequest.tsx +++ b/src/screens/SignRequest.tsx @@ -26,7 +26,7 @@ import { useNetworks } from '../context/NetworksContext'; type SignRequestProps = NativeStackScreenProps; const SignRequest = ({ route }: SignRequestProps) => { - const { networksData, selectedNetwork } = useNetworks(); + const { networksData } = useNetworks(); const requestSession = route.params.requestSessionData; const requestName = requestSession?.peer?.metadata?.name; @@ -146,7 +146,7 @@ const SignRequest = ({ route }: SignRequestProps) => { route.params.address, route.params.message, ); - }, [retrieveData, sanitizePath, route, networksData, selectedNetwork]); + }, [retrieveData, sanitizePath, route, networksData]); const handleWalletConnectRequest = async () => { const { requestEvent } = route.params || {};