From 6d3b3d42034c88475cd90172ddd97b95f04df60e Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 30 Aug 2017 00:46:30 -0230
Subject: Show confirm transaction screen when clicking a pending transaction
 in the list.

---
 ui/app/components/buy-button-subview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/buy-button-subview.js')

diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index 15281171c..6cf6e9eb9 100644
--- a/ui/app/components/buy-button-subview.js
+++ b/ui/app/components/buy-button-subview.js
@@ -245,7 +245,7 @@ BuyButtonSubview.prototype.navigateTo = function (url) {
 
 BuyButtonSubview.prototype.backButtonContext = function () {
   if (this.props.context === 'confTx') {
-    this.props.dispatch(actions.showConfTxPage(false))
+    this.props.dispatch(actions.showConfTxPage({transForward: false}))
   } else {
     this.props.dispatch(actions.goHome())
   }
-- 
cgit v1.2.3


From 5a93ec02523e8b54222cc44cba5b80dcf8f07a7a Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Thu, 19 Oct 2017 21:06:14 -0700
Subject: Fix loading animation not showing on network change

---
 ui/app/components/buy-button-subview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/buy-button-subview.js')

diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index 6cf6e9eb9..a36f41df5 100644
--- a/ui/app/components/buy-button-subview.js
+++ b/ui/app/components/buy-button-subview.js
@@ -87,7 +87,7 @@ BuyButtonSubview.prototype.headerSubview = function () {
           left: '49vw',
         },
       }, [
-        h(Loading, { isLoading }),
+        isLoading && h(Loading),
       ]),
 
       // account panel
-- 
cgit v1.2.3


From bef1405a50af219dc02108d7f437654690aec73e Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Sun, 22 Oct 2017 22:59:55 -0700
Subject: Change all "Buy" to "Deposit"

---
 ui/app/components/buy-button-subview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/buy-button-subview.js')

diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index a36f41df5..d5958787b 100644
--- a/ui/app/components/buy-button-subview.js
+++ b/ui/app/components/buy-button-subview.js
@@ -76,7 +76,7 @@ BuyButtonSubview.prototype.headerSubview = function () {
             paddingTop: '4px',
             paddingBottom: '4px',
           },
-        }, 'Buy Eth'),
+        }, 'Deposit Eth'),
       ]),
 
       // loading indication
-- 
cgit v1.2.3