🪄 [QA] Update stage environments

package.json

@@ -22,6 +22,7 @@
     "@rocicorp/rails": "^0.8.0",
     "@rocicorp/reflect": "^0.38.202311200859",
     "@web3-onboard/core": "^2.21.0",
+    "@web3-onboard/metamask": "^2.0.1",
     "@web3-onboard/react": "^2.8.11",
     "@web3-onboard/taho": "^2.0.5",
     "@web3-onboard/trezor": "^2.4.2",

src/assets/questline-data.json

@@ -52,7 +52,7 @@
         {
           "id": "8_2",
           "name": "Vampire Attack: Bridge funds from Arbitrum",
-          "description": "Bridge ETH or USDC from Arbitrum to Base using Hop Exchange. \n \nAccepted assets: [ETH](https://app.hop.exchange/#/send?sourceNetwork=arbitrum&destNetwork=base) and [USDC](https://app.hop.exchange/#/send?sourceNetwork=arbitrum&destNetwork=base&token=USDC), bridging anything else won't be counted towards XP \n \nMechanics: The more you bridge, the higher the reward. \n \nReward: each 1 dollar bridge from Arbitrum to Base will be worth 10 contract interactions",
+          "description": "Bridge ETH or USDC from Arbitrum to Base using Hop Exchange. \n \nAccepted assets: [ETH](https://app.hop.exchange/#/send?sourceNetwork=arbitrum&destNetwork=base) and [USDC](https://app.hop.exchange/#/send?sourceNetwork=arbitrum&destNetwork=base&token=USDC), bridging anything else won't be counted towards XP \n \nMechanics: The more you bridge, the higher the reward. \n \nReward: Each 1 dollar bridged from Arbitrum to Base will be worth 10 contract interactions.",
           "isNew": true,
           "isAttack": true
         }

src/shared/hooks/wallets.ts

@@ -1,4 +1,4 @@
-import { useConnectWallet } from "@web3-onboard/react"
+import { useConnectWallet, useSetChain } from "@web3-onboard/react"
 import { useCallback, useEffect, useMemo, useState } from "react"
 import { ethers, logger } from "ethers"
 import {
@@ -23,6 +23,7 @@ import {
 } from "shared/constants"
 import { Network } from "@ethersproject/networks"
 import { Logger, defineReadOnly } from "ethers/lib/utils"
+import { usePostHog } from "posthog-js/react"
 import { useAssistant } from "./assistant"
 import { useInterval, useLocalStorageChange } from "./helpers"
 
@@ -171,33 +172,56 @@ export function useWalletOnboarding(): {
   return { walletOnboarded: value, updateWalletOnboarding: updateStorage }
 }
 
-export function useConnect() {
-  const [{ wallet }, connect, disconnect] = useConnectWallet()
-  const { updateWalletOnboarding } = useWalletOnboarding()
+export function useCorrectChain() {
+  const [{ wallet }] = useConnectWallet()
+  const [{ settingChain /* connectedChain */ }, setChain] = useSetChain()
+  const [chainSwitched, setChainSwitched] = useState(false)
 
   useEffect(() => {
     if (wallet?.provider !== undefined) {
       const setCorrectChain = async () => {
-        const walletProvider = new ethers.providers.Web3Provider(
-          wallet.provider
-        )
-        await walletProvider.send("wallet_switchEthereumChain", [
-          { chainId: ARBITRUM_SEPOLIA.id },
-        ])
+        await setChain({
+          chainId: ARBITRUM_SEPOLIA.id,
+        })
+        setChainSwitched(true)
       }
 
-      setCorrectChain()
+      // TODO: Metamask has a bug where it does not switch to the correct chain
+      // when the user adds new chain to the wallet. `connectedChain` is not updated
+      // until user reloads the page.
+      if (
+        !settingChain &&
+        !chainSwitched /* && connectedChain?.id !== ARBITRUM_SEPOLIA.id */
+      ) {
+        setCorrectChain()
+      }
     }
-  }, [wallet?.provider])
+  }, [wallet?.provider, setChain, settingChain, chainSwitched])
+}
+
+export function useConnect() {
+  const [{ wallet }, connect, disconnect] = useConnectWallet()
+  const { updateWalletOnboarding } = useWalletOnboarding()
+  const posthog = usePostHog()
 
   const disconnectBound = useCallback(() => {
     updateWalletOnboarding("")
     return wallet && disconnect(wallet)
   }, [wallet, disconnect, updateWalletOnboarding])
 
+  const connectBound = useCallback(async () => {
+    const [walletState] = await connect()
+
+    if (walletState) {
+      posthog?.capture("Wallet connected", {
+        wallet: walletState.label,
+      })
+    }
+  }, [connect, posthog])
+
   return {
     isConnected: process.env.IS_COMING_SOON !== "true" && !!wallet,
-    connect,
+    connect: connectBound,
     disconnect: disconnectBound,
   }
 }

src/shared/utils/web3Onboard.ts

@@ -1,38 +1,60 @@
 import tahoWalletModule from "@web3-onboard/taho"
 import trezorModule from "@web3-onboard/trezor"
 import walletConnectModule from "@web3-onboard/walletconnect"
+import metamaskSDK from "@web3-onboard/metamask"
 import { init } from "@web3-onboard/react"
 import { ARBITRUM_SEPOLIA } from "shared/constants"
+import favicon from "shared/assets/favicon.svg"
+
+const SUBSACAPE_NAME = "Subscape"
+const SUBSACAPE_URL = "https://app.taho.xyz"
+const SUBSACAPE_ICON = favicon
+const chains = [ARBITRUM_SEPOLIA]
+
+const appMetadata = {
+  name: SUBSACAPE_NAME,
+  description: "Subscape dapp",
+  icon: SUBSACAPE_ICON,
+}
 
 const walletsSetup = {
   taho: tahoWalletModule(),
   trezor: trezorModule({
     // TODO: use proper email and url
     email: "[email protected]",
-    appUrl: "https://taho.xyz",
+    appUrl: SUBSACAPE_URL,
   }),
   walletConnect: walletConnectModule({
     projectId: process.env.WALLET_CONNECT_ID ?? "",
     requiredChains: [parseInt(ARBITRUM_SEPOLIA.id, 16)],
   }),
+  metamask: metamaskSDK({
+    options: {
+      extensionOnly: false,
+      dappMetadata: {
+        name: SUBSACAPE_NAME,
+        url: SUBSACAPE_URL,
+      },
+    },
+  }),
 }
 
-const wallets = [walletsSetup.taho]
-
-const chains = [ARBITRUM_SEPOLIA]
-// TODO: decide what metadata should look like
-const appMetadata = {
-  name: "Taho Dapp",
-  description: "Taho Dapp",
-  icon: "https://raw.githubusercontent.com/tahowallet/taho.xyz/29a091abf919b5cfcf511fd10c41d73490ce4f23/src/shared/favicon.svg",
-}
+const hasTaho = "taho" in window
+const wallets = hasTaho
+  ? [walletsSetup.taho]
+  : [walletsSetup.taho, walletsSetup.metamask]
 
 const web3Onboard = init({
   wallets,
   chains,
   appMetadata,
   connect: {
-    autoConnectLastWallet: true,
+    // TODO: web3onboard remembers last wallet that was used. If it was MM but MM becomes
+    // unavailable then web3onboard will try to auto connect to MM and will fail.
+    // So to avoid problem with attempting auto connection to the wallet
+    // that is not available on the wallet lists let's just disable autoConnect
+    // feature for Metamask for now.
+    autoConnectLastWallet: hasTaho,
     iDontHaveAWalletLink:
       "https://chrome.google.com/webstore/detail/taho/eajafomhmkipbjmfmhebemolkcicgfmd",
     removeWhereIsMyWalletWarning: true,

src/ui/DApps/DesktopDApp.tsx

@@ -5,6 +5,7 @@ import {
   reflectSingleton,
   useBalanceFetch,
   useConnect,
+  useCorrectChain,
   useGameDataFetch,
   useGameLoadDataFetch,
   useInitializeReflect,
@@ -31,10 +32,11 @@ function DesktopDAppContent() {
   usePopulationFetch()
   useGameDataFetch()
   useWalletChange()
+  useCorrectChain()
 
   return (
     <>
-      {!walletOnboarded && <Onboarding />}
+      {(!walletOnboarded || !isConnected) && <Onboarding />}
       {walletOnboarded && isConnected && <IslandView />}
       <PrivacyPolicy />
     </>