feat: implements LoadingModal that can be triggered for any loading…

… functionality (#416)

Co-authored-by: Gancho Radkov <[email protected]>

advanced/wallets/react-wallet-v2/src/components/Modal.tsx

@@ -16,6 +16,7 @@ import { Modal as NextModal } from '@nextui-org/react'
 import { useSnapshot } from 'valtio'
 import { useCallback, useMemo } from 'react'
 import AuthRequestModal from '@/views/AuthRequestModal'
+import LoadingModal from '@/views/LoadingModal'
 
 export default function Modal() {
   const { open, view } = useSnapshot(ModalStore.state)
@@ -56,6 +57,8 @@ export default function Modal() {
         return <SessionSignKadenaModal />
       case 'AuthRequestModal':
         return <AuthRequestModal />
+      case 'LoadingModal':
+        return <LoadingModal />
       default:
         return null
     }

advanced/wallets/react-wallet-v2/src/pages/walletconnect.tsx

@@ -3,7 +3,7 @@ import PageHeader from '@/components/PageHeader'
 import QrReader from '@/components/QrReader'
 import { web3wallet } from '@/utils/WalletConnectUtil'
 import { Button, Input, Loading, Text } from '@nextui-org/react'
-import { Fragment, useMemo, useState } from 'react'
+import { Fragment, useEffect, useState } from 'react'
 import { styledToast } from '@/utils/HelperUtil'
 import ModalStore from '@/store/ModalStore'
 
@@ -27,7 +27,6 @@ export default function WalletConnectPage(params: { deepLink?: string }) {
     })
     try {
       setLoading(true)
-      ModalStore.open('SessionProposalModal', {})
       web3wallet.core.pairing.events.on('pairing_expire', pairingExpiredListener)
       await web3wallet.pair({ uri })
     } catch (error) {
@@ -39,7 +38,7 @@ export default function WalletConnectPage(params: { deepLink?: string }) {
     }
   }
 
-  useMemo(() => {
+  useEffect(() => {
     if (deepLink) {
       onConnect(deepLink)
     }
@@ -48,34 +47,35 @@ export default function WalletConnectPage(params: { deepLink?: string }) {
   return (
     <Fragment>
       <PageHeader title="WalletConnect" />
+      <>
+        <QrReader onConnect={onConnect} />
 
-      <QrReader onConnect={onConnect} />
+        <Text size={13} css={{ textAlign: 'center', marginTop: '$10', marginBottom: '$10' }}>
+          or use walletconnect uri
+        </Text>
 
-      <Text size={13} css={{ textAlign: 'center', marginTop: '$10', marginBottom: '$10' }}>
-        or use walletconnect uri
-      </Text>
-
-      <Input
-        css={{ width: '100%' }}
-        bordered
-        aria-label="wc url connect input"
-        placeholder="e.g. wc:a281567bb3e4..."
-        onChange={e => setUri(e.target.value)}
-        value={uri}
-        data-testid="uri-input"
-        contentRight={
-          <Button
-            size="xs"
-            disabled={!uri}
-            css={{ marginLeft: -60 }}
-            onClick={() => onConnect(uri)}
-            color="gradient"
-            data-testid="uri-connect-button"
-          >
-            {loading ? <Loading size="md" type="points" color={'white'} /> : 'Connect'}
-          </Button>
-        }
-      />
+        <Input
+          css={{ width: '100%' }}
+          bordered
+          aria-label="wc url connect input"
+          placeholder="e.g. wc:a281567bb3e4..."
+          onChange={e => setUri(e.target.value)}
+          value={uri}
+          data-testid="uri-input"
+          contentRight={
+            <Button
+              size="xs"
+              disabled={!uri}
+              css={{ marginLeft: -60 }}
+              onClick={() => onConnect(uri)}
+              color="gradient"
+              data-testid="uri-connect-button"
+            >
+              {loading ? <Loading size="md" type="points" color={'white'} /> : 'Connect'}
+            </Button>
+          }
+        />
+      </>
     </Fragment>
   )
 }

advanced/wallets/react-wallet-v2/src/pages/wc.tsx

@@ -1,14 +1,46 @@
 import { Text } from '@nextui-org/react'
-import { Fragment } from 'react'
+import { Fragment, useCallback, useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import WalletConnectPage from './walletconnect'
+import ModalStore from '@/store/ModalStore'
+import { useSnapshot } from 'valtio'
 
 export default function DeepLinkPairingPage() {
+  const state = useSnapshot(ModalStore.state)
   const router = useRouter()
+  const [loadingMessage, setLoadingMessage] = useState<string>('')
+  const [requestTimeout, setRequestTimeout] = useState<NodeJS.Timeout | null>(null)
 
   const uri = router.query.uri as string
   const requestId = router.query.requestId as string
 
+  const removeTimeout = useCallback(() => {
+    if (requestTimeout) {
+      clearTimeout(requestTimeout)
+    }
+  }, [requestTimeout])
+
+  useEffect(() => {
+    if (state.view == 'LoadingModal') {
+      const timeout = setTimeout(() => {
+        setLoadingMessage('Your request is taking longer than usual. Feel free to try again.')
+      }, 15_000)
+      setRequestTimeout(timeout)
+    } else if (state.view) {
+      removeTimeout()
+    }
+  }, [state.view])
+
+  useEffect(() => {
+    if (requestId) {
+      ModalStore.open('LoadingModal', { loadingMessage })
+    }
+
+    if (uri) {
+      ModalStore.open('LoadingModal', { loadingMessage })
+    }
+  }, [uri, requestId, loadingMessage])
+
   if (!uri && !requestId) {
     return (
       <Fragment>

advanced/wallets/react-wallet-v2/src/store/ModalStore.ts

@@ -10,6 +10,7 @@ interface ModalData {
   requestEvent?: SignClientTypes.EventArguments['session_request']
   requestSession?: SessionTypes.Struct
   request?: Web3WalletTypes.AuthRequest
+  loadingMessage?: string
 }
 
 interface State {
@@ -29,6 +30,7 @@ interface State {
     | 'SessionSignTezosModal'
     | 'SessionSignKadenaModal'
     | 'AuthRequestModal'
+    | 'LoadingModal'
   data?: ModalData
 }
 

advanced/wallets/react-wallet-v2/src/views/LoadingModal.tsx

@@ -0,0 +1,34 @@
+import { Col, Divider, Link, Loading, Row, Text, styled } from '@nextui-org/react'
+import { CoreTypes } from '@walletconnect/types'
+import NewReleasesIcon from '@mui/icons-material/NewReleases'
+import RequestModalContainer from '@/components/RequestModalContainer'
+import { useSnapshot } from 'valtio'
+import ModalStore from '@/store/ModalStore'
+
+export default function LoadingModal() {
+  const state = useSnapshot(ModalStore.state)
+  const message = state.data?.loadingMessage
+
+  return (
+    <RequestModalContainer title="">
+      <div style={{ textAlign: 'center', padding: '20px' }}>
+        <Row>
+          <Col>
+            <Loading size="lg" />
+          </Col>
+        </Row>
+        <Row align="center">
+          <Col>
+            <Text h3>Loading your request...</Text>
+          </Col>
+        </Row>
+        {message ? (
+          <div style={{ textAlign: 'center' }}>
+            <Divider y={1} />
+            <Text>{message}</Text>
+          </div>
+        ) : null}
+      </div>
+    </RequestModalContainer>
+  )
+}

advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react-hooks/rules-of-hooks */
 import { Col, Grid, Loading, Row, Text, styled } from '@nextui-org/react'
 import { useCallback, useMemo, useState } from 'react'
 import { buildApprovedNamespaces, getSdkError } from '@walletconnect/utils'
@@ -265,14 +264,7 @@ export default function SessionProposalModal() {
     ModalStore.close()
   }, [proposal])
 
-  return !proposal ? (
-    <>
-      <br />
-      <Loading size="lg" color="primary" type="default" />
-      <Text>Attempting to pair...</Text>
-      <br />
-    </>
-  ) : (
+  return (
     <RequestModal
       metadata={proposal.params.proposer.metadata}
       onApprove={onApprove}