minor improvements to disconnected dapp state (#852)

* minor improvements to disconnected dapp state * code simplify
OriginProtocol · Dec 10, 2021 · 3fefd33 · 3fefd33
1 parent 172907b
commit 3fefd33
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/dapp/src/components/Nav.js b/dapp/src/components/Nav.js
@@ -28,9 +28,6 @@ const showExperimentalSoftwareNotice = false
 const DappLinks = ({ dapp, page }) => {
   const ousdBalance = useStoreState(AccountStore, (s) => s.balances['ousd'])
   const lifetimeYield = useStoreState(AccountStore, (s) => s.lifetimeYield)
-  const showHistory =
-    (ousdBalance && parseFloat(ousdBalance) > 0) ||
-    (lifetimeYield && parseFloat(lifetimeYield) > 0)
 
   return (
     <>
@@ -70,17 +67,15 @@ const DappLinks = ({ dapp, page }) => {
               </a>
             </Link>
           )}
-          {showHistory && (
-            <Link href="/history">
-              <a
-                className={`d-flex align-items-center ${
-                  page === 'history' ? 'selected' : ''
-                }`}
-              >
-                {fbt('History', 'History')}
-              </a>
-            </Link>
-          )}
+          <Link href="/history">
+            <a
+              className={`d-flex align-items-center ${
+                page === 'history' ? 'selected' : ''
+              }`}
+            >
+              {fbt('History', 'History')}
+            </a>
+          </Link>
         </div>
       )}
       <style jsx>{`

diff --git a/dapp/src/components/buySell/BalanceHeader.js b/dapp/src/components/buySell/BalanceHeader.js
@@ -37,6 +37,7 @@ const BalanceHeader = ({
     (s) => s.animatedOusdBalance
   )
   const mintAnimationLimit = 0.5
+  const walletConnected = useStoreState(ContractStore, (s) => s.walletConnected)
 
   const [balanceEmphasised, setBalanceEmphasised] = useState(false)
   const prevOusdBalance = usePrevious(ousdBalance)
@@ -212,7 +213,11 @@ const BalanceHeader = ({
             />
             <Statistic
               title={fbt('Pending yield', 'Pending yield')}
-              value={formatCurrency(animatedExpectedIncrease, 2)}
+              value={
+                walletConnected
+                  ? formatCurrency(animatedExpectedIncrease, 2)
+                  : '--.--'
+              }
               type={'number'}
               marginBottom={true}
             />
@@ -228,7 +233,11 @@ const BalanceHeader = ({
                     }/address/${account.toLowerCase()}`
                   : false
               }
-              value={lifetimeYield ? formatCurrency(lifetimeYield, 2) : '--.--'}
+              value={
+                walletConnected && lifetimeYield
+                  ? formatCurrency(lifetimeYield, 2)
+                  : '--.--'
+              }
               type={'number'}
             />
           </div>