Merge pull request #7 from aurora-is-near/ycg/skip-access-key

Ycg/skip access key
aurora-is-near · Oct 25, 2024 · bd2bb51 · bd2bb51
2 parents cfd6a4f + 37a9667
commit bd2bb51
Show file tree

Hide file tree

Showing 6 changed files with 215 additions and 57 deletions.
diff --git a/next.config.mjs b/next.config.mjs
@@ -11,8 +11,8 @@ const cspHeader = `
   form-action 'self';
   worker-src 'self' blob:;
   frame-ancestors 'self' *.walletconnect.com *.walletconnect.org;
-  connect-src 'self' d3hb14vkzrxvla.cloudfront.net beaconapi.helpscout.net chatapi.helpscout.net *.near.org *.ref-finance.com *.ref.finance *.aurora.dev api.web3modal.com *.walletconnect.org *.walletconnect.com *.sentry.io wss://relay.walletconnect.com wss://relay.walletconnect.org *.walletlink.org wss://www.walletlink.org *.coinbase.com https://rpc.testnet.near.org https://closerpc.aurora.dev https://api.web3modal.org www.googletagmanager.com *.google-analytics.com;
-  frame-src  *.walletconnect.org *.walletconnect.com;
+  connect-src 'self' d3hb14vkzrxvla.cloudfront.net beaconapi.helpscout.net chatapi.helpscout.net *.near.org *.ref-finance.com *.ref.finance *.aurora.dev api.web3modal.com *.walletconnect.org *.walletconnect.com *.sentry.io wss://relay.walletconnect.com wss://relay.walletconnect.org *.walletlink.org wss://www.walletlink.org *.coinbase.com https://rpc.testnet.near.org https://closerpc.aurora.dev https://api.web3modal.org www.googletagmanager.com *.google-analytics.com https://h4n.app https://*.peersyst.tech;
+  frame-src  *.walletconnect.org *.walletconnect.com https://my.herewallet.app https://*.peersyst.tech/;
 `;
 
 /** @type {import('next').NextConfig} */

diff --git a/package.json b/package.json
@@ -14,14 +14,15 @@
   "dependencies": {
     "@headlessui/react": "2.1.1",
     "@heroicons/react": "2.1.3",
-    "@near-wallet-selector/ethereum-wallets": "8.9.13",
-    "@near-wallet-selector/account-export": "8.9.13",
-    "@near-wallet-selector/core": "8.9.13",
-    "@near-wallet-selector/meteor-wallet": "8.9.13",
-    "@near-wallet-selector/modal-ui": "8.9.13",
-    "@near-wallet-selector/my-near-wallet": "8.9.13",
-    "@near-wallet-selector/wallet-connect": "8.9.13",
-    "@near-wallet-selector/wallet-utils": "8.9.13",
+    "@near-wallet-selector/ethereum-wallets": "8.9.14",
+    "@near-wallet-selector/account-export": "8.9.14",
+    "@near-wallet-selector/core": "8.9.14",
+    "@near-wallet-selector/here-wallet": "8.9.14",
+    "@near-wallet-selector/meteor-wallet": "8.9.14",
+    "@near-wallet-selector/modal-ui": "8.9.14",
+    "@near-wallet-selector/my-near-wallet": "8.9.14",
+    "@near-wallet-selector/wallet-connect": "8.9.14",
+    "@near-wallet-selector/wallet-utils": "8.9.14",
     "@ref-finance/ref-sdk": "1.4.0",
     "@sentry/nextjs": "8.9.2",
     "@supabase/supabase-js": "2.43.4",

diff --git a/public/img/wallets/here-wallet.png b/public/img/wallets/here-wallet.png
diff --git a/src/app/(index)/WalletsList.tsx b/src/app/(index)/WalletsList.tsx
@@ -10,6 +10,11 @@ const nearWallets = [
     url: "https://mynearwallet.com",
     imgUrl: "/img/wallets/mynearwallet.png",
   },
+  {
+    name: "HERE wallet",
+    url: "https://www.herewallet.app",
+    imgUrl: "/img/wallets/here-wallet.png",
+  },
   {
     name: "Meteor",
     url: "https://wallet.meteorwallet.app",

diff --git a/src/contexts/WalletSelectorContext.tsx b/src/contexts/WalletSelectorContext.tsx
@@ -11,6 +11,7 @@ import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
 import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
 import { setupEthereumWallets } from "@near-wallet-selector/ethereum-wallets";
 import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet";
+import { setupHereWallet } from "@near-wallet-selector/here-wallet";
 import type { ReactNode } from "react";
 import React, {
   useCallback,
@@ -138,6 +139,7 @@ export const WalletSelectorContextProvider: React.FC<{
           wagmiConfig,
           web3Modal,
           alwaysOnboardDuringSignIn: true,
+          skipSignInAccessKey: true,
         }),
         setupWalletConnect({
           projectId: projectId,
@@ -151,9 +153,15 @@ export const WalletSelectorContextProvider: React.FC<{
           ],
         }),
         setupMeteorWallet(),
+        setupHereWallet(),
       ],
     });
-    const _modal = setupModal(_selector, { contractId: "" });
+    // const _modal = setupModal(_selector, { contractId: "" });
+    // NOTE: We use an acces key to be compatible with all NEAR wallets,
+    // but skip the login access key when possible, for example skipSignInAccessKey with setupEthereumWallets.
+    const _modal = setupModal(_selector, {
+      contractId: IS_MAINNET ? "welcome-to.near" : "welcome-to-near.testnet",
+    });
     const state = _selector.store.getState();
     setAccounts(state.accounts);
     setSelector(_selector);