@dodoex/wallet-web3-react 0.0.1-beta.8 → 0.0.1

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

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

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

@@ -1,9 +1,12 @@
 import WalletWeb3 from '@dodoex/wallet-web3';
-declare function ConnectPage({ chainId, account, walletWeb3, showOtherInjectWallet, onClose, }: {
+import { WalletItem } from '../hooks/useConnectWallet';
+export interface ConnectPageProps {
     chainId: number;
     account?: string;
     walletWeb3?: WalletWeb3;
     showOtherInjectWallet?: boolean;
     onClose: () => void;
-}): JSX.Element;
+    onConnectWallet?: (wallet: WalletItem) => void | Promise<void>;
+}
+declare function ConnectPage({ chainId, account, walletWeb3, showOtherInjectWallet, onClose, onConnectWallet, }: ConnectPageProps): JSX.Element;
 export default ConnectPage;

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

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

package/dist/types/hooks/useConnectWallet.d.ts

@@ -7,6 +7,7 @@ export interface WalletItem {
     disabled?: boolean;
     isLastConnection: boolean;
     isInstalled?: boolean;
+    source: Wallet;
 }
 export declare const useConnectWallet: ({ walletWeb3, matchTestChain, showOtherInjectWallet, selectedChainId, hasTermsOfServiceLink, }: {
     walletWeb3?: WalletWeb3;

package/dist/types/index.d.ts

@@ -3,3 +3,5 @@ export { WalletConnectProvider } from './WalletConnectProvider';
 export { default as ClientProvider } from './ClientProvider';
 export { default as LangProvider } from './LangProvider';
 export { useWalletListByNetwork } from './hooks/useConnectWallet';
+export { default as ConnectDialog } from './WalletConnect/ConnectDialog';
+export { default as ConnectPage } from './WalletConnect/ConnectPage';

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dodoex/wallet-web3-react",
-  "version": "0.0.1-beta.8",
+  "version": "0.0.1",
   "source": "src/index.tsx",
-  "types": "dist/index.d.ts",
-  "typings": "dist/index.d.ts",
+  "types": "dist/types/index.d.ts",
+  "typings": "dist/types/index.d.ts",
   "main": "dist/cjs/index.cjs",
   "module": "dist/index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     ]
   },
   "peerDependencies": {
-    "@dodoex/wallet-web3": "0.0.61-beta.1",
+    "@dodoex/wallet-web3": "0.0.62",
     "@dodoex/contract-request": ">=1.x",
     "@dodoex/dodo-contract-request": ">=1.x",
     "@dodoex/icons": ">=2.0.2",

package/src/WalletConnect/ConnectDialog.tsx

@@ -0,0 +1,30 @@
+import WalletWeb3, { useWalletStore } from '@dodoex/wallet-web3';
+import React from 'react';
+import Dialog from '../components/Dialog';
+import ConnectPage, { ConnectPageProps } from './ConnectPage';
+
+export default function ConnectDialog({
+  open,
+  onClose,
+  walletWeb3,
+  onConnectWallet,
+}: {
+  open: boolean;
+  onClose: () => void;
+  walletWeb3: WalletWeb3;
+  onConnectWallet?: ConnectPageProps['onConnectWallet'];
+}) {
+  const { account, chainId: connectChainId } = useWalletStore();
+  return (
+    <Dialog open={open} onClose={onClose} width={420}>
+      <ConnectPage
+        chainId={connectChainId}
+        account={account}
+        walletWeb3={walletWeb3}
+        showOtherInjectWallet
+        onClose={onClose}
+        onConnectWallet={onConnectWallet}
+      />
+    </Dialog>
+  );
+}

package/src/WalletConnect/ConnectPage.tsx

@@ -32,6 +32,7 @@ function WalletGroupItem({
   disabledClick,
   onShowLedgerConnect,
   onShowAlchemyConnect,
+  onConnectWallet,
 }: {
   chainId?: number;
   wallet: WalletItem;
@@ -44,6 +45,7 @@ function WalletGroupItem({
   disabledClick: () => void;
   onShowLedgerConnect: () => void;
   onShowAlchemyConnect: () => void;
+  onConnectWallet?: (wallet: WalletItem) => void | Promise<void>;
 }) {
   const theme = useTheme();
   const isChecked =
@@ -96,6 +98,19 @@ function WalletGroupItem({
         try {
           await Promise.race([
             (async () => {
+              if (onConnectWallet) {
+                try {
+                  await onConnectWallet(wallet);
+                  const connectedChainId = useWalletStore.getState().chainId;
+                  if (onConnected) {
+                    onConnected(connectedChainId, wallet);
+                  }
+                } finally {
+                  setLoading(false);
+                }
+                return;
+              }
+
               if (
                 switchNetwork &&
                 wallet.currentType === activeWalletType &&
@@ -173,19 +188,22 @@ function WalletGroupItem({
   );
 }
 
+export interface ConnectPageProps {
+  chainId: number;
+  account?: string;
+  walletWeb3?: WalletWeb3;
+  showOtherInjectWallet?: boolean;
+  onClose: () => void;
+  onConnectWallet?: (wallet: WalletItem) => void | Promise<void>;
+}
 function ConnectPage({
   chainId,
   account,
   walletWeb3,
   showOtherInjectWallet,
   onClose,
-}: {
-  chainId: number;
-  account?: string;
-  walletWeb3?: WalletWeb3;
-  showOtherInjectWallet?: boolean;
-  onClose: () => void;
-}) {
+  onConnectWallet,
+}: ConnectPageProps) {
   const theme = useTheme();
   const highlightBackgroundColor =
     theme.palette.mode === 'dark' ? alpha('#F1F902', 0.1) : '#F1F902';
@@ -267,6 +285,7 @@ function ConnectPage({
                   disabledClick={disabledClick}
                   onShowLedgerConnect={() => setShowLedgerConnect(true)}
                   onShowAlchemyConnect={() => setShowAlchemyConnect(true)}
+                  onConnectWallet={onConnectWallet}
                 />
               );
             })}

package/src/WalletConnect/WalletDialog.tsx

@@ -2,7 +2,7 @@ import WalletWeb3, { useWalletStore } from '@dodoex/wallet-web3';
 import AccountPage from './AccountPage';
 import React from 'react';
 import Dialog from '../components/Dialog';
-import ConnectPage from './ConnectPage';
+import ConnectPage, { ConnectPageProps } from './ConnectPage';
 import ReceiveTokenPage from './ReceiveTokenPage';
 import { useWalletConnectContext } from '../WalletConnectProvider';
 
@@ -10,13 +10,15 @@ export default function WalletDialog({
   open,
   onClose,
   walletWeb3,
+  onConnectWallet,
 }: {
   open: boolean;
   onClose: () => void;
   walletWeb3: WalletWeb3;
+  onConnectWallet?: ConnectPageProps['onConnectWallet'];
 }) {
   const { SendTokenPage, chainId: selectedChainId } = useWalletConnectContext();
-  const { account, chainId: connectChainId } = useWalletStore();
+  const { account, chainId: connectChainId, connected } = useWalletStore();
   const [showSendTokenPage, setShowSendTokenPage] = React.useState(false);
   const [showReceiveTokenPage, setShowReceiveTokenPage] = React.useState(false);
   return (
@@ -28,7 +30,7 @@ export default function WalletDialog({
         height: account && !!SendTokenPage ? '80vh' : undefined,
       }}
     >
-      {!!SendTokenPage && account ? (
+      {!!SendTokenPage && account && connected?.wallet ? (
         <>
           {showSendTokenPage ? (
             <>
@@ -65,6 +67,7 @@ export default function WalletDialog({
           walletWeb3={walletWeb3}
           showOtherInjectWallet
           onClose={onClose}
+          onConnectWallet={onConnectWallet}
         />
       )}
     </Dialog>

package/src/hooks/useConnectWallet.ts

@@ -13,6 +13,7 @@ export interface WalletItem {
   disabled?: boolean;
   isLastConnection: boolean;
   isInstalled?: boolean;
+  source: Wallet;
 }
 
 export const useConnectWallet = ({
@@ -104,6 +105,7 @@ export function useWalletListByNetwork(
             title: item.showName,
             icon: item.logo,
             currentType: item.type,
+            source: item,
             onClick: (providerPackageOptions) => {
               try {
                 return connectToWallet(

package/src/index.tsx

@@ -3,3 +3,5 @@ export { WalletConnectProvider } from './WalletConnectProvider';
 export { default as ClientProvider } from './ClientProvider';
 export { default as LangProvider } from './LangProvider';
 export { useWalletListByNetwork } from './hooks/useConnectWallet';
+export { default as ConnectDialog } from './WalletConnect/ConnectDialog';
+export { default as ConnectPage } from './WalletConnect/ConnectPage';

package/src/locales/en.po

@@ -68,7 +68,7 @@ msgstr "Claim Rewards"
 msgid "Connect Alchemy"
 msgstr "Connect Alchemy"
 
-#: src/WalletConnect/ConnectPage.tsx:235
+#: src/WalletConnect/ConnectPage.tsx:253
 msgid "Connect Wallet"
 msgstr "Connect Wallet"
 
@@ -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:343
+#: src/WalletConnect/ConnectPage.tsx:362
 msgid "More Wallets"
 msgstr "More Wallets"
 

package/src/locales/zh.po

@@ -68,7 +68,7 @@ msgstr ""
 msgid "Connect Alchemy"
 msgstr ""
 
-#: src/WalletConnect/ConnectPage.tsx:235
+#: src/WalletConnect/ConnectPage.tsx:253
 msgid "Connect Wallet"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Log in with your email or a passkey"
 msgstr ""
 
-#: src/WalletConnect/ConnectPage.tsx:343
+#: src/WalletConnect/ConnectPage.tsx:362
 msgid "More Wallets"
 msgstr ""