diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js index 2e5d74f02616d99ce030f8988c9917d6dcd26ece..91e1b0a8d25c4a7ae7032e304325cd05f87a3629 100644 --- a/www/js/controllers/wallet-controllers.js +++ b/www/js/controllers/wallet-controllers.js @@ -75,6 +75,7 @@ function WalletController($scope, $q, $ionicPopup, $timeout, $state, $scope.updateView = function() { $scope.motion.show({selector: '#wallet .item'}); + $scope.$broadcast('$$rebind::' + 'rebind'); // force rebind }; $scope.setRegisterForm = function(registerForm) { diff --git a/www/templates/wallet/view_wallet.html b/www/templates/wallet/view_wallet.html index 81dc4aac0614d6f60493738fff50534d68d255b9..399a4fee16bc041a92b3bc53d3ccb7a99f8b9635 100644 --- a/www/templates/wallet/view_wallet.html +++ b/www/templates/wallet/view_wallet.html @@ -18,24 +18,24 @@ </button> </ion-nav-buttons> - <ion-content scroll="true" bind-notifier="{ rebind:settings.useRelative, locale:settings.locale.id}"> + <ion-content scroll="true" bind-notifier="{ rebind:settings.useRelative, locale:$root.settings.locale.id}"> <div class="positive-900-bg hero" id="wallet-header" ng-class="{'hero-qrcode-active': toggleQRCode}"> <div class="content" ng-if="!loading"> <i class="avatar" - ng-if="::!formData.avatar" + ng-if=":rebind:!formData.avatar" ng-class="{'avatar-wallet': !formData.isMember, 'avatar-member': formData.isMember}"></i> <i class="avatar" - ng-if="::formData.avatar" - style="background-image: url({{::formData.avatar.src}})"></i> - <ng-if ng-if="::formData.name"> - <h3 class="light">{{::formData.name}}</h3> + ng-if=":rebind:formData.avatar" + style="background-image: url({{:rebind:formData.avatar.src}})"></i> + <ng-if ng-if=":rebind:formData.name"> + <h3 class="light">{{:rebind:formData.name}}</h3> </ng-if> - <ng-if ng-if="::!formData.name"> - <h3 class="light" ng-if="::formData.uid">{{::formData.uid}}</h3> - <h3 class="light" ng-if="::!formData.uid"><i class="ion-key"></i> {{::formData.pubkey | formatPubkey}}</h3> + <ng-if ng-if=":rebind:!formData.name"> + <h3 class="light" ng-if=":rebind:formData.uid">{{:rebind:formData.uid}}</h3> + <h3 class="light" ng-if=":rebind:!formData.uid"><i class="ion-key"></i> {{:rebind:formData.pubkey | formatPubkey}}</h3> </ng-if> - <h4 class="assertive"><ng-if ng-if="::(formData.name || formData.uid) && !formData.isMember" translate>WOT.NOT_MEMBER_PARENTHESIS</ng-if></h4> + <h4 class="assertive"><ng-if ng-if=":rebind:(formData.name || formData.uid) && !formData.isMember" translate>WOT.NOT_MEMBER_PARENTHESIS</ng-if></h4> </div> <h4 class="content light" ng-if="loading"> <ion-spinner icon="android"></ion-spinner> @@ -137,21 +137,21 @@ <!-- Uid --> <span class="item item-icon-left item-text-wrap ink" - ng-if="formData.uid" + ng-if=":rebind:formData.uid" on-hold="copy(formData.uid)" - copy-on-click="{{formData.uid}}"> + copy-on-click="{{:rebind:formData.uid}}"> <span translate>COMMON.UID</span> - <span class="badge badge-stable">{{formData.uid}}</span> + <span class="badge badge-stable">{{:rebind:formData.uid}}</span> </span> <!-- Public key --> <span id="helptip-wallet-pubkey" class="item item-icon-left item-text-wrap ink" on-hold="copy(formData.pubkey)" - copy-on-click="{{formData.pubkey}}"> + copy-on-click="{{:rebind:formData.pubkey}}"> <i class="icon ion-key"></i> {{:locale:'COMMON.PUBKEY'|translate}} - <h4 id="pubkey" class="dark">{{formData.pubkey}}</h4> + <h4 id="pubkey" class="dark">{{:rebind:formData.pubkey}}</h4> </span> </div> </div>