BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #121 from cmgustavo/ref/design-32 

Fix tips
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-15 10:10:40 -03:00 committed by GitHub
parent bb96f45488 2230d5b666
commit e2e8d1aaf4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/views/tab-receive.html
View File

@ -1,13 +1,13 @@
<ion-view id="tab-receive">
<ion-view id="tab-receive" ng-controller="tabReceiveController" ng-init="init()">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
<ion-nav-buttons side="secondary">
<button class="no-border">
<button class="button button-clear" ng-click="checkTips(true)">
<i class="ion-help-circled"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content ng-controller="tabReceiveController" ng-init="init()">
<ion-content>
<article id="address">
<div class="row">
<div class="m15t text-center col col-60 center-block" copy-to-clipboard="addr">

6
src/js/controllers/tab-receive.js
View File

@ -13,10 +13,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
if (!$scope.isCordova) $scope.checkTips();
}
$scope.checkTips = function() {
$scope.checkTips = function(force) {
storageService.getReceiveTipsAccepted(function(err, accepted) {
if (err) $log.warn(err);
if (accepted) return;
if (accepted && !force) return;
$timeout(function() {
$ionicModal.fromTemplateUrl('views/modals/receive-tips.html', {
@ -25,7 +25,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.receiveTipsModal = modal;
$scope.receiveTipsModal.show();
});
}, 1000);
}, force ? 1 : 1000);
});
};