mirror of https://github.com/BTCPrivate/copay.git
commit
39383b30ad
|
@ -41,7 +41,7 @@
|
|||
<div class="keypad">
|
||||
<div class="row">
|
||||
<div class="col col-25 col-offset-75 operator-send"
|
||||
ng-hide="alternativeResult <= 0 && amountResult <= 0" ng-click="finish()">
|
||||
ng-show="amount > 0 || alternativeResult > 0 || amountResult > 0" ng-click="finish()">
|
||||
<i class="icon ion-ios-arrow-thin-right"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
<ion-slides options="{loop: false, effect: 'flip', speed: 500, pagination: false, initialSlide: 1}" slider="data.slider">
|
||||
<ion-slide-page></ion-slide-page>
|
||||
<ion-slide-page>
|
||||
</ion-slide-page>
|
||||
<ion-slide-page>
|
||||
<div><h1>Slide to accept</h1><i class="icon-arrow-right3 size-24 right"></i></div>
|
||||
<div>
|
||||
<i class="icon ion-ios-arrow-thin-right"></i>
|
||||
<span translate>Slide to accept</span>
|
||||
</div>
|
||||
</ion-slide-page>
|
||||
</ion-slides>
|
||||
|
|
|
@ -50,21 +50,6 @@
|
|||
<i class="icon nav-item-arrow-right"></i>
|
||||
</a>
|
||||
|
||||
<div ng-show="usePushNotifications && PNEnabledByUser">
|
||||
<div class="item item-divider" translate>Notifications</div>
|
||||
|
||||
<ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
|
||||
<span class="toggle-label" translate>Enable push notifications</span>
|
||||
</ion-toggle>
|
||||
|
||||
<div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
|
||||
<div translate>Push notifications for Copay are currently disabled. Enable them in the Settings app.</div>
|
||||
<ul ng-click="openSettings()">
|
||||
<li translate>Open Settings app</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item item-divider" translate>Exchanges</div>
|
||||
|
||||
<ion-toggle ng-show="!isWP" ng-model="glideraEnabled.value" toggle-class="toggle-balanced" ng-change="glideraChange()">
|
||||
|
@ -84,6 +69,24 @@
|
|||
<span class="toggle-label" translate>Use Unconfirmed Funds</span>
|
||||
</ion-toggle>
|
||||
|
||||
<div ng-show="usePushNotifications && PNEnabledByUser">
|
||||
<div class="item item-divider" translate>Notifications</div>
|
||||
|
||||
<ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
|
||||
<span class="toggle-label" translate>Enable push notifications</span>
|
||||
</ion-toggle>
|
||||
</div>
|
||||
|
||||
<div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
|
||||
<div class="item item-divider" translate>Notifications</div>
|
||||
<div class="padding text-light" translate>
|
||||
Push notifications for Copay are currently disabled. Enable them in the Settings app.
|
||||
</div>
|
||||
<a class="item" ng-click="openSettings()">
|
||||
<span translate>Open Settings app</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="item item-divider" translate>Wallets Preferences</div>
|
||||
<a class="item item-icon-left item-icon-right" href
|
||||
ui-sref="tabs.preferences({'walletId': item.id})"
|
||||
|
|
|
@ -20,6 +20,9 @@ angular.module('copayApp.controllers').controller('addressbookListController', f
|
|||
});
|
||||
|
||||
$scope.addressbook = lodash.clone(contacts);
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
}, 100);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -89,13 +89,16 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
|
||||
|
||||
$scope.showDescriptionPopup = function() {
|
||||
var title = gettextCatalog.getString('Add description');
|
||||
var message = gettextCatalog.getString('Add description');
|
||||
var opts = {
|
||||
defaultText: $scope.description
|
||||
};
|
||||
|
||||
popupService.showPrompt(title, null, opts, function(res) {
|
||||
popupService.showPrompt(null, message, opts, function(res) {
|
||||
if (res) $scope.description = res;
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
}, 100);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ angular.module('copayApp.controllers').controller('txStatusController', function
|
|||
disableAnimate: true,
|
||||
disableBack: true
|
||||
});
|
||||
$ionicHistory.removeBackView();
|
||||
$state.go('tabs.send.addressbook', {
|
||||
fromSendTab: true,
|
||||
addressbookEntry: addressbookEntry
|
||||
|
|
|
@ -5,10 +5,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
$scope.isCordova = platformInfo.isCordova;
|
||||
$scope.isNW = platformInfo.isNW;
|
||||
|
||||
$scope.wallets = profileService.getWallets({
|
||||
onlyComplete: true
|
||||
});
|
||||
|
||||
$scope.checkTips = function(force) {
|
||||
storageService.getReceiveTipsAccepted(function(err, accepted) {
|
||||
if (err) $log.warn(err);
|
||||
|
@ -25,16 +21,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
});
|
||||
};
|
||||
|
||||
$scope.$on('Wallet/Changed', function(event, wallet) {
|
||||
if (!wallet) {
|
||||
$log.debug('No wallet provided');
|
||||
return;
|
||||
}
|
||||
$scope.wallet = wallet;
|
||||
$log.debug('Wallet changed: ' + wallet.name);
|
||||
$scope.setAddress();
|
||||
});
|
||||
|
||||
$scope.shareAddress = function(addr) {
|
||||
if ($scope.generatingAddress) return;
|
||||
if ($scope.isCordova) {
|
||||
|
@ -61,5 +47,19 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
}, 1);
|
||||
};
|
||||
|
||||
$scope.$on("$ionicView.enter", function(event, data) {
|
||||
if (!$scope.isCordova) $scope.checkTips();
|
||||
$scope.wallets = profileService.getWallets({
|
||||
onlyComplete: true
|
||||
});
|
||||
$scope.$on('Wallet/Changed', function(event, wallet) {
|
||||
if (!wallet) {
|
||||
$log.debug('No wallet provided');
|
||||
return;
|
||||
}
|
||||
$scope.wallet = wallet;
|
||||
$log.debug('Wallet changed: ' + wallet.name);
|
||||
$scope.setAddress();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -12,6 +12,16 @@
|
|||
bottom: 49px;
|
||||
width: 100%;
|
||||
height: 100px;
|
||||
background-color: #f5f5f5;
|
||||
background-color: #647CE8;
|
||||
color: #ffffff;
|
||||
font-size: 25px;
|
||||
text-align: center;
|
||||
padding-top: 34px;
|
||||
line-height: 32px;
|
||||
}
|
||||
.accept-slide i {
|
||||
float: right;
|
||||
font-size: 32px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue