@dodoex/wallet-web3-react 0.1.0 → 0.2.1

package/dist/types/WalletConnect/ConnectDialog.d.ts

@@ -1,8 +1,9 @@
 import WalletWeb3 from '@dodoex/wallet-web3';
 import { ConnectPageProps } from './ConnectPage';
-export default function ConnectDialog({ open, onClose, walletWeb3, onConnectWallet, }: {
+export default function ConnectDialog({ open, onClose, walletWeb3, onConnectWallet, WalletTag, }: {
     open: boolean;
     onClose: () => void;
     walletWeb3: WalletWeb3;
     onConnectWallet?: ConnectPageProps['onConnectWallet'];
+    WalletTag?: ConnectPageProps['WalletTag'];
 }): JSX.Element;

package/dist/types/WalletConnect/ConnectPage.d.ts

@@ -1,5 +1,10 @@
+import React from 'react';
 import WalletWeb3 from '@dodoex/wallet-web3';
 import { WalletItem } from '../hooks/useConnectWallet';
+import { WalletTagProps } from '../components/WalletTag';
+export type ConnectDialogWalletTag = React.FC<WalletTagProps & {
+    children?: React.ReactNode;
+}>;
 export interface ConnectPageProps {
     chainId: number;
     account?: string;
@@ -7,6 +12,7 @@ export interface ConnectPageProps {
     showOtherInjectWallet?: boolean;
     onClose: () => void;
     onConnectWallet?: (wallet: WalletItem) => void | Promise<void>;
+    WalletTag?: ConnectDialogWalletTag;
 }
-declare function ConnectPage({ chainId, account, walletWeb3, showOtherInjectWallet, onClose, onConnectWallet, }: ConnectPageProps): JSX.Element;
+declare function ConnectPage({ chainId, account, walletWeb3, showOtherInjectWallet, onClose, onConnectWallet, WalletTag, }: ConnectPageProps): JSX.Element;
 export default ConnectPage;

package/dist/types/WalletConnect/WalletDialog.d.ts

@@ -1,8 +1,9 @@
 import WalletWeb3 from '@dodoex/wallet-web3';
 import { ConnectPageProps } from './ConnectPage';
-export default function WalletDialog({ open, onClose, walletWeb3, onConnectWallet, }: {
+export default function WalletDialog({ open, onClose, walletWeb3, onConnectWallet, WalletTag, }: {
     open: boolean;
     onClose: () => void;
     walletWeb3: WalletWeb3;
     onConnectWallet?: ConnectPageProps['onConnectWallet'];
+    WalletTag?: ConnectPageProps['WalletTag'];
 }): JSX.Element;

package/dist/types/components/WalletTag.d.ts

@@ -1,7 +1,8 @@
 import { WalletItem } from '../hooks/useConnectWallet';
-export default function WalletTag({ loading, wallet, isChecked, installed, }: {
+export interface WalletTagProps {
     loading: boolean;
     wallet: WalletItem;
     isChecked: boolean;
     installed: boolean;
-}): JSX.Element | null;
+}
+export default function WalletTag({ loading, wallet, isChecked, installed, }: WalletTagProps): JSX.Element | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dodoex/wallet-web3-react",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "source": "src/index.tsx",
   "types": "dist/types/index.d.ts",
   "typings": "dist/types/index.d.ts",
@@ -10,7 +10,9 @@
     "start": "yarn workspace doc start",
     "build": "yarn extract && yarn compile && rollup -c",
     "extract": "lingui extract --clean",
-    "compile": "lingui compile"
+    "compile": "lingui compile",
+    "release.npm-publish": "npm publish --access public",
+    "release.npm-publish-beta": "npm publish --tag beta"
   },
   "author": "",
   "publishConfig": {
@@ -73,4 +75,4 @@
     "qrcode.react": "^4.2.0",
     "react-infinite-scroller": "^1.2.6"
   }
-}
+}

package/src/WalletConnect/ConnectDialog.tsx

@@ -8,11 +8,13 @@ export default function ConnectDialog({
   onClose,
   walletWeb3,
   onConnectWallet,
+  WalletTag,
 }: {
   open: boolean;
   onClose: () => void;
   walletWeb3: WalletWeb3;
   onConnectWallet?: ConnectPageProps['onConnectWallet'];
+  WalletTag?: ConnectPageProps['WalletTag'];
 }) {
   const { account, chainId: connectChainId } = useWalletStore();
   return (
@@ -24,6 +26,7 @@ export default function ConnectDialog({
         showOtherInjectWallet
         onClose={onClose}
         onConnectWallet={onConnectWallet}
+        WalletTag={WalletTag}
       />
     </Dialog>
   );

package/src/WalletConnect/ConnectPage.tsx

@@ -3,7 +3,7 @@ import WalletWeb3, { useWalletStore, WalletType } from '@dodoex/wallet-web3';
 import { useConnectWallet, WalletItem } from '../hooks/useConnectWallet';
 import { alpha, Box, ButtonBase, Checkbox, useTheme } from '@dodoex/components';
 import { useWalletConnectContext } from '../WalletConnectProvider';
-import WalletTag from '../components/WalletTag';
+import WalletTag, { WalletTagProps } from '../components/WalletTag';
 import { ArrowRight, More } from '@dodoex/icons';
 import { Trans } from '@lingui/macro';
 import ConnectLedger from './ConnectLedger';
@@ -20,6 +20,12 @@ const walletGroupStyle = {
   py: 6,
 };
 
+export type ConnectDialogWalletTag = React.FC<
+  WalletTagProps & {
+    children?: React.ReactNode;
+  }
+>;
+
 function WalletGroupItem({
   chainId,
   wallet,
@@ -33,6 +39,7 @@ function WalletGroupItem({
   onShowLedgerConnect,
   onShowAlchemyConnect,
   onConnectWallet,
+  WalletTag: WalletTagProps,
 }: {
   chainId?: number;
   wallet: WalletItem;
@@ -46,6 +53,7 @@ function WalletGroupItem({
   onShowLedgerConnect: () => void;
   onShowAlchemyConnect: () => void;
   onConnectWallet?: (wallet: WalletItem) => void | Promise<void>;
+  WalletTag?: ConnectDialogWalletTag;
 }) {
   const theme = useTheme();
   const isChecked =
@@ -178,12 +186,28 @@ function WalletGroupItem({
         />
         {wallet.title}
       </Box>
-      <WalletTag
-        loading={loading}
-        wallet={wallet}
-        isChecked={isChecked}
-        installed={!!installed}
-      />
+      {WalletTagProps ? (
+        <WalletTagProps
+          loading={loading}
+          wallet={wallet}
+          isChecked={isChecked}
+          installed={!!installed}
+        >
+          <WalletTag
+            loading={loading}
+            wallet={wallet}
+            isChecked={isChecked}
+            installed={!!installed}
+          />
+        </WalletTagProps>
+      ) : (
+        <WalletTag
+          loading={loading}
+          wallet={wallet}
+          isChecked={isChecked}
+          installed={!!installed}
+        />
+      )}
     </Box>
   );
 }
@@ -195,6 +219,7 @@ export interface ConnectPageProps {
   showOtherInjectWallet?: boolean;
   onClose: () => void;
   onConnectWallet?: (wallet: WalletItem) => void | Promise<void>;
+  WalletTag?: ConnectDialogWalletTag;
 }
 function ConnectPage({
   chainId,
@@ -203,6 +228,7 @@ function ConnectPage({
   showOtherInjectWallet,
   onClose,
   onConnectWallet,
+  WalletTag,
 }: ConnectPageProps) {
   const theme = useTheme();
   const highlightBackgroundColor =
@@ -286,6 +312,7 @@ function ConnectPage({
                   onShowLedgerConnect={() => setShowLedgerConnect(true)}
                   onShowAlchemyConnect={() => setShowAlchemyConnect(true)}
                   onConnectWallet={onConnectWallet}
+                  WalletTag={WalletTag}
                 />
               );
             })}

package/src/WalletConnect/WalletDialog.tsx

@@ -11,11 +11,13 @@ export default function WalletDialog({
   onClose,
   walletWeb3,
   onConnectWallet,
+  WalletTag,
 }: {
   open: boolean;
   onClose: () => void;
   walletWeb3: WalletWeb3;
   onConnectWallet?: ConnectPageProps['onConnectWallet'];
+  WalletTag?: ConnectPageProps['WalletTag'];
 }) {
   const { SendTokenPage, chainId: selectedChainId } = useWalletConnectContext();
   const { account, chainId: connectChainId, connected } = useWalletStore();
@@ -68,6 +70,7 @@ export default function WalletDialog({
           showOtherInjectWallet
           onClose={onClose}
           onConnectWallet={onConnectWallet}
+          WalletTag={WalletTag}
         />
       )}
     </Dialog>

package/src/components/WalletTag.tsx

@@ -3,17 +3,19 @@ import { WalletType } from '@dodoex/wallet-web3';
 import { Trans } from '@lingui/macro';
 import { WalletItem } from '../hooks/useConnectWallet';
 
+export interface WalletTagProps {
+  loading: boolean;
+  wallet: WalletItem;
+  isChecked: boolean;
+  installed: boolean;
+};
+
 export default function WalletTag({
   loading,
   wallet,
   isChecked,
   installed,
-}: {
-  loading: boolean;
-  wallet: WalletItem;
-  isChecked: boolean;
-  installed: boolean;
-}) {
+}: WalletTagProps) {
   const theme = useTheme();
   const greenColor = theme.palette.success.main;
   const connectedColor = theme.palette.mode === 'light' ? '#EB8D27' : '#FFE804';

package/src/hooks/useConnectWallet.ts

@@ -87,6 +87,8 @@ export function useWalletListByNetwork(
   React.useEffect(() => {
     const computed = async () => {
       if (walletWeb3 && chainId !== undefined) {
+        // Reset disabled state before getting wallet list
+        await walletWeb3.setDisabledState();
         const walletListOrigin = walletWeb3.getWalletList(chainId, {
           eip6963WalletList,
         });

package/src/locales/en.po

@@ -68,15 +68,15 @@ msgstr "Claim Rewards"
 msgid "Connect Alchemy"
 msgstr "Connect Alchemy"
 
-#: src/WalletConnect/ConnectPage.tsx:253
+#: src/WalletConnect/ConnectPage.tsx:279
 msgid "Connect Wallet"
 msgstr "Connect Wallet"
 
-#: src/components/WalletTag.tsx:58
+#: src/components/WalletTag.tsx:60
 msgid "Connected"
 msgstr "Connected"
 
-#: src/components/WalletTag.tsx:42
+#: src/components/WalletTag.tsx:44
 msgid "Connecting"
 msgstr "Connecting"
 
@@ -124,7 +124,7 @@ msgstr "Go Back"
 msgid "ID"
 msgstr "ID"
 
-#: src/components/WalletTag.tsx:107
+#: src/components/WalletTag.tsx:109
 msgid "Installed Wallet"
 msgstr "Installed Wallet"
 
@@ -136,7 +136,7 @@ msgstr "Invalid email"
 msgid "Invalid wallet address"
 msgstr "Invalid wallet address"
 
-#: src/components/WalletTag.tsx:74
+#: src/components/WalletTag.tsx:76
 msgid "Last connection"
 msgstr "Last connection"
 
@@ -156,7 +156,7 @@ msgstr "Log in with your email"
 msgid "Log in with your email or a passkey"
 msgstr "Log in with your email or a passkey"
 
-#: src/WalletConnect/ConnectPage.tsx:362
+#: src/WalletConnect/ConnectPage.tsx:389
 msgid "More Wallets"
 msgstr "More Wallets"
 

package/src/locales/zh.po

@@ -68,15 +68,15 @@ msgstr ""
 msgid "Connect Alchemy"
 msgstr ""
 
-#: src/WalletConnect/ConnectPage.tsx:253
+#: src/WalletConnect/ConnectPage.tsx:279
 msgid "Connect Wallet"
 msgstr ""
 
-#: src/components/WalletTag.tsx:58
+#: src/components/WalletTag.tsx:60
 msgid "Connected"
 msgstr ""
 
-#: src/components/WalletTag.tsx:42
+#: src/components/WalletTag.tsx:44
 msgid "Connecting"
 msgstr ""
 
@@ -124,7 +124,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: src/components/WalletTag.tsx:107
+#: src/components/WalletTag.tsx:109
 msgid "Installed Wallet"
 msgstr ""
 
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Invalid wallet address"
 msgstr ""
 
-#: src/components/WalletTag.tsx:74
+#: src/components/WalletTag.tsx:76
 msgid "Last connection"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Log in with your email or a passkey"
 msgstr ""
 
-#: src/WalletConnect/ConnectPage.tsx:362
+#: src/WalletConnect/ConnectPage.tsx:389
 msgid "More Wallets"
 msgstr ""