@daimo/pay 1.7.5 → 1.7.6

package/build/index.js

@@ -22,7 +22,7 @@ import { WalletSignTransactionError, WalletSendTransactionError } from '@solana/
 import { normalize } from 'viem/ens';
 
 var name = "@daimo/pay";
-var version = "1.7.5";
+var version = "1.7.6";
 var author = "Daimo";
 var homepage = "https://pay.daimo.com";
 var license = "BSD-2-Clause license";
@@ -61,7 +61,7 @@ var keywords = [
 	"crypto"
 ];
 var dependencies = {
-	"@daimo/pay-common": "1.7.5",
+	"@daimo/pay-common": "1.7.6",
 	"@rollup/plugin-typescript": "^12.1.2",
 	"@solana/wallet-adapter-base": "^0.9.23",
 	"@solana/wallet-adapter-react": "^0.15.35",
@@ -536,6 +536,7 @@ const walletConfigs = {
     },
     "metaMask, metaMask-io, io.metamask, io.metamask.mobile, metaMaskSDK": {
         name: "MetaMask",
+        shortName: "MetaMask",
         icon: jsx(Logos$1.MetaMask, {}),
         iconConnector: jsx(Logos$1.MetaMask, {}),
         iconShouldShrink: true,
@@ -4874,32 +4875,42 @@ const useWallets = (isMobile) => {
     const context = usePayContext();
     if (isMobile) {
         const mobileWallets = [];
-        // Add Rainbow first
-        mobileWallets.push({
-            id: "me.rainbow",
-            ...walletConfigs["me.rainbow"],
-        });
-        // Add MetaMask second
-        const metaMaskConnector = connectors.find((c) => c.id === "metaMask");
-        if (metaMaskConnector) {
-            mobileWallets.push({
-                id: metaMaskConnector.id,
-                connector: metaMaskConnector,
-                ...walletConfigs["metaMask, metaMask-io, io.metamask, io.metamask.mobile, metaMaskSDK"],
-            });
-        }
-        // Add WalletConnect and other wallets
+        // Add injected wallet (if any) first
         connectors.forEach((connector) => {
             if (connector.id === "metaMask")
                 return;
+            if (connector.id === "walletConnect")
+                return;
             if (isCoinbaseWalletConnector(connector.id))
                 return;
             mobileWallets.push({
                 id: connector.id,
                 connector,
-                ...walletConfigs[connector.id],
+                shortName: connector.name,
+                iconConnector: jsx("img", { src: connector.icon, alt: connector.name }),
+                iconShape: "squircle",
             });
         });
+        function addIfNotPresent(idList) {
+            if (mobileWallets.find((w) => idList.includes(w.id)))
+                return;
+            const wallet = assertNotNull(walletConfigs[idList], () => `missing ${idList}`);
+            mobileWallets.push({
+                id: idList,
+                ...wallet,
+            });
+        }
+        addIfNotPresent("me.rainbow");
+        addIfNotPresent("metaMask, metaMask-io, io.metamask, io.metamask.mobile, metaMaskSDK");
+        // Add WalletConnect last
+        const walletConnectConnector = connectors.find((c) => c.id === "walletConnect");
+        if (walletConnectConnector) {
+            mobileWallets.push({
+                id: walletConnectConnector.id,
+                connector: walletConnectConnector,
+                ...walletConfigs[walletConnectConnector.id],
+            });
+        }
         return mobileWallets;
     }
     const wallets = connectors.map((connector) => {