feat: isolate button component

apps/sample-react-app/src/Components/ConnectWalletButton.tsx → apps/sample-react-app/src/Components/SwitchWalletButton.tsx

@@ -1,17 +1,15 @@
 import type { HTMLChakraProps } from '@chakra-ui/react';
-import { Button, Icon, useDisclosure } from '@chakra-ui/react';
-import { WalletIcon } from '@heroicons/react/24/solid';
+import { useDisclosure } from '@chakra-ui/react';
 import React from 'react';
-import { useWallet } from '@vechain/react-wallet-kit';
+import { ConnectWalletButton, useWallet } from '@vechain/react-wallet-kit';
 import { AccountDetailModal } from './AccountDetailModal';
 import { AddressButton } from './AddressButton';
-import { ConnectWalletModal } from './ConnectWalletModal';
 
-interface ConnectWalletButtonProps {
+interface SwitchWalletButtonProps {
     buttonProps?: HTMLChakraProps<'button'>;
 }
 
-export const ConnectWalletButton: React.FC<ConnectWalletButtonProps> = ({
+export const SwitchWalletButton: React.FC<SwitchWalletButtonProps> = ({
     buttonProps,
 }): React.ReactElement => {
     const { isOpen, onOpen, onClose } = useDisclosure();
@@ -38,16 +36,5 @@ export const ConnectWalletButton: React.FC<ConnectWalletButtonProps> = ({
             </>
         );
 
-    return (
-        <>
-            <ConnectWalletModal isOpen={isOpen} onClose={onClose} />
-            <Button
-                {...buttonProps}
-                leftIcon={<Icon as={WalletIcon} />}
-                onClick={onOpen}
-            >
-                Connect Wallet
-            </Button>
-        </>
-    );
+    return <ConnectWalletButton buttonProps={buttonProps} />;
 };

apps/sample-react-app/src/Components/index.ts

@@ -2,6 +2,6 @@ export * from './AccountDetailBody';
 export * from './AccountDetailModal';
 export * from './AddressButton';
 export * from './AddressIcon';
-export * from './ConnectWalletButton';
+export * from './SwitchWalletButton';
 export * from './ConnectWalletModal';
 export * from './WalletSourceRadio';

apps/sample-react-app/src/Components/layout/NavBar.tsx

@@ -20,7 +20,7 @@ import { Bars3Icon } from '@heroicons/react/24/solid';
 import { useWallet } from '@vechain/react-wallet-kit';
 import { VechainLogo } from '../../Logos';
 import { AccountDetailBody } from '../AccountDetailBody';
-import { ConnectWalletButton } from '../ConnectWalletButton';
+import { SwitchWalletButton } from '../SwitchWalletButton';
 
 export const NavBar = (): JSX.Element => {
     const bg = useColorModeValue('gray.50', 'gray.900');
@@ -101,7 +101,7 @@ const MobileNavBarDrawer = ({
                                     source={accountState.source}
                                 />
                             ) : (
-                                <ConnectWalletButton />
+                                <SwitchWalletButton />
                             )}
                         </VStack>
                     </VStack>
@@ -114,7 +114,7 @@ const MobileNavBarDrawer = ({
 const NavBarWalletConnect = (): JSX.Element => {
     return (
         <HStack spacing={4}>
-            <ConnectWalletButton />
+            <SwitchWalletButton />
         </HStack>
     );
 };

apps/sample-react-app/src/Screens/components/Welcome.tsx

@@ -1,7 +1,7 @@
 import { Button, Heading, HStack, Link, Text, VStack } from '@chakra-ui/react';
 import type { JSX } from 'react';
 import { StyledCard } from '../../Components/shared';
-import { ConnectWalletButton } from '../../Components';
+import { SwitchWalletButton } from '../../Components';
 
 export const Welcome = (): JSX.Element => {
     return (
@@ -18,7 +18,7 @@ export const Welcome = (): JSX.Element => {
                     w="full"
                     wrap="wrap"
                 >
-                    <ConnectWalletButton />
+                    <SwitchWalletButton />
                     <Link
                         href="https://github.com/vechainfoundation/veworld-dapp"
                         isExternal

package.json

@@ -6,6 +6,7 @@
     ],
     "scripts": {
         "build": "turbo run build",
+        "build-react-kit": "turbo run build  --filter='@vechain/react-wallet-kit'",
         "build:deps": "turbo build --no-daemon --filter='@vechain/*'",
         "clean": "npx turbo@latest run clean && rm -rf node_modules .turbo",
         "dev": "turbo run dev --no-daemon",

packages/react-wallet-kit/package.json

@@ -13,8 +13,11 @@
         "lint": "eslint src --ext .js,.jsx,.ts,.tsx"
     },
     "dependencies": {
+        "@chakra-ui/react": "^2.8.1",
+        "@heroicons/react": "^2.0.18",
         "@vechain/connex": "2.1.0",
         "@vechain/connex-framework": "2.1.0",
+        "@vechain/picasso": "^2.1.1",
         "@vechain/wallet-connect": "*",
         "@vechain/wallet-kit": "*",
         "thor-devkit": "^2.0.9"

packages/react-wallet-kit/src/ConnectWalletButton/Components/ConnectWalletModal.tsx

@@ -0,0 +1,171 @@
+import {
+    Alert,
+    AlertIcon,
+    Box,
+    Button,
+    Flex,
+    HStack,
+    Icon,
+    Spinner,
+    Text,
+    useToast,
+    VStack,
+} from '@chakra-ui/react';
+import { LinkIcon, WalletIcon } from '@heroicons/react/24/solid';
+import React, { useCallback, useState } from 'react';
+import { Certificate } from 'thor-devkit';
+import { Dialog } from './Dialog';
+import { WalletSourceRadio } from './WalletSourceRadio';
+import { useConnex, useWallet } from '../../ConnexProvider';
+
+interface ConnectedWalletDialogProps {
+    isOpen: boolean;
+    onClose: () => void;
+}
+
+export const ConnectWalletModal: React.FC<ConnectedWalletDialogProps> = ({
+    isOpen,
+    onClose,
+}) => {
+    const header = (
+        <HStack spacing={2}>
+            <Icon as={WalletIcon} />
+            <Text>Connect Wallet</Text>
+        </HStack>
+    );
+
+    return (
+        <Dialog
+            body={<ConnectedWalletBody onClose={onClose} />}
+            header={header}
+            isOpen={isOpen}
+            onClose={onClose}
+        />
+    );
+};
+
+interface ConnectedWalletBodyProps {
+    onClose: () => void;
+}
+
+const ConnectedWalletBody: React.FC<ConnectedWalletBodyProps> = ({
+    onClose,
+}) => {
+    const toast = useToast();
+    const { setAccount } = useWallet();
+    const { vendor } = useConnex();
+
+    const [connectionLoading, setConnectionLoading] = useState(false);
+    const [connectionError, setConnectionError] = useState('');
+
+    const connectToWalletHandler =
+        useCallback(async (): Promise<Certificate> => {
+            const message: Connex.Vendor.CertMessage = {
+                purpose: 'identification',
+                payload: {
+                    type: 'text',
+                    content: 'Sign a certificate to prove your identity',
+                },
+            };
+
+            if (!vendor) throw new Error('Vendor not available');
+
+            const certResponse = await vendor.sign('cert', message).request();
+
+            const cert: Certificate = {
+                purpose: message.purpose,
+                payload: message.payload,
+                domain: certResponse.annex.domain,
+                timestamp: certResponse.annex.timestamp,
+                signer: certResponse.annex.signer,
+                signature: certResponse.signature,
+            };
+
+            Certificate.verify(cert);
+
+            return cert;
+        }, [vendor]);
+
+    const onSuccessfullConnection = useCallback(
+        (cert: Certificate): void => {
+            setAccount(cert.signer);
+            onClose();
+            toast({
+                title: 'Wallet connected.',
+                description: `You've succesfully connected with wallet ${cert.signer}`,
+                status: 'success',
+                position: 'bottom-left',
+                duration: 5000,
+                isClosable: true,
+            });
+        },
+        [toast, setAccount, onClose],
+    );
+
+    const connectHandler = useCallback(async () => {
+        try {
+            setConnectionError('');
+            setConnectionLoading(true);
+
+            const cert = await connectToWalletHandler();
+
+            onSuccessfullConnection(cert);
+        } catch (e) {
+            if (e instanceof Error) {
+                setConnectionError(e.message);
+            } else {
+                setConnectionError('Failed to connect to wallet');
+            }
+        } finally {
+            setConnectionLoading(false);
+        }
+    }, [
+        onSuccessfullConnection,
+        setConnectionError,
+        setConnectionLoading,
+        connectToWalletHandler,
+    ]);
+
+    const connect = useCallback(() => {
+        connectHandler().catch((e) => {
+            throw e;
+        });
+    }, [connectHandler]);
+
+    return (
+        <>
+            <Flex direction="column" gap={8}>
+                <Box>
+                    <Text mb="8px">Wallet</Text>
+                    <WalletSourceRadio />
+                </Box>
+            </Flex>
+            <VStack mt={8} spacing={4} w="full">
+                {connectionLoading ? (
+                    <Alert status="warning">
+                        <AlertIcon />
+                        Waiting for wallet approval...
+                    </Alert>
+                ) : null}
+                {connectionError ? (
+                    <Alert status="error">
+                        <AlertIcon />
+                        {connectionError}
+                    </Alert>
+                ) : null}
+
+                <Button
+                    colorScheme="blue"
+                    disabled={connectionLoading}
+                    leftIcon={
+                        connectionLoading ? <Spinner /> : <Icon as={LinkIcon} />
+                    }
+                    onClick={connect}
+                    w="full"
+                >
+                    {connectionLoading ? 'Connecting...' : 'Connect'}
+                </Button>
+            </VStack>
+        </>
+    );
+};

packages/react-wallet-kit/src/ConnectWalletButton/Components/Dialog.tsx

@@ -0,0 +1,49 @@
+import type { HTMLChakraProps } from '@chakra-ui/react';
+import {
+    Modal,
+    ModalBody,
+    ModalCloseButton,
+    ModalContent,
+    ModalFooter,
+    ModalHeader,
+    ModalOverlay,
+} from '@chakra-ui/react';
+import React from 'react';
+
+interface DialogProps {
+    isOpen: boolean;
+    onClose: () => void;
+    header?: React.ReactNode;
+    headerStyle?: HTMLChakraProps<'header'>;
+    body?: React.ReactNode;
+    footer?: React.ReactNode;
+    showCloseButton?: boolean;
+    closeButtonStyle?: HTMLChakraProps<'button'>;
+}
+
+export const Dialog: React.FC<DialogProps> = ({
+    isOpen,
+    onClose,
+    header,
+    headerStyle = {},
+    body,
+    footer,
+    showCloseButton = true,
+    closeButtonStyle = {},
+}) => {
+    return (
+        <Modal isOpen={isOpen} onClose={onClose} trapFocus={false}>
+            <ModalOverlay />
+            <ModalContent>
+                {header ? (
+                    <ModalHeader {...headerStyle}>{header}</ModalHeader>
+                ) : null}
+                {showCloseButton ? (
+                    <ModalCloseButton {...closeButtonStyle} />
+                ) : null}
+                {body ? <ModalBody>{body}</ModalBody> : null}
+                {footer ? <ModalFooter>{footer}</ModalFooter> : null}
+            </ModalContent>
+        </Modal>
+    );
+};