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

Bitpay Card: uses common widget for selecting wallet. Minor fixes

This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-29 17:01:34 -03:00
parent 77e0d26f82
commit 6e1b7ec620
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
6 changed files with 61 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/views/amount.html
View File

@ -30,10 +30,10 @@
</div>
<div class="item item-text-wrap item-button-right">
<div class="item item-text-wrap item-button-right">
<button class="button black" ng-click="toggleAlternative()" ng-show="showAlternativeAmount">{{alternativeIsoCode}}</button>
<button class="button transform-none" ng-click="toggleAlternative()" ng-show="!showAlternativeAmount">{{unitName}}</button>
<a class="postfix" ng-click="toggleAlternative()" ng-show="showAlternativeAmount">{{alternativeIsoCode}}</a>
<a class="postfix" ng-click="toggleAlternative()" ng-show="!showAlternativeAmount">{{unitName}}</a>
<div class="text-light text-black m15b" ng-class="{'size-28': smallFont, 'size-36': !smallFont}"> <span> {{amount || "0.00" }}</div>
<div class="text-light text-black" ng-class="{'size-16': smallFont, 'size-17': !smallFont}" ng-show="!showAlternativeAmount">

36
public/views/bitpayCard.html
View File

@ -15,7 +15,7 @@
<ion-content ng-controller="bitpayCardController as bitpayCard" ng-init="bitpayCard.init()">
<div class="text-center size-12" ng-show="network == 'testnet'">
<div class="box-notification warning" ng-show="network == 'testnet'">
Sandbox version. Only for testing purpose
</div>
@ -31,7 +31,7 @@
<span ng-show="!bitpayCard.bitpayCardTwoFactorPending">Login to your account</span>
<span ng-show="bitpayCard.bitpayCardTwoFactorPending">2-Step Verification</span>
</h4>
<div class="m10b size-12"
<div class="box-notification error"
ng-show="bitpayCard.error"
ng-click="bitpayCard.error = null">
{{bitpayCard.error}}
@ -63,7 +63,7 @@
</label>
</div>
<input class="button button-block button-positive"
<input class="button button-block"
type="submit"
ng-disabled="!authenticateForm.$valid || bitpayCard.authenticating"
value="Login">
@ -90,7 +90,7 @@
</label>
</div>
<input class="button button-block button-positive"
<input class="button button-block"
type="submit"
ng-disabled="!authenticate2FAForm.$valid || bitpayCard.authenticating"
value="Login">
@ -121,7 +121,7 @@
<option value="all">All Activity</option>
</select>
<div class="m20v size-12 text-center text-warning"
<div class="box-notification error"
ng-show="bitpayCard.error">
{{bitpayCard.error}}
</div>
@ -176,7 +176,7 @@
</div>
<div ng-show="bitpayCard.bitpayCardAuthenticated && !bitpayCard.visaCardActivated && addFunds">
<div class="m10b box-notification size-12 text-warning"
<div class="box-notification error"
ng-show="bitpayCard.error"
ng-click="bitpayCard.error = null">
{{bitpayCard.error}}
@ -199,25 +199,11 @@
ng-model="fiat"
autocomplete="off"
required>
<a class="postfix button black">USD</a>
<a class="postfix">USD</a>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Add From Copay Wallet</span>
<input
type="text"
id="address"
name="address"
ng-disabled="bitpayCard.selectedWalletId"
ng-attr-placeholder="{{'Choose your source wallet'}}"
ng-model="bitpayCard.selectedWalletName" required>
<a
class="postfix size-12 m0 text-gray"
ng-style="{'color': '#293C92'}"
on-tap="openWalletsModal(bitpayCard.allWallets)">
<i class="icon-wallet size-18"></i>
</a>
</label>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div>
<p class="size-12 text-warning" ng-show="bitpayCard.isMultisigWallet">
@ -234,8 +220,8 @@
</button>
</div>
<div class="col">
<button class="button button-block button-positive"
ng-disabled="!bitpayCard.selectedWalletId || !fiat"
<button class="button button-block"
ng-disabled="!fiat"
type="submit">
Send
</button>

2
public/views/buyAmazon.html
View File

@ -50,7 +50,7 @@
max="500"
ng-model="fiat"
autocomplete="off" ignore-mouse-wheel required>
<a class="postfix">USD</a>
</label>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>

62
src/js/controllers/bitpayCard.js
View File

@ -9,6 +9,15 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
StatusBar.backgroundColorByHexString("#293C92");
}
$scope.$on('Wallet/Changed', function(event, w) {
if (lodash.isEmpty(w)) {
$log.debug('No wallet provided');
return;
}
wallet = w;
$log.debug('Wallet changed: ' + w.name);
});
var processTransactions = function(invoices, history) {
for (var i = 0; i < invoices.length; i++) {
var matched = false;
@ -63,7 +72,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
bitpayCardService.isAuthenticated(function(err, bpSession) {
self.loadingSession = false;
if (err) {
self.error = err.data.error || 'Incorrect email or password';
return;
}
@ -79,7 +87,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
bitpayCardService.transactionHistory(dateRange, function(err, history) {
$scope.loadingHistory = false;
if (err) {
self.error = err.error || err;
self.error = 'Error getting transactions';
return;
}
@ -98,60 +106,24 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
$scope.dateRange = 'last30Days';
$scope.network = bitpayCardService.getEnvironment();
self.allWallets = profileService.getWallets({
$scope.wallets = profileService.getWallets({
network: $scope.network,
n: 1,
onlyComplete: true
});
self.update();
if (lodash.isEmpty(self.allWallets)) return;
wallet = $scope.wallets[0];
wallet = self.allWallets[0];
if (wallet.credentials.n > 1)
if (wallet && wallet.credentials.n > 1)
self.isMultisigWallet = true;
$timeout(function() {
self.selectedWalletId = wallet.credentials.walletId;
self.selectedWalletName = wallet.credentials.walletName;
$scope.$apply();
}, 100);
};
$scope.openWalletsModal = function(wallets) {
self.error = null;
$scope.wallets = wallets;
$scope.noColor = true;
$scope.self = self;
$ionicModal.fromTemplateUrl('views/modals/wallets.html', {
scope: $scope,
animation: 'slide-in-up'
}).then(function(modal) {
$scope.walletsModal = modal;
$scope.walletsModal.show();
});
$scope.$on('walletSelected', function(ev, walletId) {
$timeout(function() {
wallet = profileService.getClient(walletId);
self.isMultisigWallet = false;
self.selectedWalletId = walletId;
self.selectedWalletName = wallet.credentials.walletName;
if (wallet.credentials.n > 1)
self.isMultisigWallet = true;
$scope.$apply();
}, 100);
$scope.walletsModal.hide();
});
};
this.sendFunds = function() {
self.error = null;
if (lodash.isEmpty(wallet)) return;
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
$log.info('No signing proposal: No private key');
self.error = bwcError.msg('MISSING_PRIVATE_KEY');
@ -297,8 +269,8 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
self.authenticating = true;
bitpayCardService.authenticate(data, function(err, auth) {
self.authenticating = false;
if (err && !err.data.error.twoFactorPending) {
self.error = 'Authentiation error';
if (err && err.data && err.data.error && !err.data.error.twoFactorPending) {
self.error = err.statusText || err.data.error || 'Authentiation error';
return;
}

30
src/js/services/bitpayCardService.js
View File

@ -19,6 +19,11 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
};
var _setError = function(msg, e) {
$log.error(msg);
return e;
};
var _getUser = function(cb) {
_setCredentials();
storageService.getBitpayCard(credentials.NETWORK, function(err, user) {
@ -53,8 +58,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
bpSession = data.data.data;
return cb(null, bpSession);
}, function(data) {
$log.error('BitPay Get Session: ERROR ' + data.data.error);
return cb(data.data.error);
return cb(_setError('BitPay Card Error: Get Session', data));
});
};
@ -97,8 +101,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
$log.info('BitPay TopUp: SUCCESS');
return cb(null, data.data.data.invoice);
}, function(data) {
$log.error('BitPay TopUp: ERROR ' + data.data.error);
return cb(data.data.error);
return cb(_setError('BitPay Card Error: TopUp', data));
});
};
@ -113,8 +116,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
$log.info('BitPay Get Transaction History: SUCCESS');
return cb(null, data.data.data);
}, function(data) {
$log.error('BitPay Get Transaction History: ERROR ' + data.data);
return cb(data.data);
return cb(_setError('BitPay Card Error: Get Transaction History', data));
});
};
@ -123,8 +125,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
$log.info('BitPay Get Invoice History: SUCCESS');
return cb(null, data.data.data);
}, function(data) {
$log.error('BitPay Get Invoice History: ERROR ' + data.data);
return cb(data.data);
return cb(_setError('BitPay Card Error: Get Invoice History', data));
});
};
@ -133,8 +134,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
$log.info('BitPay Get Invoice: SUCCESS');
return cb(null, data.data.data);
}, function(data) {
$log.error('BitPay Get Invoice: ERROR ' + data.data.error);
return cb(data.data.error);
return cb(_setError('BitPay Card Error: Get Invoice', data));
});
};
@ -147,8 +147,8 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
return cb(null, session);
});
}, function(data) {
$log.error('BitPay Authenticate: ERROR');
if (data.data.error.twoFactorPending) {
if (data && data.data && data.data.error.twoFactorPending) {
$log.error('BitPay Card needs 2FA Authentication');
_getSession(function(err, session) {
if (err) return cb(err);
return cb(null, session);
@ -165,8 +165,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
$log.info('BitPay 2FA: SUCCESS');
return cb(null, data);
}, function(data) {
$log.error('BitPay 2FA: ERROR');
return cb(data);
return cb(_setError('BitPay Card Error: 2FA', data));
});
};
@ -195,8 +194,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
$log.info('BitPay Logout: SUCCESS');
return cb(data);
}, function(data) {
$log.error('BitPay Logout: ERROR ' + data.data.error);
return cb(data.data.error);
return cb(_setError('BitPay Card Error: Logout ', data));
});
});
};

15
src/sass/main.scss
View File

@ -426,6 +426,21 @@ ul.wallet-selection.wallets {
}
}
// POSTFIX
.postfix {
position: absolute;
right: 10px;
background-color: #f8f8f8;
color: #444;
border-radius: 4px;
padding: 2px 10px;
cursor: pointer;
label &{
top: 38px;
padding: 0 5px;
}
}
// QR Code