From 75784b9bb7cef15f02dcbf44bec9fdf2f40e10f9 Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Sun, 5 Mar 2017 00:09:28 +0100 Subject: [PATCH] Fixed tests --- .../preferences/payment/advanceSettings.js | 2 +- .../preferences/payment/bitcoinDashboard.js | 2 +- .../preferences/payment/disabledContent.js | 4 +- .../preferences/payment/enabledContent.js | 21 ++++-- .../preferences/payment/ledgerRecovery.js | 2 +- .../preferences/payment/ledgerTable.js | 2 +- .../components/preferences/paymentsTab.js | 4 +- js/components/button.js | 4 + test/lib/selectors.js | 18 ++--- test/unit/about/preferencesTest.js | 13 +++- test/unit/app/renderer/paymentsTabTest.js | 75 +++++++++++-------- 11 files changed, 88 insertions(+), 59 deletions(-) diff --git a/app/renderer/components/preferences/payment/advanceSettings.js b/app/renderer/components/preferences/payment/advanceSettings.js index 13a50ced50b..ca19e88b812 100644 --- a/app/renderer/components/preferences/payment/advanceSettings.js +++ b/app/renderer/components/preferences/payment/advanceSettings.js @@ -34,7 +34,7 @@ class AdvanceSettingsContent extends ImmutableComponent { // TODO translate seconds, minute and visits return
-
+
diff --git a/app/renderer/components/preferences/payment/bitcoinDashboard.js b/app/renderer/components/preferences/payment/bitcoinDashboard.js index a4b5b59ac4d..09bb538829a 100644 --- a/app/renderer/components/preferences/payment/bitcoinDashboard.js +++ b/app/renderer/components/preferences/payment/bitcoinDashboard.js @@ -241,7 +241,7 @@ class BitcoinDashboard extends ImmutableComponent { window.addEventListener('message', this.onMessage.bind(this), false) // TODO remove bitcoinDashboard class - return
+ return
{ this.props.bitcoinOverlayVisible ? -
+ return
+

diff --git a/app/renderer/components/preferences/payment/enabledContent.js b/app/renderer/components/preferences/payment/enabledContent.js index e379e6f6a02..bc085991e9d 100644 --- a/app/renderer/components/preferences/payment/enabledContent.js +++ b/app/renderer/components/preferences/payment/enabledContent.js @@ -21,6 +21,7 @@ const LedgerTable = require('./ledgerTable') // style const globalStyles = require('../../styles/global') const {paymentStyles} = require('../../styles/payment') +const commonStyles = require('../../styles/commonStyles') const cx = require('../../../../../js/lib/classSet') // other @@ -39,14 +40,14 @@ class EnabledContent extends ImmutableComponent { ? this.props.showOverlay.bind(this, 'addFunds') : (ledgerData.get('creating') ? () => {} : this.createWallet(ledgerData)) - return