Merge pull request #532 from jordansexton/update-wallet-adapter

Update Wallet Adapter
GooseFX1 · Oct 26, 2022 · d58b9c3 · d58b9c3
2 parents a4daeab + 6130091
commit d58b9c3
Show file tree

Hide file tree

Showing 5 changed files with 1,285 additions and 1,732 deletions.
diff --git a/package.json b/package.json
@@ -16,15 +16,15 @@
     "@project-serum/serum": "^0.13.58",
     "@project-serum/sol-wallet-adapter": "^0.2.5",
     "@pythnetwork/client": "^2.2.0",
-    "@solana-mobile/wallet-adapter-mobile": "^0.0.1-alpha.8",
     "@solana/buffer-layout": "^4.0.0",
+    "@solana-mobile/wallet-adapter-mobile": "^0.9.7",
     "@solana/spl-name-service": "^0.1.3",
     "@solana/spl-token": "^0.2.0",
     "@solana/spl-token-registry": "0.2.221",
-    "@solana/wallet-adapter-base": "^0.9.9",
-    "@solana/wallet-adapter-react": "^0.15.8",
-    "@solana/wallet-adapter-wallets": "^0.16.8",
-    "@solana/web3.js": "^1.41.2",
+    "@solana/wallet-adapter-base": "^0.9.18",
+    "@solana/wallet-adapter-react": "rc",
+    "@solana/wallet-adapter-wallets": "^0.19.5",
+    "@solana/web3.js": "^1.58.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
@@ -110,8 +110,8 @@
     "@types/lodash.chunk": "^4.2.6",
     "@types/lodash.orderby": "^4.6.6",
     "@types/node": "^16.7.2",
-    "@types/react": "^17.0.19",
-    "@types/react-dom": "^17.0.9",
+    "@types/react": "^17.0.50",
+    "@types/react-dom": "^17.0.17",
     "@types/styled-components": "^5.1.13",
     "@types/tape": "^4.13.2",
     "@typescript-eslint/eslint-plugin": "^5.35.1",
@@ -138,8 +138,12 @@
     "yarn-upgrade-all": "^0.5.4"
   },
   "resolutions": {
-    "react-error-overlay": "6.0.9",
-    "@types/react": "17.0.44",
-    "goosefx-ssl-sdk/@solana/spl-token": "0.2.0"
+    "@solana/web3.js": "^1.58.0",
+    "@types/react": "^17.0.50",
+    "@types/react-dom": "^17.0.17",
+    "goosefx-ssl-sdk/@solana/spl-token": "0.2.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-error-overlay": "6.0.9"
   }
 }
diff --git a/src/context/wallet.tsx b/src/context/wallet.tsx
@@ -27,7 +27,7 @@ export const WalletProvider: FC<{ children: ReactNode }> = ({ children }) => {
 
   const wallets = useMemo(() => getWalletAdapters(network), [network])
   return (
-    <WalletAdapterProvider wallets={wallets} localStorageKey="wallet">
+    <WalletAdapterProvider wallets={wallets} localStorageKey="wallet" autoConnect>
       <WalletModalProvider modal={<WalletsModal />}>{children}</WalletModalProvider>
     </WalletAdapterProvider>
   )

diff --git a/src/layouts/App/WalletsModal.tsx b/src/layouts/App/WalletsModal.tsx
@@ -3,7 +3,7 @@ import { logEvent } from 'firebase/analytics'
 import analytics from '../../analytics'
 import styled from 'styled-components'
 import { useWallet } from '@solana/wallet-adapter-react'
-import { WalletName } from '@solana/wallet-adapter-base'
+import { WalletName, WalletReadyState } from '@solana/wallet-adapter-base'
 import { TermsOfService } from './TermsOfService'
 import { Modal } from '../../components'
 import { LITEPAPER_ADDRESS } from '../../constants'
@@ -112,14 +112,16 @@ export const WalletsModal: FC = () => {
           </a>
           .
         </DISCLAIMER>
-        {wallets.map((wallet, index) => (
-          <WALLET key={index} onClick={(event) => handleWalletClick(event, wallet.adapter.name)}>
-            <NAME>{wallet.adapter.name}</NAME>
-            <ICON>
-              <img src={wallet.adapter.icon} alt="icon" />
-            </ICON>
-          </WALLET>
-        ))}
+        {wallets
+          .filter(({ readyState }) => readyState !== WalletReadyState.Unsupported)
+          .map((wallet, index) => (
+            <WALLET key={index} onClick={(event) => handleWalletClick(event, wallet.adapter.name)}>
+              <NAME>{wallet.adapter.name}</NAME>
+              <ICON>
+                <img src={wallet.adapter.icon} alt="icon" />
+              </ICON>
+            </WALLET>
+          ))}
       </BODY>
     </Modal>
   )

diff --git a/src/utils/wallets.ts b/src/utils/wallets.ts
@@ -11,23 +11,31 @@ import {
 } from '@solana/wallet-adapter-wallets'
 import { WalletAdapterNetwork } from '@solana/wallet-adapter-base'
 import {
+  createDefaultAddressSelector,
   createDefaultAuthorizationResultCache,
+  createDefaultWalletNotFoundHandler,
   SolanaMobileWalletAdapter
 } from '@solana-mobile/wallet-adapter-mobile'
 
 export const getWalletAdapters = (network: WalletAdapterNetwork) => [
+  new SolanaMobileWalletAdapter({
+    addressSelector: createDefaultAddressSelector(),
+    appIdentity: {
+      name: 'GooseFX',
+      uri: 'https://goosefx.io/',
+      icon: '/img/assets/GOFX-icon.svg'
+    },
+    authorizationResultCache: createDefaultAuthorizationResultCache(),
+    cluster: network,
+    onWalletNotFound: createDefaultWalletNotFoundHandler()
+  }),
   new PhantomWalletAdapter(),
-  new GlowWalletAdapter(),
+  new GlowWalletAdapter({ network }),
   new SolflareWalletAdapter({ network }),
   new TorusWalletAdapter(),
   new MathWalletAdapter(),
   new SolongWalletAdapter(),
   new SolletExtensionWalletAdapter({ network }),
   new SolletWalletAdapter({ network }),
-  new SlopeWalletAdapter(),
-  new SolanaMobileWalletAdapter({
-    appIdentity: { name: 'Goosefx App' },
-    authorizationResultCache: createDefaultAuthorizationResultCache(),
-    cluster: network
-  })
+  new SlopeWalletAdapter()
 ]