fix: fix logo type mismatch

hyperweb-io · Sep 14, 2023 · ab3508b · ab3508b
1 parent 63b48bf
commit ab3508b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/packages/react/src/modal/components/views/WalletList.tsx b/packages/react/src/modal/components/views/WalletList.tsx
@@ -54,16 +54,14 @@ function DynamicWalletList({ wallets, onClose }: DynamicWalletListProps) {
           }
         })
         .map((wallet, i) => {
-          const props = getWalletProp(wallet.walletInfo);
           return {
-            ...props,
-            logo: typeof props.logo === 'object' ? props.logo.major : props.logo,
+            ...getWalletProp(wallet.walletInfo),
             // subLogo can either be 'walletConnect' or a valid <img /> src attribute
             subLogo:
               wallet.walletInfo.mode === 'wallet-connect'
                 ? 'walletConnect'
                 : undefined,
-            btmLogo: typeof props.logo === 'object' ? props.logo.minor : wallet.walletInfo.extends,
+            btmLogo: typeof wallet.walletInfo.logo === 'object' ? wallet.walletInfo.logo.minor : wallet.walletInfo.extends,
             badge: ({ MetaMask: 'SNAP' })[wallet.walletInfo.extends],
             shape: (i < 2 && isLargeScreen ? 'square' : 'list') as ('square' | 'list'),
             downloadUrl: '',

diff --git a/packages/react/src/modal/components/views/config.ts b/packages/react/src/modal/components/views/config.ts
@@ -22,23 +22,22 @@ export type ModalViewImplGetter = (
   props: WalletViewProps | WalletListViewProps
 ) => ModalViewImpl;
 
-export const defaultModalViews: Record<keyof ModalViews, ModalViewImplGetter> =
-  {
-    Connecting: ConnectingView,
-    Connected: ConnectedView,
-    Error: ErrorView,
-    NotExist: NotExistView,
-    Rejected: RejectedView,
-    QRCode: QRCodeView,
-    WalletList: WalletListView,
-  };
+export const defaultModalViews: Record<keyof ModalViews, ModalViewImplGetter> = {
+  Connecting: ConnectingView,
+  Connected: ConnectedView,
+  Error: ErrorView,
+  NotExist: NotExistView,
+  Rejected: RejectedView,
+  QRCode: QRCodeView,
+  WalletList: WalletListView,
+};
 
 export function getWalletProp(wallet: Wallet) {
   const { prettyName, mode, name, logo, mobileDisabled } = wallet;
   return {
     name,
     prettyName,
-    logo,
+    logo: typeof logo === 'object' ? logo.major : logo,
     mobileDisabled:
       typeof mobileDisabled === 'boolean' ? mobileDisabled : mobileDisabled(),
     isMobile: mode === 'wallet-connect',