From b9c0b92f9592bec4ca8a33b0d985a78576c10c7f Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Wed, 14 Jun 2017 15:31:56 +0200 Subject: [PATCH] Names refactoring --- .../delegateRegistration/delegateRegistration.pug | 2 +- src/components/fee/fee.js | 6 +++--- src/components/main/secondPass.pug | 2 +- src/filters/{notEnoughBalance.js => fundsInsufficiency.js} | 0 src/liskNano.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/filters/{notEnoughBalance.js => fundsInsufficiency.js} (100%) diff --git a/src/components/delegateRegistration/delegateRegistration.pug b/src/components/delegateRegistration/delegateRegistration.pug index 2360a45eef..3361e155c9 100644 --- a/src/components/delegateRegistration/delegateRegistration.pug +++ b/src/components/delegateRegistration/delegateRegistration.pug @@ -29,4 +29,4 @@ div.dialog-delegate-registration(aria-label='Vote for delegates') md-button.md-secondary(ng-disabled='loading', ng-click='cancel(delegateRegistrationForm)') {{ 'Cancel' }} span(flex) fee(data-fee='form.fee') - md-button.md-raised.md-primary.register-button(ng-disabled='!delegateRegistrationForm.$valid || loading || form.fee | notEnoughBalance', type='submit') {{ loading ? 'Registering...' : 'Register' }} + md-button.md-raised.md-primary.register-button(ng-disabled='!delegateRegistrationForm.$valid || loading || form.fee | fundsInsufficiency', type='submit') {{ loading ? 'Registering...' : 'Register' }} diff --git a/src/components/fee/fee.js b/src/components/fee/fee.js index ad09a94296..4ebc8b13e5 100644 --- a/src/components/fee/fee.js +++ b/src/components/fee/fee.js @@ -14,13 +14,13 @@ app.component('fee', { controller: class fee { constructor($scope, Account, lsk, $element) { this.account = Account; - const notEnoughtLSK = lsk.normalize(this.account.get().balance) < this.fee; + const insufficientFunds = lsk.normalize(this.account.get().balance) < this.fee; - this.text = notEnoughtLSK ? + this.text = insufficientFunds ? `Not enough LSK to pay ${this.fee} LSK fee` : `Fee: ${this.fee} LSK`; - if (notEnoughtLSK) { + if (insufficientFunds) { $element.addClass('error-message'); } } diff --git a/src/components/main/secondPass.pug b/src/components/main/secondPass.pug index 7e71548415..01d50001ac 100644 --- a/src/components/main/secondPass.pug +++ b/src/components/main/secondPass.pug @@ -20,6 +20,6 @@ div.dialog-second(aria-label='Generate a second passphrase for your account', da md-button.md-secondary(ng-disabled='$ctrl.loading', ng-click='cancel()') Cancel span(flex) fee(data-fee='$ctrl.fee') - md-button.md-raised.md-primary.submit-button.next-button(ng-click='$ctrl.step = 1', ng-disabled='$ctrl.fee | notEnoughBalance') Next + md-button.md-raised.md-primary.submit-button.next-button(ng-click='$ctrl.step = 1', ng-disabled='$ctrl.fee | fundsInsufficiency') Next section(data-ng-if='$ctrl.step === 1') passphrase(data-on-save='onSave', data-label='Register', data-fee='{{$ctrl.fee}}') diff --git a/src/filters/notEnoughBalance.js b/src/filters/fundsInsufficiency.js similarity index 100% rename from src/filters/notEnoughBalance.js rename to src/filters/fundsInsufficiency.js diff --git a/src/liskNano.js b/src/liskNano.js index e79e3f6bad..ce116f59b1 100644 --- a/src/liskNano.js +++ b/src/liskNano.js @@ -37,7 +37,7 @@ import './services/notification'; import './filters/lsk'; import './filters/liskNumber'; -import './filters/notEnoughBalance'; +import './filters/fundsInsufficiency'; import './run'; import './states';