anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

better refresh in walletDetails

Browse source
This commit is contained in:
Matias Alejo Garcia 2017-01-17 12:27:00 -03:00
commit 7fd7c47f18
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
6 changed files with 6 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/controllers/advancedSettings.js
View file

@ -95,17 +95,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
});
};
$scope.frequentlyUsedChange = function() {
var opts = {
frequentlyUsed: {
enabled: $scope.frequentlyUsedEnabled.value
}
};
configService.set(opts, function(err) {
if (err) $log.debug(err);
});
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
updateConfig();
});

2
src/js/controllers/walletDetails.js
View file

@ -352,7 +352,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
listeners = [
$rootScope.$on('bwsEvent', function(e, walletId) {
if (walletId == $scope.wallet.id)
if (walletId == $scope.wallet.id && e.type!='NewAddress')
$scope.updateAll();
}),
$rootScope.$on('Local/TxAction', function(e, walletId) {

10
src/js/services/configService.js
View file

@ -61,14 +61,9 @@ angular.module('copayApp.services').factory('configService', function(storageSer
enabled: true
},
//Experimental Features
recentTransactions: {
enabled: false //disabled by default
},
frequentlyUsed: {
enabled: true
enabled: true,
},
rates: {
@ -214,9 +209,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer
if (!configCache.recentTransactions) {
configCache.recentTransactions = defaultConfig.recentTransactions;
}
if (!configCache.frequentlyUsed) {
configCache.frequentlyUsed = defaultConfig.frequentlyUsed;
}
if (!configCache.pushNotifications) {
configCache.pushNotifications = defaultConfig.pushNotifications;
}

1
src/sass/views/advancedSettings.scss
View file

@ -25,6 +25,7 @@
padding: 15px;
background-color: #fff;
color: $mid-gray;
font-size:0.9em;
}
}
}

23
www/views/advancedSettings.html
View file

@ -37,13 +37,6 @@
If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays.
</div>
<div class="item item-divider" translate>Experimental Features</div>
<div class="settings-explanation">
<div class="settings-description" translate>
These features aren't quite ready for primetime. They may change, stop working, or disappear at any time.
</div>
</div>
<ion-toggle class="has-comment" ng-show="!isWP" ng-model="recentTransactionsEnabled.value" toggle-class="toggle-balanced" ng-change="recentTransactionsChange()">
<span class="toggle-label" translate>Recent Transaction Card</span>
</ion-toggle>
@ -51,22 +44,6 @@
If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab.
</div>
<ion-toggle class="has-comment" ng-model="global.developmentUtilitiesEnabled.value" toggle-class="toggle-balanced" ng-change="toggledDevelopmentUtils()">
<span class="toggle-label" translate>Development Utilities</span>
</ion-toggle>
<div class="comment" translate>
These features make it easier to test complex functionality on all devices. They may be unstable.
</div>
<!-- disable frequently used for this release -->
<!-- <ion-toggle ng-show="!isWP" ng-model="frequentlyUsedEnabled.value" toggle-class="toggle-balanced" ng-change="frequentlyUsedChange()">
<span class="toggle-label" translate>Frequently Used Card</span>
</ion-toggle>
<div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
<span transaction>If enabled, the Frequently Used card - a list of the most commonly chosen recipients - will appear in the Send tab.</span>
</div> -->
</div>
</ion-content>
</ion-view>

11
www/views/walletDetails.html
View file

@ -28,7 +28,7 @@
<div ng-show="updateStatusError">
<span class="size-12 db m10">{{updateStatusError}}</span>
<a class="button button-outline button-light button-small" ng-click='update()' translate>Tap to retry</a>
<a class="button button-outline button-light button-small" ng-click='updateAll(true)' translate>Tap to retry</a>
</div>
<div ng-show="walletNotRegistered">
@ -36,14 +36,9 @@
<a class="button button-outline button-light button-small" ng-click='recreate()' translate>Recreate</a>
</div>
<div ng-show="wallet.walletScanStatus == 'error'" ng-click='retryScan()'>
<span translate>Scan status finished with error</span>
<br><span translate>Tap to retry</span>
</div>
<div
ng-click='updateAll(true)'
ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden"
ng-show="!updateStatusError && !wallet.balanceHidden"
on-hold="hideToggle()"
ng-style="{'transform': amountScale}"
ng-class="{amount__balance: amountIsCollapsible}">
@ -59,7 +54,7 @@
<div ng-style="{'transform': amountScale}"
class="amount__balance"
ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && wallet.balanceHidden"
ng-show="!updateStatusError && wallet.balanceHidden"
on-hold="hideToggle()">
<strong class="size-24" translate>[Balance Hidden]</strong>
<div ng-style="{opacity: altAmountOpacity}" class="size-14 amount-alternative" translate>