Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
Merge pull request #39 from LiskHQ/16_multiple-new-passphrase-windows
Browse files Browse the repository at this point in the history
Fix multiple new passphrase windows bug - Closes #16
  • Loading branch information
karmacoma authored Mar 6, 2017
2 parents 2a4e8f8 + 48822d9 commit 0f81de0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/app/components/login/login.jade
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ md-card
md-card-title-text
span.md-title Sign In
md-card-content
form
form(ng-submit='$ctrl.go()')
md-input-container.md-block(md-is-error='$ctrl.valid === 0')
label Enter your passphrase
input(type="{{ $ctrl.show_passphrase ? 'text' : 'password' }}", ng-model='$ctrl.input_passphrase', ng-disabled='$ctrl.random')
input(type="{{ $ctrl.show_passphrase ? 'text' : 'password' }}", ng-model='$ctrl.input_passphrase', ng-disabled='$ctrl.random', autofocus)
md-input-container.md-block
md-checkbox.md-primary(ng-model="$ctrl.show_passphrase", aria-label="Show passphrase") Show passphrase
md-content(layout='row', layout-align='center center')
Expand Down
7 changes: 2 additions & 5 deletions src/app/components/login/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,8 @@ app.component('login', {
}

if (count >= total) {
this.$timeout(() => {
this.stop()
this.setNew()
})

this.stop()
this.setNew()
return
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/transactions/transactions.jade
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ md-card.offline-hide
span.tx(ng-switch-when='4') Multisignature Creation
span.tx(ng-switch-when='5') Blockchain Application Registration
span.tx(ng-switch-when='6') Transfer Lisk to Blockchain Application
span.tx(ng-switch-when='7') Transfer Lisk from Blockchain Applicatio
span.tx(ng-switch-when='7') Transfer Lisk from Blockchain Application
span(ng-switch-default)
span(ng-bind='transaction.senderId', ng-if='transaction.senderId !== $ctrl.account.address')
span(ng-bind='transaction.recipientId', ng-if='transaction.senderId === $ctrl.account.address')
Expand Down

0 comments on commit 0f81de0

Please sign in to comment.