From b1a892e4593c0682e7dc266eaac5b75fe493808e Mon Sep 17 00:00:00 2001 From: petitPapillon Date: Mon, 5 Jun 2017 22:48:00 +0200 Subject: [PATCH] Merge redux into decouple-jsx-out-of-js --- .../addcoin/coin-selectors.render.js | 4 +- .../components/dashboard/coinTile.render.js | 10 ++-- .../src/components/dashboard/jumblr.render.js | 49 ++++++----------- .../src/components/dashboard/navbar.render.js | 52 +++++++++---------- .../dashboard/notifications.render.js | 29 ++++------- .../dashboard/receiveCoin.render.js | 9 ++-- react/src/components/login/login.render.js | 6 +-- .../components/login/swall-modal.render.js | 4 +- 8 files changed, 68 insertions(+), 95 deletions(-) diff --git a/react/src/components/addcoin/coin-selectors.render.js b/react/src/components/addcoin/coin-selectors.render.js index 0c33726..e0b20e1 100644 --- a/react/src/components/addcoin/coin-selectors.render.js +++ b/react/src/components/addcoin/coin-selectors.render.js @@ -7,7 +7,9 @@ import AddCoinOptionsACFiat from '../addcoin/addcoinOptionsACFiat'; const CoinSelectorsRender = function(item, coin, i) { return ( -
+
1 ? 'multi' : 'single' } + key={ `add-coin-${i}` }>
@@ -23,8 +23,8 @@ const CoinTileRender = function () {
-
-
+
+
{ this.renderTiles() }
diff --git a/react/src/components/dashboard/jumblr.render.js b/react/src/components/dashboard/jumblr.render.js index 0ce9322..6acc630 100644 --- a/react/src/components/dashboard/jumblr.render.js +++ b/react/src/components/dashboard/jumblr.render.js @@ -10,9 +10,9 @@ const JumblrRender = function () {
-
- { translate('JUMBLR.NOTICE') } @@ -24,11 +24,11 @@ const JumblrRender = function () {
- - { translate('JUMBLR.NEED_NATIVE') } + { translate('JUMBLR.NEED_NATIVE') }
{ translate('JUMBLR.TO_USE_JUMBLR') } @@ -42,23 +42,17 @@ const JumblrRender = function () {
-
+
+ id="jumblr_security_notes_1">