From 0df1852f5d179544364765571a58ce590133dcbb Mon Sep 17 00:00:00 2001
From: Anthony <contact@anthonymayfield.com>
Date: Thu, 19 Aug 2021 13:29:10 +0200
Subject: [PATCH] tab working

---
 ui/component/txoList/view.jsx | 11 ++++++-----
 ui/page/wallet/view.jsx       | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx
index 474b152f6..c9b457a8a 100644
--- a/ui/component/txoList/view.jsx
+++ b/ui/component/txoList/view.jsx
@@ -60,7 +60,7 @@ function TxoList(props: Props) {
     active,
     type,
     subtype,
-    currency
+    currency,
   };
 
   const hideStatus =
@@ -125,13 +125,14 @@ function TxoList(props: Props) {
   // let currency = 'credits';
   function updateUrl(delta: Delta) {
     const newUrlParams = new URLSearchParams();
-    // if (delta.currency) {
-    //   currency = delta.currency;
-    // }
 
     // set tab name to account for wallet page tab
     newUrlParams.set('tab', delta.tab);
-    newUrlParams.set('currency', delta.currency);
+
+    // only update currency if it's being changed
+    if (delta.currency) {
+      newUrlParams.set('currency', delta.currency);
+    }
 
     switch (delta.dkey) {
       case TXO.PAGE:
diff --git a/ui/page/wallet/view.jsx b/ui/page/wallet/view.jsx
index 0bb1c8cce..7e19cd161 100644
--- a/ui/page/wallet/view.jsx
+++ b/ui/page/wallet/view.jsx
@@ -196,14 +196,15 @@ const WalletPage = (props: Props) => {
             </TabPanel>
             <TabPanel>
               <div className="section card-stack">
+                <WalletFiatPaymentHistory transactions={customerTransactions} />
                 <WalletFiatAccountHistory transactions={accountTransactionResponse} />
               </div>
             </TabPanel>
-            {/*<TabPanel>*/}
-            {/*  <div className="section card-stack">*/}
-            {/*    <WalletFiatPaymentHistory transactions={customerTransactions} />*/}
-            {/*  </div>*/}
-            {/*</TabPanel>*/}
+            <TabPanel>
+              <div className="section card-stack">
+                <WalletFiatPaymentHistory transactions={customerTransactions} />
+              </div>
+            </TabPanel>
           </TabPanels>
         </Tabs>
       </Page>