Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into scanHandling
This commit is contained in:
commit
41e1d99609
88 changed files with 237 additions and 167 deletions
|
|
@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
|
|||
});
|
||||
};
|
||||
|
||||
$scope.$on("$ionicView.enter", function(event, data) {
|
||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||
updateConfig();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -83,8 +83,6 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
|||
time: $scope.btx.time,
|
||||
description: actionDescriptions['broadcasted'],
|
||||
});
|
||||
|
||||
$scope.actionList.reverse();
|
||||
};
|
||||
|
||||
$scope.showCommentPopup = function() {
|
||||
|
|
|
|||
|
|
@ -59,8 +59,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
|||
by: action.copayerName
|
||||
});
|
||||
});
|
||||
|
||||
$scope.actionList.reverse();
|
||||
};
|
||||
|
||||
$scope.$on('accepted', function(event) {
|
||||
|
|
|
|||
|
|
@ -23,4 +23,11 @@ angular.module('copayApp.controllers').controller('preferencesAliasController',
|
|||
$ionicHistory.goBack();
|
||||
});
|
||||
};
|
||||
$scope.valueCheck = function() {
|
||||
if ($scope.alias.value == wallet.credentials.walletName || $scope.alias.value == '') $scope.disableSave = true;
|
||||
else $scope.disableSave = false;
|
||||
};
|
||||
$scope.$watch('alias.value', function(newvalue, oldvalue) {
|
||||
$scope.valueCheck();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue