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

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

Browse source 
Fix tips
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-15 10:10:40 -03:00 • committed by GitHub
commit e2e8d1aaf4
2 changed files with 6 additions and 6 deletions
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-bar class="bar-royal">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title> <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
<ion-nav-buttons side="secondary"> <ion-nav-buttons side="secondary">
<button class="no-border"> <button class="button button-clear" ng-click="checkTips(true)">
<i class="ion-help-circled"></i> <i class="ion-help-circled"></i>
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="tabReceiveController" ng-init="init()"> <ion-content>
<article id="address"> <article id="address">
<div class="row"> <div class="row">
<div class="m15t text-center col col-60 center-block" copy-to-clipboard="addr"> <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(); if (!$scope.isCordova) $scope.checkTips();
} }
$scope.checkTips = function() { $scope.checkTips = function(force) {
storageService.getReceiveTipsAccepted(function(err, accepted) { storageService.getReceiveTipsAccepted(function(err, accepted) {
if (err) $log.warn(err); if (err) $log.warn(err);
if (accepted) return; if (accepted && !force) return;
$timeout(function() { $timeout(function() {
$ionicModal.fromTemplateUrl('views/modals/receive-tips.html', { $ionicModal.fromTemplateUrl('views/modals/receive-tips.html', {
@ -25,7 +25,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.receiveTipsModal = modal; $scope.receiveTipsModal = modal;
$scope.receiveTipsModal.show(); $scope.receiveTipsModal.show();
}); });
}, 1000); }, force ? 1 : 1000);
}); });
}; };