Merge pull request #1617 from mars-protocol/develop

v2.11.2

Author: linkielink

src/components/Modals/FundWithdraw/FundAccount.tsx

@@ -1,5 +1,4 @@
 import AccountFundContent from 'components/account/AccountFund/AccountFundContent'
-import useAccounts from 'hooks/accounts/useAccounts'
 import useStore from 'store'
 
 interface Props {
@@ -11,8 +10,6 @@ export default function FundAccount(props: Props) {
   const { account, onConnectWallet } = props
 
   const address = useStore((s) => s.address)
-  const { data: accounts } = useAccounts('default', address)
-  const hasNoAccounts = accounts?.length < 1
 
   const accountId = account.id
   if (!address) return null
@@ -23,7 +20,6 @@ export default function FundAccount(props: Props) {
       address={address}
       accountId={accountId}
       onConnectWallet={onConnectWallet}
-      hasExistingAccount={!hasNoAccounts}
     />
   )
 }

src/components/account/AccountCreateFirst.tsx

@@ -26,16 +26,14 @@ export default function AccountCreateFirst() {
   const [isCreating, setIsCreating] = useToggle(false)
   const [isAutoLendEnabled] = useEnableAutoLendGlobal()
 
-  const { data: accounts, isLoading } = useAccounts('default', address)
+  const { isLoading } = useAccounts('default', address)
   const currentAccount = useCurrentAccount()
   const { handleConnectWallet } = useWeb3WalletConnection()
 
   useEffect(() => {
     if (!address) useStore.setState({ focusComponent: { component: <WalletSelect /> } })
   }, [address])
 
-  const hasExistingAccount = useMemo(() => accounts && accounts.length > 0, [accounts])
-
   const handleClick = useCallback(async () => {
     setIsCreating(true)
     const accountId = await createAccount('default', isAutoLendEnabled)
@@ -96,7 +94,6 @@ export default function AccountCreateFirst() {
             accountId=''
             isFullPage
             onConnectWallet={handleConnectWallet}
-            hasExistingAccount={hasExistingAccount}
             isCreateAccount
           />
         </Card>

src/components/account/AccountFund/AccountFundContent.tsx

@@ -39,11 +39,12 @@ interface Props {
   accountId: string
   isFullPage?: boolean
   onConnectWallet: () => Promise<boolean>
-  hasExistingAccount?: boolean
   isCreateAccount?: boolean
 }
 
 export default function AccountFundContent(props: Props) {
+  const { isCreateAccount = false } = props
+
   const deposit = useStore((s) => s.deposit)
   const walletAssetModal = useStore((s) => s.walletAssetsModal)
   const [isConfirming, setIsConfirming] = useState(false)
@@ -52,7 +53,6 @@ export default function AccountFundContent(props: Props) {
   const { isAutoLendEnabledForCurrentAccount } = useAutoLend()
   const [isAutoLendEnabledGlobal] = useEnableAutoLendGlobal()
   const { data: walletBalances } = useWalletBalances(props.address)
-  const { isCreateAccount = false } = props
   const { simulateDeposits } = useUpdatedAccount(props.account)
   const { usdcBalances } = useUSDCBalances(walletBalances)
   const selectedDenoms = useMemo(() => {
@@ -138,10 +138,9 @@ export default function AccountFundContent(props: Props) {
 
     setIsConfirming(true)
     try {
-      const shouldAutoLend =
-        hasNoAccounts || !props.hasExistingAccount
-          ? isAutoLendEnabledGlobal
-          : isAutoLendEnabledForCurrentAccount
+      const shouldAutoLend = hasNoAccounts
+        ? isAutoLendEnabledGlobal
+        : isAutoLendEnabledForCurrentAccount
 
       const evmAssets = fundingAssets.filter(
         (asset) => asset.chain && chainNameToUSDCAttributes[asset.chain],
@@ -151,7 +150,7 @@ export default function AccountFundContent(props: Props) {
       )
 
       let accountId = props.accountId
-      const isNewAccount = hasNoAccounts || (isCreateAccount && !props.hasExistingAccount)
+      const isNewAccount = hasNoAccounts || isCreateAccount
       const hasEvmAssets = evmAssets.length > 0
 
       if (hasEvmAssets) {
@@ -234,7 +233,6 @@ export default function AccountFundContent(props: Props) {
     props.accountId,
     props.address,
     props.isFullPage,
-    props.hasExistingAccount,
     deposit,
     fundingAssets,
     isAutoLendEnabledForCurrentAccount,

src/components/account/AccountFund/AccountFundFullPage.tsx

@@ -19,7 +19,6 @@ export default function AccountFundFullPage({ isCreateAccount = false }: Props)
   const accountId = useAccountId()
 
   const { data: accounts, isLoading } = useAccounts('default', address)
-  const hasExistingAccount = useMemo(() => accounts && accounts.length > 0, [accounts])
 
   const currentAccount = useCurrentAccount()
   const [selectedAccountId, setSelectedAccountId] = useState<null | string>(null)
@@ -63,8 +62,7 @@ export default function AccountFundFullPage({ isCreateAccount = false }: Props)
             accountId={selectedAccountId ?? ''}
             isFullPage
             onConnectWallet={handleConnectWallet}
-            hasExistingAccount={hasExistingAccount}
-            isCreateAccount
+            isCreateAccount={isCreateAccount}
           />
         </Card>
       )}