fix: adena connect

Signed-off-by: Norman Meier <[email protected]>
TERITORI · Aug 3, 2023 · 7aea03f · 7aea03f
1 parent 1fe2cea
commit 7aea03f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/packages/components/connectWallet/ConnectAdenaButton.tsx b/packages/components/connectWallet/ConnectAdenaButton.tsx
@@ -4,9 +4,7 @@ import { Linking } from "react-native";
 import { ConnectWalletButton } from "./components/ConnectWalletButton";
 import adenaSVG from "../../../assets/icons/adena.svg";
 import { useFeedbacks } from "../../context/FeedbacksProvider";
-import { useSelectedNetworkInfo } from "../../hooks/useSelectedNetwork";
-import { NetworkKind } from "../../networks";
-import { gnoTeritoriNetwork } from "../../networks/gno-teritori";
+import { getGnoNetworkFromChainId } from "../../networks";
 import {
   setIsAdenaConnected,
   setSelectedNetworkId,
@@ -19,7 +17,6 @@ export const ConnectAdenaButton: React.FC<{
 }> = ({ onDone }) => {
   const { setToastError } = useFeedbacks();
   const dispatch = useAppDispatch();
-  const selectedNetworkInfo = useSelectedNetworkInfo();
   const handlePress = async () => {
     try {
       const adena = (window as any)?.adena;
@@ -30,12 +27,15 @@ export const ConnectAdenaButton: React.FC<{
       const establishResult = await adena.AddEstablish("Teritori dApp");
       console.log("established", establishResult);
       dispatch(setIsAdenaConnected(true));
-      if (selectedNetworkInfo?.kind !== NetworkKind.Gno) {
-        setSelectedNetworkId(gnoTeritoriNetwork.id);
+      const account = await adena.GetAccount();
+      const address = account.data.address;
+      const chainId = account.data.chainId;
+      const network = getGnoNetworkFromChainId(chainId);
+      if (!network) {
+        throw new Error(`Unsupported chainId ${chainId}`);
       }
-      dispatch(
-        setSelectedWalletId(`adena-${(await adena.GetAccount()).data.address}`)
-      );
+      dispatch(setSelectedNetworkId(network.id));
+      dispatch(setSelectedWalletId(`adena-${network.id}-${address}`));
       onDone && onDone();
     } catch (err) {
       console.error(err);

diff --git a/packages/networks/index.ts b/packages/networks/index.ts
@@ -277,6 +277,15 @@ export const mustGetGnoNetwork = (
   return network;
 };
 
+export const getGnoNetworkFromChainId = (chainId: string | undefined) => {
+  if (!chainId) {
+    return undefined;
+  }
+  return allNetworks.find(
+    (network) => network.kind === NetworkKind.Gno && network.chainId === chainId
+  );
+};
+
 export const getEthereumNetwork = (
   networkId: string | undefined
 ): EthereumNetworkInfo | undefined => {