Merge branch 'development' into 1.0.0

LiskArchive · Jun 16, 2017 · e311dfa · e311dfa
2 parents 1cd5ba9 + 999767f
commit e311dfa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/login/login.pug b/src/components/login/login.pug
@@ -16,7 +16,7 @@ md-card
         md-checkbox.md-primary(ng-model="$ctrl.show_passphrase", aria-label="Show passphrase") Show passphrase
       md-content(layout='row', layout-align='center center')
         // md-button(ng-disabled='$ctrl.generatingNewPassphrase', ng-click='$ctrl.devTestAccount()') Dev Test Account
-        md-button.md-primary.new-account-button(ng-disabled='$ctrl.random || $ctrl.generatingNewPassphrase || !$ctrl.validity.url',
+        md-button.md-primary.new-account-button(ng-disabled='$ctrl.random || $ctrl.generatingNewPassphrase || ($ctrl.network.custom && !$ctrl.validity.url)',
           data-open-dialog='new-account', data-options='{network: $ctrl.network}') NEW ACCOUNT
-        md-button.md-raised.md-primary.login-button(md-autofocus, ng-disabled='($ctrl.validity.passphrase !== 1 || !$ctrl.validity.url) || $root.loggingIn', type='submit') Login
+        md-button.md-raised.md-primary.login-button(md-autofocus, ng-disabled='($ctrl.validity.passphrase !== 1 || ($ctrl.network.custom && !$ctrl.validity.url)) || $root.loggingIn', type='submit') Login
     passphrase(ng-if='$ctrl.generatingNewPassphrase', data-on-save='onSave', data-target='primary-pass', data-ok-button-label='Login')