From 5a6c333506e4000602c1a1106cee6d06fe83afa8 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Mon, 17 Sep 2018 10:34:29 -0700
Subject: Switch existing modals from using Notification to Modal. Remove
 Notification component. Add CancelTransaction modal

---
 app/_locales/en/messages.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'app/_locales')

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 2cfd15f50..ed2e7a119 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -61,6 +61,12 @@
   "attemptingConnect": {
     "message": "Attempting to connect to blockchain."
   },
+  "attemptToCancel": {
+    "message": "Attempt to Cancel?"
+  },
+  "attemptToCancelDescription": {
+    "message": "Attempting to cancel does not guarantee your original transaction will be cancelled. If cancelled, you are still required to pay a transaction fee to the network."
+  },
   "attributions": {
     "message": "Attributions"
   },
@@ -116,6 +122,12 @@
   "cancel": {
     "message": "Cancel"
   },
+  "cancelAttempt": {
+    "message": "Cancel Attempt"
+  },
+  "cancellationGasFee": {
+    "message": "Cancellation Gas Fee"
+  },
   "classicInterface": {
     "message": "Use classic interface"
   },
@@ -1228,6 +1240,9 @@
   "whatsThis": {
     "message": "What's this?"
   },
+  "yesLetsTry": {
+    "message": "yes, let's try"
+  },
   "youNeedToAllowCameraAccess": {
     "message": "You need to allow camera access to use this feature."
   },
-- 
cgit v1.2.3


From 95e1eff4ca3d784d6fcba21035a535f8f3398cdc Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Mon, 17 Sep 2018 18:32:35 -0700
Subject: Add TransactionDetails modal

---
 app/_locales/en/messages.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/_locales')

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index ed2e7a119..570284126 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1112,6 +1112,9 @@
   "transactionCreated": {
     "message": "Transaction created with a value of $1 on $2."
   },
+  "transactionWithNonce": {
+    "message": "Transaction $1"
+  },
   "transactionDropped": {
     "message": "Transaction dropped on $2."
   },
-- 
cgit v1.2.3


From 431beb943675f2e9b7b5e5ce9c7f55d45f10905f Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Thu, 20 Sep 2018 19:35:45 -0700
Subject: Fix multiplyCurrencies. Add onClose prop for Modal component. Remove
 hideModal from modal components.

---
 app/_locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/_locales')

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 570284126..bcd897bba 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1244,7 +1244,7 @@
     "message": "What's this?"
   },
   "yesLetsTry": {
-    "message": "yes, let's try"
+    "message": "Yes, let's try"
   },
   "youNeedToAllowCameraAccess": {
     "message": "You need to allow camera access to use this feature."
-- 
cgit v1.2.3