From 275eddb95cf03e8d4b9ab1b73fcc26e1705b7640 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Thu, 16 Apr 2020 15:34:43 -0400
Subject: [PATCH 1/2] update changelog for txo list

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e2e5e323..49fbdc299 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Updated lbry-sdk to [0.69.0](https://github.com/lbryio/lbry-sdk/releases/tag/v0.69.0)
 - Improved file page layout/styling ([#3918](https://github.com/lbryio/lbry-desktop/pull/3918))
 - Now using Github for auto-update downloads ([#3992](https://github.com/lbryio/lbry-desktop/pull/3992))
+- Now paginating wallet history using txo_list ([#3979](https://github.com/lbryio/lbry-desktop/pull/3979))
 
 ### Fixed
 
-- 
2.45.3


From e3d29b30671a33130bf6920d4a649b745634607d Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Thu, 16 Apr 2020 16:25:15 -0400
Subject: [PATCH 2/2] improve wallet list ui/ux

---
 .../internal/txo-list-item.jsx                |  2 +-
 ui/component/txoList/view.jsx                 | 73 +++++++++++--------
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/ui/component/transactionListTable/internal/txo-list-item.jsx b/ui/component/transactionListTable/internal/txo-list-item.jsx
index 66a8b2525..c36eeadee 100644
--- a/ui/component/transactionListTable/internal/txo-list-item.jsx
+++ b/ui/component/transactionListTable/internal/txo-list-item.jsx
@@ -120,7 +120,7 @@ class TxoListItem extends React.PureComponent<Props, State> {
         <td className="table__item--actionable">
           <span>
             {(isTip && __(toCapitalCase('tip'))) ||
-              (valueType && __(toCapitalCase(valueType))) ||
+              (valueType && ((valueType === 'stream' && __('Publish')) || __(toCapitalCase(valueType)))) ||
               (type && __(toCapitalCase(type)))}
           </span>{' '}
           {isRevokeable && this.getLink(type)}
diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx
index c23e12190..dbfafca96 100644
--- a/ui/component/txoList/view.jsx
+++ b/ui/component/txoList/view.jsx
@@ -43,6 +43,11 @@ function TxoList(props: Props) {
     subtype,
   };
 
+  const hideStatus =
+    type === TXO.SENT ||
+    (currentUrlParams.type === TXO.RECEIVED &&
+      (currentUrlParams.subtype === TXO.PAYMENT || currentUrlParams.subtype === TXO.PURCHASE));
+
   const params = {};
   if (currentUrlParams.type) {
     if (currentUrlParams.type === TXO.ALL) {
@@ -54,7 +59,7 @@ function TxoList(props: Props) {
         params[TXO.TX_TYPE] = TXO.SUPPORT;
       } else if (currentUrlParams.subtype === TXO.PURCHASE) {
         params[TXO.TX_TYPE] = TXO.PURCHASE;
-      } else if (currentUrlParams.subtype === TXO.PURCHASE) {
+      } else if (currentUrlParams.subtype === TXO.PAYMENT) {
         params[TXO.TX_TYPE] = TXO.OTHER;
       } else {
         params[TXO.TX_TYPE] = [TXO.OTHER, TXO.PURCHASE, TXO.SUPPORT];
@@ -89,6 +94,7 @@ function TxoList(props: Props) {
       params[TXO.IS_NOT_SPENT] = true;
     }
   }
+
   if (currentUrlParams.page) params[TXO.PAGE] = Number(page);
   if (currentUrlParams.pageSize) params[TXO.PAGE_SIZE] = Number(pageSize);
 
@@ -115,6 +121,7 @@ function TxoList(props: Props) {
       case TXO.TYPE:
         newUrlParams.set(TXO.TYPE, delta.value);
         if (delta.value === TXO.SENT || delta.value === TXO.RECEIVED) {
+          newUrlParams.set(TXO.ACTIVE, 'all');
           if (currentUrlParams.subtype) {
             newUrlParams.set(TXO.SUB_TYPE, currentUrlParams.subtype);
           } else {
@@ -213,37 +220,39 @@ function TxoList(props: Props) {
                   </FormField>
                 </div>
               )}
-              <div>
-                <fieldset-section>
-                  <label>Status</label>
-                  <div className={'txo__radios'}>
-                    <Button
-                      button="alt"
-                      onClick={e => handleChange({ dkey: TXO.ACTIVE, value: 'active' })}
-                      className={classnames(`button-toggle`, {
-                        'button-toggle--active': active === TXO.ACTIVE,
-                      })}
-                      label={__('Active')}
-                    />
-                    <Button
-                      button="alt"
-                      onClick={e => handleChange({ dkey: TXO.ACTIVE, value: 'spent' })}
-                      className={classnames(`button-toggle`, {
-                        'button-toggle--active': active === 'spent',
-                      })}
-                      label={__('Historical')}
-                    />
-                    <Button
-                      button="alt"
-                      onClick={e => handleChange({ dkey: TXO.ACTIVE, value: 'all' })}
-                      className={classnames(`button-toggle`, {
-                        'button-toggle--active': active === 'all',
-                      })}
-                      label={__('All')}
-                    />
-                  </div>
-                </fieldset-section>
-              </div>
+              {!hideStatus && (
+                <div>
+                  <fieldset-section>
+                    <label>Status</label>
+                    <div className={'txo__radios'}>
+                      <Button
+                        button="alt"
+                        onClick={e => handleChange({ dkey: TXO.ACTIVE, value: 'active' })}
+                        className={classnames(`button-toggle`, {
+                          'button-toggle--active': active === TXO.ACTIVE,
+                        })}
+                        label={__('Active')}
+                      />
+                      <Button
+                        button="alt"
+                        onClick={e => handleChange({ dkey: TXO.ACTIVE, value: 'spent' })}
+                        className={classnames(`button-toggle`, {
+                          'button-toggle--active': active === 'spent',
+                        })}
+                        label={__('Historical')}
+                      />
+                      <Button
+                        button="alt"
+                        onClick={e => handleChange({ dkey: TXO.ACTIVE, value: 'all' })}
+                        className={classnames(`button-toggle`, {
+                          'button-toggle--active': active === 'all',
+                        })}
+                        label={__('All')}
+                      />
+                    </div>
+                  </fieldset-section>
+                </div>
+              )}
             </div>
           </div>
           <TransactionListTable txos={txoPage} />
-- 
2.45.3