From dade91f67e0a324cf3adfe31b6eb919c0a24259a Mon Sep 17 00:00:00 2001
From: Linkie Link <linkielink.dev@gmail.com>
Date: Mon, 11 Sep 2023 17:23:24 +0200
Subject: [PATCH] Autolend fix (#454)

* fix: abbreviate the wallet amount

* fix: autolending setting
---
 .../Account/AccountFund/AccountFundContent.tsx | 18 +++++++++++++-----
 src/components/Header/DesktopHeader.tsx        |  4 +++-
 .../Wallet/WalletConnectedButton.tsx           |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/Account/AccountFund/AccountFundContent.tsx b/src/components/Account/AccountFund/AccountFundContent.tsx
index 35265939..f46b1bac 100644
--- a/src/components/Account/AccountFund/AccountFundContent.tsx
+++ b/src/components/Account/AccountFund/AccountFundContent.tsx
@@ -44,8 +44,8 @@ export default function AccountFundContent(props: Props) {
   const [fundingAssets, setFundingAssets] = useState<BNCoin[]>([])
   const { data: marketAssets } = useMarketAssets()
   const { data: walletBalances } = useWalletBalances(props.address)
-  const { autoLendEnabledAccountIds } = useAutoLend()
-  const [isLending, toggleIsLending] = useToggle(false)
+  const { autoLendEnabledAccountIds, enableAutoLendAccountId } = useAutoLend()
+  const [isLending, toggleIsLending] = useToggle(lendAssets)
   const { simulateDeposits } = useUpdatedAccount(props.account)
 
   const baseAsset = getBaseAsset()
@@ -126,11 +126,19 @@ export default function AccountFundContent(props: Props) {
   }, [])
 
   useEffect(() => {
-    toggleIsLending(autoLendEnabledAccountIds.includes(props.accountId))
-  }, [props.accountId, autoLendEnabledAccountIds, toggleIsLending])
+    const autoLendEnabled = autoLendEnabledAccountIds.includes(props.accountId)
+    if (lendAssets && !autoLendEnabled) enableAutoLendAccountId(props.accountId)
+    toggleIsLending(autoLendEnabled)
+  }, [
+    props.accountId,
+    autoLendEnabledAccountIds,
+    toggleIsLending,
+    lendAssets,
+    enableAutoLendAccountId,
+  ])
 
   useEffect(() => {
-    if (accounts?.length === 1 && isLending && !lendAssets) setLendAssets(true)
+    if (accounts?.length === 1 && isLending) setLendAssets(true)
   }, [isLending, accounts, lendAssets, setLendAssets])
 
   const depositCapReachedCoins = useMemo(() => {
diff --git a/src/components/Header/DesktopHeader.tsx b/src/components/Header/DesktopHeader.tsx
index ddeddc47..e2d9a696 100644
--- a/src/components/Header/DesktopHeader.tsx
+++ b/src/components/Header/DesktopHeader.tsx
@@ -7,6 +7,7 @@ import DesktopNavigation from 'components/Navigation/DesktopNavigation'
 import RewardsCenter from 'components/RewardsCenter'
 import Settings from 'components/Settings'
 import Wallet from 'components/Wallet'
+import useCurrentAccount from 'hooks/useCurrentAccount'
 import useStore from 'store'
 
 export const menuTree: { pages: Page[]; label: string }[] = [
@@ -19,6 +20,7 @@ export const menuTree: { pages: Page[]; label: string }[] = [
 export default function DesktopHeader() {
   const address = useStore((s) => s.address)
   const focusComponent = useStore((s) => s.focusComponent)
+  const currentAccount = useCurrentAccount()
 
   function handleCloseFocusMode() {
     if (focusComponent && focusComponent.onClose) focusComponent.onClose()
@@ -50,8 +52,8 @@ export default function DesktopHeader() {
           </div>
         ) : (
           <div className='flex gap-4'>
+            {currentAccount && <RewardsCenter />}
             {address && <AccountMenu />}
-            {address && <RewardsCenter />}
             <Wallet />
             <Settings />
           </div>
diff --git a/src/components/Wallet/WalletConnectedButton.tsx b/src/components/Wallet/WalletConnectedButton.tsx
index f8b443dd..4cb3f012 100644
--- a/src/components/Wallet/WalletConnectedButton.tsx
+++ b/src/components/Wallet/WalletConnectedButton.tsx
@@ -111,7 +111,7 @@ export default function WalletConnectedButton() {
           ) : (
             <FormattedNumber
               amount={walletAmount.toNumber()}
-              options={{ suffix: ` ${baseAsset.symbol}` }}
+              options={{ suffix: ` ${baseAsset.symbol}`, abbreviated: true }}
               animate
             />
           )}