From 40e0d92f572d4fff14bfac9a2b0a64ffae8ec7c5 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Wed, 22 Aug 2018 23:57:35 -0230 Subject: Adds sidebar component and refactors slide in wallet view sidebar to use it. --- development/states/add-token.json | 1 + development/states/confirm-new-ui.json | 1 + development/states/confirm-sig-requests.json | 1 + development/states/currency-localization.json | 1 + development/states/first-time.json | 1 + development/states/send-edit.json | 1 + development/states/send-new-ui.json | 1 + development/states/send.json | 1 + development/states/tx-list-items.json | 1 + 9 files changed, 9 insertions(+) (limited to 'development') diff --git a/development/states/add-token.json b/development/states/add-token.json index 84ad5dd4c..d04b3a3ca 100644 --- a/development/states/add-token.json +++ b/development/states/add-token.json @@ -123,6 +123,7 @@ "modalState": {}, "previousModalState": {} }, + "sidebar": {}, "transForward": true, "isLoading": false, "warning": null, diff --git a/development/states/confirm-new-ui.json b/development/states/confirm-new-ui.json index 2c2e17704..fffee9893 100644 --- a/development/states/confirm-new-ui.json +++ b/development/states/confirm-new-ui.json @@ -141,6 +141,7 @@ "accountDetail": { "subview": "transactions" }, + "sidebar": {}, "modal": { "modalState": {}, "previousModalState": {} diff --git a/development/states/confirm-sig-requests.json b/development/states/confirm-sig-requests.json index 829f513a8..5017a4d57 100644 --- a/development/states/confirm-sig-requests.json +++ b/development/states/confirm-sig-requests.json @@ -162,6 +162,7 @@ "accountDetail": { "subview": "transactions" }, + "sidebar": {}, "modal": { "modalState": {}, "previousModalState": {} diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json index 6848c0840..847ea11a3 100644 --- a/development/states/currency-localization.json +++ b/development/states/currency-localization.json @@ -120,6 +120,7 @@ "accountDetail": { "subview": "transactions" }, + "sidebar": {}, "modal": { "modalState": {}, "previousModalState": {} diff --git a/development/states/first-time.json b/development/states/first-time.json index f44148973..a31b985a3 100644 --- a/development/states/first-time.json +++ b/development/states/first-time.json @@ -48,6 +48,7 @@ "accountDetail": { "subview": "transactions" }, + "sidebar": {}, "transForward": true, "isLoading": false, "warning": null, diff --git a/development/states/send-edit.json b/development/states/send-edit.json index 8e5c25a82..2ea5953e7 100644 --- a/development/states/send-edit.json +++ b/development/states/send-edit.json @@ -141,6 +141,7 @@ "accountDetail": { "subview": "transactions" }, + "sidebar": {}, "modal": { "modalState": {}, "previousModalState": {} diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json index ad2ff3d6e..497c7bfb4 100644 --- a/development/states/send-new-ui.json +++ b/development/states/send-new-ui.json @@ -120,6 +120,7 @@ "accountDetail": { "subview": "transactions" }, + "sidebar": {}, "modal": { "modalState": {}, "previousModalState": {} diff --git a/development/states/send.json b/development/states/send.json index 73ac62f65..5e70518fb 100644 --- a/development/states/send.json +++ b/development/states/send.json @@ -99,6 +99,7 @@ "accountExport": "none", "privateKey": "" }, + "sidebar": {}, "transForward": true, "isLoading": false, "warning": null, diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json index f22fd0a56..0d2273cb0 100644 --- a/development/states/tx-list-items.json +++ b/development/states/tx-list-items.json @@ -118,6 +118,7 @@ "modalState": {}, "previousModalState": {} }, + "sidebar": {}, "transForward": true, "isLoading": false, "warning": null, -- cgit From 63397047cf8ec1941dfebcec12b8d02dcb6508f2 Mon Sep 17 00:00:00 2001 From: Esteban MIno Date: Thu, 30 Aug 2018 15:09:59 -0300 Subject: fix integration test for asset images selectors --- development/bundle.js.tmp-browserify-19688247466117370088 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 development/bundle.js.tmp-browserify-19688247466117370088 (limited to 'development') diff --git a/development/bundle.js.tmp-browserify-19688247466117370088 b/development/bundle.js.tmp-browserify-19688247466117370088 new file mode 100644 index 000000000..e69de29bb -- cgit From 165a966a2a0c1a6eb03b7eb53fd0824f4437200a Mon Sep 17 00:00:00 2001 From: Esteban MIno Date: Thu, 30 Aug 2018 17:19:10 -0300 Subject: balance components using selectors --- development/bundle.js.tmp-browserify-19688247466117370088 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 development/bundle.js.tmp-browserify-19688247466117370088 (limited to 'development') diff --git a/development/bundle.js.tmp-browserify-19688247466117370088 b/development/bundle.js.tmp-browserify-19688247466117370088 deleted file mode 100644 index e69de29bb..000000000 -- cgit From 879e10d44accbe9122e8b8514641b4fb2b986ad7 Mon Sep 17 00:00:00 2001 From: Esteban MIno Date: Thu, 30 Aug 2018 17:25:13 -0300 Subject: add assetImages to development states --- development/states/send-edit.json | 1 + development/states/send-new-ui.json | 1 + development/states/send.json | 1 + 3 files changed, 3 insertions(+) (limited to 'development') diff --git a/development/states/send-edit.json b/development/states/send-edit.json index 8e5c25a82..59f053bd4 100644 --- a/development/states/send-edit.json +++ b/development/states/send-edit.json @@ -22,6 +22,7 @@ "name": "Send Account 4" } }, + "assetImages": {}, "unapprovedTxs": {}, "currentCurrency": "USD", "conversionRate": 1200.88200327, diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json index ad2ff3d6e..dbc6af7c6 100644 --- a/development/states/send-new-ui.json +++ b/development/states/send-new-ui.json @@ -61,6 +61,7 @@ "name": "Address Book Account 1" } ], + "assetImages": {}, "tokens": [], "transactions": {}, "selectedAddressTxList": [], diff --git a/development/states/send.json b/development/states/send.json index 73ac62f65..6065b4b84 100644 --- a/development/states/send.json +++ b/development/states/send.json @@ -21,6 +21,7 @@ "name": "Account 4" } }, + "assetImages": {}, "unapprovedTxs": {}, "currentCurrency": "USD", "conversionRate": 16.88200327, -- cgit