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

Merge branch 'master' of github.com:bitpay/copay

This commit is contained in:
Jason Dreyzehner 2016-11-16 18:21:25 -05:00
parent f7e6f30d12 dd3eef34a1
commit 8b7ab38f2b
10 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/controllers/feedback/complete.js
View File

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, $ionicHistory, $state, platformInfo, configService, storageService, lodash) {
angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, $ionicHistory, $state, $ionicNavBarDelegate, $ionicConfig, platformInfo, configService, storageService, lodash) {
$scope.isCordova = platformInfo.isCordova;
var config = configService.getSync();
@ -33,6 +33,12 @@ angular.module('copayApp.controllers').controller('completeController', function
$scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null;
$scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false;
$scope.rated = (data.stateParams && data.stateParams.rated) ? true : false;
$scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false;
if (!$scope.fromSettings) {
$ionicNavBarDelegate.showBackButton(false);
$ionicConfig.views.swipeBackEnabled(false);
} else $ionicNavBarDelegate.showBackButton(true);
storageService.getFeedbackInfo(function(error, info) {
var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null;
@ -99,6 +105,7 @@ angular.module('copayApp.controllers').controller('completeController', function
disableAnimate: false,
historyRoot: true
});
$ionicHistory.goBack(-2);
if ($scope.score == 5) $ionicHistory.goBack(-3);
else $ionicHistory.goBack(-2);
};
});

7
src/js/controllers/feedback/rateApp.js
View File

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess, popupService) {
angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, $window, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess, popupService) {
$scope.score = parseInt($stateParams.score);
var isAndroid = platformInfo.isAndroid;
var isIOS = platformInfo.isIOS;
@ -11,7 +11,10 @@ angular.module('copayApp.controllers').controller('rateAppController', function(
var dataSrc = {
"Email": lodash.values(config.emailFor)[0] || ' ',
"Feedback": ' ',
"Score": $stateParams.score
"Score": $stateParams.score,
"AppVersion": $window.version,
"Platform": ionic.Platform.platform(),
"DeviceVersion": ionic.Platform.version()
};
feedbackService.send(dataSrc, function(err) {
if (err) {

10
src/js/routes.js
View File

@ -743,7 +743,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*
*/
.state('tabs.feedback', {
.state('tabs.feedback', {
url: '/feedback',
views: {
'tab-settings@tabs': {
@ -752,8 +752,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
.state('tabs.feedback.shareApp', {
url: '/shareApp/:score/:skipped',
.state('tabs.shareApp', {
url: '/shareApp/:score/:skipped/:fromSettings',
views: {
'tab-settings@tabs': {
controller: 'completeController',
@ -1113,8 +1113,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
});
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
if($window.StatusBar) {
if(toState.customConfig && toState.customConfig.hideStatusBar) {
if ($window.StatusBar) {
if (toState.customConfig && toState.customConfig.hideStatusBar) {
$window.StatusBar.hide();
} else {
$window.StatusBar.show();

3
src/sass/buttons.scss
View File

@ -19,8 +19,7 @@ $button-secondary-border: transparent;
$button-secondary-active-bg: darken($subtle-gray, 5%);
$button-secondary-active-border: transparent;
%button-standard,
click-to-accept {
%button-standard {
width: 85%;
max-width: 300px;
margin-left: auto;

14
src/sass/views/includes/clickToAccept.scss
View File

@ -1,7 +1,18 @@
click-to-accept {
position: fixed;
bottom: 0;
height: 92px;
width: 100%;
.click-to-accept {
&__button.button.button-primary.button-standard {
height: 100%;
max-width: 9999px;
width: 100%;
}
&__button.disable {
pointer-events: none;
}
@ -18,6 +29,9 @@ click-to-accept {
transform: translateY(2rem);
opacity: 0;
pointer-events: none;
display: flex;
align-items: center;
justify-content: center;
&.enter {
transition: transform 250ms ease, opacity 250ms ease;

2
src/sass/views/includes/txp-details.scss
View File

@ -8,7 +8,7 @@
.list {
background: #f5f5f5;
}
.slide-to-pay {
.add-bottom-for-cta {
bottom: 92px;
}
.head {

14
www/views/confirm.html
View File

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds && !noMatchingWallet}">
<ion-content ng-class="{'add-bottom-for-cta': !insuffientFunds && !noMatchingWallet}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -77,13 +77,13 @@
</div>
</div>
</div>
<click-to-accept
ng-click="approve(statusChangeHandler)"
ng-if="!isCordova && wallets[0]"
click-send-status="sendStatus">
Click to pay
</click-to-accept>
</ion-content>
<click-to-accept
ng-click="approve(statusChangeHandler)"
ng-if="!isCordova && wallets[0]"
click-send-status="sendStatus">
Click to pay
</click-to-accept>
<slide-to-accept
ng-if="isCordova && wallets[0]"
slide-on-confirm="onConfirm()"

9
www/views/feedback/complete.html
View File

@ -1,4 +1,11 @@
<ion-view id="complete" hide-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<a ng-show="!fromSettings" class="close-button" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content scroll="false">
<a class="close-button" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
<div class="complete-layout">
@ -7,7 +14,7 @@
<div class="title" ng-switch-when="true" translate>Thank you!</div>
<div ng-switch-default>
<div class="title" translate>Share BitPay</div>
<img src="img/ico-positive-feedback.svg" class="share-the-love-illustration"/>
<img src="img/ico-positive-feedback.svg" class="share-the-love-illustration"/>
</div>
</div>
<div class="subtitle" ng-show="!skipped && !rated" translate>A member of the team will review your feedback as soon as possible.</div>

14
www/views/modals/txp-details.html
View File

@ -11,7 +11,7 @@
</button>
</ion-header-bar>
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && !hasClick}">
<ion-content ng-init="updateCopayerList()" ng-class="{'add-bottom-for-cta': tx.pendingForUs && canSign}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -150,12 +150,6 @@
</div>
</div>
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus">
Click to accept
</click-to-accept>
<div class="m30t text-center" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
<div class="size-12 padding proposal-deletion-help" ng-show="!tx.isGlidera && isShared" translate>
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
@ -167,6 +161,12 @@
</div>
</ion-content>
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus">
Click to accept
</click-to-accept>
<slide-to-accept
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
slide-on-confirm="onConfirm()"

2
www/views/tab-settings.html
View File

@ -36,7 +36,7 @@
<span translate>Send Feedback</span>
<i class="icon bp-arrow-right"></i>
</a>
<a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.feedback.shareApp({score: 4, skipped: true})">
<a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.shareApp({score: 4, skipped: true, fromSettings: true})">
<i class="icon big-icon-svg">
<img src="img/icon-send-feedback.svg" class="bg"/>
</i>