From 1ff29c5b4aa305c6dc59736791a1dce642ae3991 Mon Sep 17 00:00:00 2001
From: Koh Wei Jie <contact@kohweijie.com>
Date: Fri, 22 Jun 2018 16:38:54 +0800
Subject: fixed blank boolean field for typed signing for new UI

---
 ui/app/components/signature-request.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui/app/components/signature-request.js')

diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js
index 2a3e929fe..79f2f42d1 100644
--- a/ui/app/components/signature-request.js
+++ b/ui/app/components/signature-request.js
@@ -204,6 +204,10 @@ SignatureRequest.prototype.renderBody = function () {
     h('div.request-signature__rows', [
 
       ...rows.map(({ name, value }) => {
+        console.log(value)
+        if (typeof value === 'boolean') {
+          value = value.toString()
+        }
         return h('div.request-signature__row', [
           h('div.request-signature__row-title', [`${name}:`]),
           h('div.request-signature__row-value', value),
-- 
cgit v1.2.3


From cd90e8a869eca9edc183b142e9a7d811e7c46e57 Mon Sep 17 00:00:00 2001
From: Koh Wei Jie <contact@kohweijie.com>
Date: Fri, 22 Jun 2018 16:46:00 +0800
Subject: removed stray console.log

---
 ui/app/components/signature-request.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ui/app/components/signature-request.js')

diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js
index 79f2f42d1..bbb340fcf 100644
--- a/ui/app/components/signature-request.js
+++ b/ui/app/components/signature-request.js
@@ -204,7 +204,6 @@ SignatureRequest.prototype.renderBody = function () {
     h('div.request-signature__rows', [
 
       ...rows.map(({ name, value }) => {
-        console.log(value)
         if (typeof value === 'boolean') {
           value = value.toString()
         }
-- 
cgit v1.2.3


From 76e80f631e15fafd7e0bd0117fc1703944cb2fb6 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Tue, 10 Jul 2018 12:21:09 -0700
Subject: Fix multiple signature requests showing an infinite spinner

---
 ui/app/components/signature-request.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'ui/app/components/signature-request.js')

diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js
index bbb340fcf..2e0102d1a 100644
--- a/ui/app/components/signature-request.js
+++ b/ui/app/components/signature-request.js
@@ -22,6 +22,8 @@ const {
   conversionRateSelector,
 } = require('../selectors.js')
 
+import { clearConfirmTransaction } from '../ducks/confirm-transaction.duck'
+
 const { DEFAULT_ROUTE } = require('../routes')
 
 function mapStateToProps (state) {
@@ -39,6 +41,7 @@ function mapStateToProps (state) {
 function mapDispatchToProps (dispatch) {
   return {
     goHome: () => dispatch(actions.goHome()),
+    clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
   }
 }
 
@@ -247,12 +250,18 @@ SignatureRequest.prototype.renderFooter = function () {
   return h('div.request-signature__footer', [
     h('button.btn-default.btn--large.request-signature__footer__cancel-button', {
       onClick: event => {
-        cancel(event).then(() => this.props.history.push(DEFAULT_ROUTE))
+        cancel(event).then(() => {
+          this.props.clearConfirmTransaction()
+          this.props.history.push(DEFAULT_ROUTE)
+        })
       },
     }, this.context.t('cancel')),
     h('button.btn-primary.btn--large', {
       onClick: event => {
-        sign(event).then(() => this.props.history.push(DEFAULT_ROUTE))
+        sign(event).then(() => {
+          this.props.clearConfirmTransaction()
+          this.props.history.push(DEFAULT_ROUTE)
+        })
       },
     }, this.context.t('sign')),
   ])
-- 
cgit v1.2.3