Fix safe

.github/workflows/knip.yaml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install pnpm
-        run: corepack enable pnpm
+        run: npm i -g --force corepack && corepack enable pnpm
 
       - name: Install Node.js
         uses: actions/setup-node@v3

.github/workflows/pages-deployment.yaml

@@ -22,7 +22,7 @@ jobs:
         run: sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
 
       - name: Install pnpm
-        run: corepack enable pnpm
+        run: npm i -g --force corepack && corepack enable pnpm
 
       - name: Install Node.js
         uses: actions/setup-node@v3

.github/workflows/test.yaml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install pnpm
-        run: corepack enable pnpm
+        run: npm i -g --force corepack && corepack enable pnpm
 
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install pnpm
-        run: corepack enable pnpm
+        run: npm i -g --force corepack && corepack enable pnpm
 
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install pnpm
-        run: corepack enable pnpm
+        run: npm i -g --force corepack && corepack enable pnpm
 
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -102,7 +102,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install pnpm
-        run: corepack enable pnpm
+        run: npm i -g --force corepack && corepack enable pnpm
 
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -153,7 +153,7 @@ jobs:
       - run: ./scripts/check-chrome.sh
 
       - name: Install pnpm
-        run: corepack enable pnpm
+        run: npm i -g --force corepack && corepack enable pnpm
 
       - name: Install Node.js
         uses: actions/setup-node@v3

e2e/specs/stateless/extendNames.spec.ts

@@ -157,13 +157,13 @@ test('should be able to extend a single unwrapped name from profile', async ({
 
   await test.step('should show correct fiat values', async () => {
     await extendNamesModal.getCurrencyToggle.click({ force: true })
-    await expect(extendNamesModal.getInvoiceExtensionFee).toContainText('$10.00')
-    await expect(extendNamesModal.getInvoiceTransactionFee).toContainText('$0.13')
-    await expect(extendNamesModal.getInvoiceTotal).toContainText('$10.13')
+    await expect(extendNamesModal.getInvoiceExtensionFee).toContainText('$10.0')
+    await expect(extendNamesModal.getInvoiceTransactionFee).toContainText('$0.1')
+    await expect(extendNamesModal.getInvoiceTotal).toContainText('$10.1')
     await extendNamesModal.getCounterMinusButton.click()
-    await expect(extendNamesModal.getInvoiceExtensionFee).toContainText('$5.00')
-    await expect(extendNamesModal.getInvoiceTransactionFee).toContainText('$0.13')
-    await expect(extendNamesModal.getInvoiceTotal).toContainText('$5.13')
+    await expect(extendNamesModal.getInvoiceExtensionFee).toContainText('$5.0')
+    await expect(extendNamesModal.getInvoiceTransactionFee).toContainText('$0.1')
+    await expect(extendNamesModal.getInvoiceTotal).toContainText('$5.1')
   })
 
   await test.step('should extend', async () => {

next.config.mjs

@@ -32,6 +32,40 @@ const nextConfig = {
   images: {
     domains: ['metadata.ens.domains'],
   },
+  // async headers() {
+  //   // keep this in case we need to debug Safe in the future
+  //   if (process.env.NODE_ENV === 'development') {
+  //     return [
+  //       {
+  //         source: '/manifest.json',
+  //         headers: [
+  //           {
+  //             key: 'Access-Control-Allow-Origin',
+  //             value: '*',
+  //           },
+  //           {
+  //             key: 'Access-Control-Allow-Methods',
+  //             value: 'GET, OPTIONS',
+  //           },
+  //           {
+  //             key: 'Access-Control-Allow-Headers',
+  //             value: 'X-Requested-With, content-type, Authorization',
+  //           },
+  //         ],
+  //       },
+  //       {
+  //         source: '/(.*)',
+  //         headers: [
+  //           {
+  //             key: 'Content-Security-Policy',
+  //             value: "frame-ancestors 'self' https://app.safe.global;",
+  //           },
+  //         ],
+  //       },
+  //     ]
+  //   }
+  //   return []
+  // },
   async rewrites() {
     return [
       {

public/manifest.json

@@ -15,5 +15,6 @@
   ],
   "theme_color": "#5298FF",
   "background_color": "#F6F6F6",
-  "display": "standalone"
+  "display": "standalone",
+  "description": "Decentralised naming for wallets, websites, & more"
 }

src/utils/getDefaultWallets.ts

@@ -12,37 +12,46 @@ import {
   walletConnectWallet,
 } from '@rainbow-me/rainbowkit/wallets'
 
+import { isInsideSafe } from './safe'
+
 export const getDefaultWallets = ({
   appName,
   projectId,
 }: {
   appName: string
   projectId: string
 }) => {
-  const wallets: WalletList = [
-    {
-      groupName: 'Popular',
-      wallets: [
-        // injected / not always shown
-        injectedWallet,
-        safeWallet,
-        braveWallet,
-        () => ({
-          ...phantomWallet(),
-          iconUrl: async () => (await import('../assets/PhantomWallet')).default,
-          iconBackground: '#9A8AEE',
-          downloadUrls: {},
-        }),
-        // always shown
-        walletConnectWallet,
-        rainbowWallet,
-        coinbaseWallet,
-        metaMaskWallet,
-        ledgerWallet,
-        argentWallet,
-      ],
-    },
-  ]
+  const wallets: WalletList = isInsideSafe()
+    ? [
+        {
+          groupName: 'Popular',
+          wallets: [safeWallet],
+        },
+      ]
+    : [
+        {
+          groupName: 'Popular',
+          wallets: [
+            // injected / not always shown
+            injectedWallet,
+            safeWallet,
+            braveWallet,
+            () => ({
+              ...phantomWallet(),
+              iconUrl: async () => (await import('../assets/PhantomWallet')).default,
+              iconBackground: '#9A8AEE',
+              downloadUrls: {},
+            }),
+            // always shown
+            walletConnectWallet,
+            rainbowWallet,
+            coinbaseWallet,
+            metaMaskWallet,
+            ledgerWallet,
+            argentWallet,
+          ],
+        },
+      ]
 
   return connectorsForWallets(wallets, {
     appName,

src/utils/query/wagmi.ts

@@ -13,6 +13,7 @@ import {
 
 import { WC_PROJECT_ID } from '../constants'
 import { getDefaultWallets } from '../getDefaultWallets'
+import { isInsideSafe } from '../safe'
 
 const isLocalProvider = !!process.env.NEXT_PUBLIC_PROVIDER
 
@@ -107,7 +108,7 @@ const transports = {
 const wagmiConfig_ = createConfig({
   connectors,
   ssr: true,
-  multiInjectedProviderDiscovery: true,
+  multiInjectedProviderDiscovery: !isInsideSafe(),
   storage: createStorage({ storage: localStorageWithInvertMiddleware(), key: prefix }),
   chains,
   client: ({ chain }) => {

src/utils/safe.ts

@@ -116,3 +116,5 @@ export const fetchTxFromSafeTxHash = async ({
     transactionHash: data.txHash,
   }
 }
+
+export const isInsideSafe = () => typeof window !== 'undefined' && window !== window.parent