Merge branch 'development' into 378-connect-via-https

LiskArchive · Jun 12, 2017 · 46ded1c · 46ded1c
2 parents d2b2c15 + 6c4df11
commit 46ded1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/components/delegateRegistration/delegateRegistration.js b/src/components/delegateRegistration/delegateRegistration.js
@@ -12,13 +12,16 @@ app.component('delegateRegistration', {
     closeDialog: '&',
   },
   controller($scope, delegateApi, Account, dialog, $rootScope) {
+    $scope.account = Account;
+
     function checkPendingRegistration() {
       delegateApi.getDelegate({
         username: $scope.username,
       }).then((data) => {
         Account.set({
           isDelegate: true,
           username: data.delegate.username,
+          delegate: data.delegate,
         });
         $scope.pendingRegistrationListener();
       });

diff --git a/src/components/delegateRegistration/delegateRegistration.pug b/src/components/delegateRegistration/delegateRegistration.pug
@@ -14,9 +14,9 @@ div.dialog-delegate-registration(aria-label='Vote for delegates')
             input.username(type='text', name='delegateName', ng-model='form.name', required, ng-disabled='loading', md-autofocus)
             div(ng-messages='delegateRegistrationForm.name.$error')
               div(ng-message='required') Required
-            md-input-container.md-block(ng-if='!$ctrl.account.get().secondSignature')
-              div.fee Fee: {{$ctrl.form.fee}} LSK
-          md-input-container.md-block(ng-if='$ctrl.account.get().secondSignature')
+            md-input-container.md-block(ng-if='!account.get().secondSignature')
+              div.fee Fee: {{form.fee}} LSK
+          md-input-container.md-block(ng-if='account.get().secondSignature')
             label Second Passphrase
             input(type='password', ng-model='form.secondPassphrase', required)
             md-input-container.md-block