From 380bfb7189144cb226aceeb34f6e5875bdbf3a26 Mon Sep 17 00:00:00 2001
From: Yusuf Seyrek <yusufseyrek@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:49:38 +0300
Subject: [PATCH] feat: fixes and improvements on account creation (#295)

---
 src/components/Account/AccountMenuContent.tsx | 34 ++++++++++++++-----
 src/components/Wallet/ConnectedButton.tsx     |  3 +-
 src/components/Wallet/index.tsx               | 24 ++++++-------
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/components/Account/AccountMenuContent.tsx b/src/components/Account/AccountMenuContent.tsx
index 6a79c437..efbf830e 100644
--- a/src/components/Account/AccountMenuContent.tsx
+++ b/src/components/Account/AccountMenuContent.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { useNavigate, useParams } from 'react-router-dom'
 
 import AccountList from 'components/Account/AccountList'
@@ -14,6 +14,8 @@ import useToggle from 'hooks/useToggle'
 import useStore from 'store'
 import { hardcodedFee } from 'utils/constants'
 import { isNumber } from 'utils/parsers'
+import useCurrentWalletBalance from 'hooks/useCurrentWalletBalance'
+import { BN } from 'utils/helpers'
 
 const menuClasses = 'absolute isolate flex w-full flex-wrap scrollbar-hide'
 const ACCOUNT_MENU_BUTTON_ID = 'account-menu-button'
@@ -26,8 +28,10 @@ export default function AccountMenuContent(props: Props) {
   const navigate = useNavigate()
   const { accountId, address } = useParams()
   const createAccount = useStore((s) => s.createAccount)
+  const baseCurrency = useStore((s) => s.baseCurrency)
   const [showMenu, setShowMenu] = useToggle()
   const [isCreating, setIsCreating] = useToggle()
+  const transactionFeeCoinBalance = useCurrentWalletBalance(baseCurrency.denom)
 
   const hasCreditAccounts = !!props.accounts.length
   const isAccountSelected = isNumber(accountId)
@@ -40,14 +44,28 @@ export default function AccountMenuContent(props: Props) {
   const isLoadingAccount = isAccountSelected && selectedAccountDetails?.id !== accountId
   const showCreateAccount = !hasCreditAccounts || isCreating
 
-  async function createAccountHandler() {
+  const checkHasFunds = useCallback(() => {
+    return (
+      transactionFeeCoinBalance &&
+      BN(transactionFeeCoinBalance.amount).isGreaterThan(hardcodedFee.amount[0].amount)
+    )
+  }, [transactionFeeCoinBalance])
+
+  const performCreateAccount = useCallback(async () => {
     setShowMenu(true)
     setIsCreating(true)
     const accountId = await createAccount({ fee: hardcodedFee })
     setIsCreating(false)
-    if (!accountId) return
-    navigate(`/wallets/${address}/accounts/${accountId}`)
-  }
+
+    accountId && navigate(`/wallets/${address}/accounts/${accountId}`)
+  }, [address, createAccount, navigate, setIsCreating, setShowMenu])
+
+  const handleCreateAccountClick = useCallback(() => {
+    setShowMenu(!showMenu)
+    if (!hasCreditAccounts && checkHasFunds()) {
+      performCreateAccount()
+    }
+  }, [checkHasFunds, hasCreditAccounts, performCreateAccount, setShowMenu, showMenu])
 
   useEffect(() => {
     useStore.setState({ accounts: props.accounts })
@@ -59,7 +77,7 @@ export default function AccountMenuContent(props: Props) {
     <div className='relative'>
       <Button
         id={ACCOUNT_MENU_BUTTON_ID}
-        onClick={hasCreditAccounts ? () => setShowMenu(!showMenu) : createAccountHandler}
+        onClick={handleCreateAccountClick}
         leftIcon={hasCreditAccounts ? <Account /> : <PlusCircled />}
         color={hasCreditAccounts ? 'tertiary' : 'primary'}
         hasFocus={showMenu}
@@ -96,7 +114,7 @@ export default function AccountMenuContent(props: Props) {
                 rightIcon={<Plus />}
                 iconClassName='h-2.5 w-2.5'
                 text='Create'
-                onClick={createAccountHandler}
+                onClick={performCreateAccount}
               />
             </div>
             <div
@@ -125,7 +143,7 @@ export default function AccountMenuContent(props: Props) {
             )}
           >
             {showCreateAccount ? (
-              <CreateAccount createAccount={createAccountHandler} isCreating={isCreating} />
+              <CreateAccount createAccount={performCreateAccount} isCreating={isCreating} />
             ) : showFundAccount ? (
               <FundAccount setShowFundAccount={setShowFundAccount} setShowMenu={setShowMenu} />
             ) : null}
diff --git a/src/components/Wallet/ConnectedButton.tsx b/src/components/Wallet/ConnectedButton.tsx
index 52187203..056e29ee 100644
--- a/src/components/Wallet/ConnectedButton.tsx
+++ b/src/components/Wallet/ConnectedButton.tsx
@@ -61,9 +61,8 @@ export default function ConnectedButton() {
   }
 
   useEffect(() => {
-    if (!walletBalances || walletBalances.length === 0) return
     const newAmount = BigNumber(
-      walletBalances?.find((coin: Coin) => coin.denom === baseAsset.denom)?.amount ?? 0,
+      walletBalances.find((coin: Coin) => coin.denom === baseAsset.denom)?.amount ?? 0,
     ).dividedBy(10 ** baseAsset.decimals)
 
     if (walletAmount.isEqualTo(newAmount)) return
diff --git a/src/components/Wallet/index.tsx b/src/components/Wallet/index.tsx
index 3c260c2a..548375dc 100644
--- a/src/components/Wallet/index.tsx
+++ b/src/components/Wallet/index.tsx
@@ -19,7 +19,6 @@ export default function Wallet() {
 
   const { status, connectedWallet } = useWalletManager()
   const { simulate, sign, broadcast } = useWallet()
-  const client = useStore((s) => s.client)
   const address = useStore((s) => s.address)
 
   // Set connection status
@@ -38,23 +37,22 @@ export default function Wallet() {
 
   // Set the client
   useEffect(() => {
-    if (!connectedWallet || client) return
     async function getCosmWasmClient() {
-      if (!connectedWallet) return
-
-      const cosmClient = await getClient(connectedWallet.network.rpc)
-      const client = {
-        broadcast,
-        cosmWasmClient: cosmClient,
-        connectedWallet,
-        sign,
-        simulate,
+      if (connectedWallet && connectedWallet.account.address !== address) {
+        const cosmClient = await getClient(connectedWallet.network.rpc)
+        const client = {
+          broadcast,
+          cosmWasmClient: cosmClient,
+          connectedWallet,
+          sign,
+          simulate,
+        }
+        useStore.setState({ client })
       }
-      useStore.setState({ client })
     }
 
     getCosmWasmClient()
-  }, [connectedWallet, client, simulate, sign, broadcast])
+  }, [connectedWallet, address, simulate, sign, broadcast])
 
   // Redirect when switching wallets or on first connection
   useEffect(() => {