Merge pull request #5469 from matiu/feat/refresh-walletDetails
Feat/refresh wallet details
This commit is contained in:
commit
0ffb696442
8 changed files with 41 additions and 64 deletions
|
|
@ -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();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -352,12 +352,12 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
|
|||
|
||||
listeners = [
|
||||
$rootScope.$on('bwsEvent', function(e, walletId) {
|
||||
if (walletId == $scope.wallet.id)
|
||||
updateStatus();
|
||||
if (walletId == $scope.wallet.id && e.type!='NewAddress')
|
||||
$scope.updateAll();
|
||||
}),
|
||||
$rootScope.$on('Local/TxAction', function(e, walletId) {
|
||||
if (walletId == $scope.wallet.id)
|
||||
updateStatus();
|
||||
$scope.updateAll();
|
||||
}),
|
||||
];
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
padding: 15px;
|
||||
background-color: #fff;
|
||||
color: $mid-gray;
|
||||
font-size:0.9em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -218,6 +218,7 @@
|
|||
bottom: 5px;
|
||||
font-size: 20px;
|
||||
color: #fff;
|
||||
width:95%;
|
||||
}
|
||||
|
||||
.wallet-not-backed-up-warning {
|
||||
|
|
@ -234,3 +235,15 @@
|
|||
a.item {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.recent svg {
|
||||
margin-left:5px;
|
||||
width:0.7em;
|
||||
height:0.7em;
|
||||
stroke: #eee;
|
||||
}
|
||||
|
||||
.updatingHistory {
|
||||
color: #445;
|
||||
font-size:0.9em;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue