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

Merge remote-tracking branch 'origin/wallet/sprint/17' into wallet/sprint/17

Browse source 
# Conflicts:
#	src/js/controllers/tab-scan.js
This commit is contained in:
Sebastiaan Pasma 2018-05-28 13:48:26 +02:00
commit 4c4c213786
20 changed files with 196 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app-template/bitcoincom/appConfig.json
View file

@ -24,8 +24,9 @@
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
"version": "4.10.1",
"androidVersion": "410100",
"version": "4.11.0",
"fullVersion": "4.11-rc1",
"androidVersion": "411000",
"_extraCSS": "",
"_enabledExtensions": {
"coinbase": false,

1
app-template/package-template.json
View file

@ -3,6 +3,7 @@
"description": "*DESCRIPTION*",
"author": "BitPay",
"version": "*VERSION*",
"fullVersion": "*FULLVERSION*",
"keywords": [
"bitcoin",
"wallet",

2
src/js/controllers/amount.js
View file

@ -322,7 +322,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.');
checkFontSize();
$scope.processAmount();
navigator.vibrate(50);
};
$scope.pushOperator = function(operator) {
@ -358,7 +357,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.amountModel.amount = $scope.alternativeAmount = $scope.globalResult = '';
$scope.allowSend = false;
checkFontSize();
navigator.vibrate(50);
};

2
src/js/controllers/confirm.js
View file

@ -205,6 +205,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}
});
$scope.displayBalanceAsFiat = walletConfig.settings.priceDisplay === 'fiat';
});

2
src/js/controllers/preferencesAbout.js
View file

@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesAbout',
function($scope, $window, appConfigService, gettextCatalog, externalLinkService, $ionicNavBarDelegate) {
$scope.title = gettextCatalog.getString('About') + ' ' + appConfigService.nameCase;
$scope.version = $window.version;
$scope.version = $window.fullVersion;
$scope.commitHash = $window.commitHash;
$scope.openExternalLink = function() {

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

@ -13,6 +13,8 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
var currentAddressSocket = {};
var paymentSubscriptionObj = { op:"addr_sub" }
$scope.displayBalanceAsFiat = true;
$scope.requestSpecificAmount = function() {
$state.go('tabs.paymentRequest.amount', {
id: $scope.wallet.credentials.walletId,
@ -212,6 +214,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
if ($scope.wallet && walletId == $scope.wallet.id && type == 'NewIncomingTx') $scope.setAddress(true);
})
];
configService.whenAvailable(function(config) {
$scope.displayBalanceAsFiat = config.wallet.settings.priceDisplay === 'fiat';
});
});
$scope.$on("$ionicView.enter", function(event, data) {

3
src/js/controllers/tab-scan.js
View file

@ -108,6 +108,9 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
function handleSuccessfulScan(contents){
$log.debug('Scan returned: "' + contents + '"');
scannerService.pausePreview();
// Sometimes (testing in Chrome, when reading QR Code) data is an object
// that has a string data.result.
contents = contents.result || contents;
incomingData.redir(contents);
}

9
src/js/controllers/tab-send.js
View file

@ -72,15 +72,22 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
return item.network == 'livenet';
});
}
var walletList = [];
lodash.each(walletsToTransfer, function(v) {
var displayBalanceAsFiat =
v.status.alternativeBalanceAvailable &&
config.wallet.settings.priceDisplay === 'fiat';
walletList.push({
color: v.color,
name: v.name,
recipientType: 'wallet',
coin: v.coin,
network: v.network,
balanceString: v.cachedBalance,
balanceString: displayBalanceAsFiat ?
v.status.totalBalanceAlternative + ' ' + v.status.alternativeIsoCode :
v.cachedBalance,
getAddress: function(cb) {
walletService.getAddress(v, false, cb);
},

3
src/js/directives/walletSelector.js
View file

@ -11,7 +11,8 @@ angular.module('copayApp.directives')
show: '=walletSelectorShow',
wallets: '=walletSelectorWallets',
selectedWallet: '=walletSelectorSelectedWallet',
onSelect: '=walletSelectorOnSelect'
onSelect: '=walletSelectorOnSelect',
displayBalanceAsFiat : '=walletSelectorDisplayBalanceAsFiat'
},
link: function(scope, element, attrs) {
scope.hide = function() {

16
src/js/services/bitcoincomService.js
View file

@ -44,6 +44,20 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http,
href: 'http://tools.bitcoin.com'
};
var priceChartItem = {
name: 'pricechart',
title: 'Bitcoin Price Charts',
icon: 'icon-chart',
sref: 'tabs.pricechart',
};
var faucetItem = {
name: 'faucet',
title: 'Free Bitcoin Cash',
icon: 'icon-faucet',
href: 'https://free.bitcoin.com/'
};
var _getBitPay = function(endpoint) {
return {
method: 'GET',
@ -74,6 +88,8 @@ angular.module('copayApp.services').factory('bitcoincomService', function($http,
nextStepsService.register(newsItem);
nextStepsService.register(poolItem);
nextStepsService.register(toolsItem);
nextStepsService.register(priceChartItem);
nextStepsService.register(faucetItem);
};
register();

2
src/js/services/incomingData.js
View file

@ -11,7 +11,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
root.redir = function(data, shapeshiftData) {
var originalAddress = null;
var noPrefixInAddress = 0;
if (data.toLowerCase().indexOf('bitcoin') < 0) {
noPrefixInAddress = 1;
}

12
src/js/services/pricechartService.js
View file

@ -3,17 +3,5 @@ angular.module('copayApp.services').factory('pricechartService', function($http,
var root = {};
var credentials = {};
var nextStepItem = {
name: 'pricechart',
title: 'Bitcoin Price Charts',
icon: 'icon-chart',
sref: 'tabs.pricechart',
};
var register = function() {
nextStepsService.register(nextStepItem);
};
register();
return root;
});

11
src/js/services/profileService.js
View file

@ -932,8 +932,17 @@ angular.module('copayApp.services')
x.txid = x.data ? x.data.txid : null;
x.types = [x.type];
if (x.data && x.data.amount)
if (x.data && x.data.amount) {
// Default to showing amount in crypto because we have that now
x.amountStr = txFormatService.formatAmountStr(x.wallet.coin, x.data.amount);
configService.whenAvailable(function(config) {
if (config.wallet.settings.priceDisplay === "fiat") {
txFormatService.formatAlternativeStr(x.wallet.coin, x.data.amount, function(formattedString) {
x.amountStr = formattedString;
});
}
});
}
x.action = function() {
// TODO?

7
src/sass/icons.scss
View file

@ -69,7 +69,7 @@
}
&.icon-buy-bitcoin2 {
background-color: #494949;
border: 1px solid #faba13;
}
&.icon-reddit-white {
@ -83,6 +83,11 @@
background-color: #1da1f2;
background-size: 60%;
}
&.icon-faucet {
background-image: url('../img/icon-faucet.svg');
background-size: 70%;
}
}
}

1
util/buildAppConfig.js
View file

@ -26,6 +26,7 @@ console.log('v' + pkg.version + ' #' + commitHash + ' App:' + appConfig.name);
var content = 'window.version="' + pkg.version + '";';
content = content + '\nwindow.commitHash="' + commitHash + '";';
content = content + '\nwindow.fullVersion="' + pkg.fullVersion + '";';
content = content + '\nwindow.appConfig=' + JSON.stringify(appConfig) + ';';
fs.writeFileSync("./src/js/appConfig.js", content);

5
www/css/main.css
View file

@ -10025,7 +10025,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
.big-icon-svg.theme-circle > .bg.icon-shapeshift {
background-color: #263e5c; }
.big-icon-svg.theme-circle > .bg.icon-buy-bitcoin2 {
background-color: #494949; }
border: 1px solid #faba13; }
.big-icon-svg.theme-circle > .bg.icon-reddit-white {
background-image: url("../img/icon-reddit-white.svg");
background-color: #ff4500;
@ -10034,6 +10034,9 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
background-image: url("../img/icon-twitter-white.svg");
background-color: #1da1f2;
background-size: 60%; }
.big-icon-svg.theme-circle > .bg.icon-faucet {
background-image: url("../img/icon-faucet.svg");
background-size: 70%; }
.big-icon-svg.theme-circle-services > .bg {
border: 1px solid #191919; }
.big-icon-svg.theme-circle-community > .bg {

120
www/img/icon-faucet.svg Normal file
View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 400 400" style="enable-background:new 0 0 400 400;" xml:space="preserve">
<style type="text/css">
.st0{display:none;}
.st1{display:inline;fill:#084287;}
.st2{display:inline;}
.st3{fill:#8B8B8B;}
.st4{fill:none;}
.st5{fill:#F9C233;}
.st6{fill:#FFFFFF;}
</style>
<g id="Calque_2" class="st0">
<rect y="0" class="st1" width="400" height="400"/>
</g>
<g id="Grey" class="st0">
<g class="st2">
<g>
<path class="st3" d="M153.1,173.5c-5.2-5.6-13.3-8.2-21.1-5.9c-11,3.2-17.2,15.3-13.9,26.3c0.4,1.3,1,3.1,1.6,4.1l0,0
c0,0,7.3,20.7,48.5,30.3v-71.1c-0.1,0-0.2,0.1-0.4,0.1C159.8,159.6,154.4,166,153.1,173.5z"/>
<path class="st3" d="M84.7,120.7c-0.3-0.3-0.6-0.5-0.9-0.4c-0.1,0-0.3,0.1-0.6,0.2c-0.3,0.1-0.6,0.2-0.9,0.3
c-0.3,0.1-0.7,0.3-1,0.4c-0.3,0.1-0.6,0.3-0.9,0.4c-0.3,0.1-0.4,0.3-0.3,0.6c0,0.1,0.1,0.1,0.1,0.3l1,1.3l-3.4,30.9
c0,0,0,0.1,0,0.1c0.1,0.2,0.2,0.2,0.5,0.1c0.5-0.1,0.9-0.3,1.3-0.4c0.4-0.1,0.7-0.3,1-0.4c0.2-0.1,0.3-0.3,0.4-0.5l0.8-11.5
l10.9-3.4l7.2,9.4c0.2,0.2,0.4,0.3,0.7,0.2c0.1,0,0.3-0.1,0.6-0.2c0.3-0.1,0.6-0.2,1-0.3c0.4-0.1,0.7-0.3,1.1-0.4
c0.4-0.2,0.7-0.3,1-0.4c0.3-0.1,0.4-0.4,0.4-0.6c0,0-0.1-0.1-0.2-0.3L84.7,120.7z M82.1,140.5l1-13.8l8.4,11L82.1,140.5z"/>
<path class="st3" d="M182,68.3L71.2,101c-16,4.7-25.1,21.5-20.4,37.4l48.4,163.9c4.7,16,21.5,25.1,37.4,20.4l32.7-9.6
c-0.6-2.2-1-4.5-1.2-6.8l-33.5,9.9c-12.3,3.6-25.3-3.4-28.9-15.7L57.4,136.5c-3.6-12.3,3.4-25.3,15.7-28.9L184,74.9
c12.3-3.6,25.3,3.4,28.9,15.7l1.9,6.3h7.2l-2.4-8.2C214.7,72.7,198,63.6,182,68.3z"/>
</g>
<g>
<path class="st3" d="M284.2,215.2V215c6.2-3.2,10.1-9.4,10.1-17.3c0-8.6-4.7-15.3-11-18.1c-4-1.8-8.3-2.4-14.1-2.4h-3v-6.6
c0-1.3-1-2.3-2.3-2.3h-6.7c-1.3,0-2.3,1-2.3,2.3v6.6h-7.5v-6.6c0-1.3-1-2.3-2.3-2.3h-6.7c-1.3,0-2.3,1-2.3,2.3v6.6H229
c-0.8,0-1.4,0.7-1.4,1.5v6.4c0,0.8,0.6,1.5,1.4,1.5h6.9v61.7h-6.5c-1,0-1.9,0.8-1.9,1.9l0,5.6c0,1,0.8,1.9,1.9,1.9h6.5v6.5
c0,1.3,1,2.3,2.3,2.3h6.7c1.3,0,2.3-1.1,2.3-2.3v-6.5h7.5v6.5c0,1.3,1.1,2.3,2.3,2.3h6.7c1.3,0,2.3-1.1,2.3-2.3v-6.5h4.5
c4.4,0,8.2-0.2,12.1-1.5c8.3-2.8,14.8-10.8,14.8-21.4C297.5,225.6,292.8,217.7,284.2,215.2 M269.2,186.5c3.4,0,6,0.5,8.3,1.6
c3.4,1.9,5.2,5.9,5.2,10.6c0,7.3-4.5,12.3-11.8,12.3h-23.6v-24.5H269.2z M278.3,247.1c-2.2,0.9-4.9,1.1-7.2,1.1l-23.8,0v-27.9
l24.8,0c8.4,0,13.9,5.5,13.9,13.8C285.9,240.1,282.9,245.1,278.3,247.1"/>
<g>
<path class="st4" d="M320.3,108.6H204.7c-12.8,0-23.3,10.4-23.3,23.3v170.9c0,12.8,10.4,23.2,23.3,23.2h115.6
c12.8,0,23.3-10.4,23.3-23.2V131.9C343.6,119,333.1,108.6,320.3,108.6z M320.3,116.6c2.8,0,5.4,0.7,7.6,2l-5.4,7.6l-6.9-9.6
H320.3z M308.5,116.6l10.4,14.5l-16.7,23.3l-16.7-23.3l10.4-14.5H308.5z M288.9,116.6l-6.9,9.6l-6.9-9.6H288.9z M248.3,116.6
l-6.9,9.6l-6.9-9.6H248.3z M227.5,116.6l10.4,14.5l-16.7,23.3l-16.7-23.3l10.4-14.5H227.5z M204.7,116.6h3.1l-6.9,9.6l-4.9-6.8
C198.4,117.6,201.5,116.6,204.7,116.6z M189.5,131.9c0-3,0.9-5.9,2.4-8.3l5.4,7.6l-7.9,11V131.9z M189.5,151.9l11.4-15.9
l16.7,23.3l-16.7,23.3l-11.4-15.9V151.9z M189.5,176.6l7.9,11l-7.9,11V176.6z M189.5,233.1l7.9,11l-7.9,11V233.1z M189.5,264.9
l11.4-15.9l16.7,23.3l-16.7,23.3l-11.4-15.9V264.9z M189.5,302.8v-13.2l7.9,11l-6.4,8.9C190,307.4,189.5,305.2,189.5,302.8z
M204.7,318c-3.9,0-7.4-1.5-10.1-3.8l6.3-8.7l9,12.6H204.7z M216.9,318l-12.5-17.5l16.7-23.3l16.7,23.3L225.4,318H216.9z
M232.4,318l9-12.6l9,12.6H232.4z M272.9,318l9-12.6l9,12.6H272.9z M298,318l-12.5-17.5l16.7-23.3l16.7,23.3L306.4,318H298z
M320.3,318h-6.8l9-12.6l6.9,9.6C326.8,316.9,323.7,318,320.3,318z M335.6,302.8c0,2.9-0.8,5.6-2.2,8l-7.3-10.2l9.6-13.3V302.8z
M335.6,277.4l-13.1,18.2l-16.7-23.3l16.7-23.3l13.1,18.2V277.4z M335.6,257.4l-9.6-13.3l9.6-13.3V257.4z M335.6,221l-7.6,10.5
c-4,18.4-15.5,34-31.1,43.3l-15,20.8l-8.8-12.2c-2.1,0.3-4.3,0.6-6.5,0.7l11.8,16.4L265.9,318h-8.4l-12.5-17.5l11.8-16.5
c-2.2-0.2-4.3-0.5-6.4-0.9l-8.9,12.5l-16.4-22.8c-13.1-8.8-22.9-22.2-27.2-37.8l-8.4-11.7v-14.9l10.1-14
c4.2-11.6,11.6-21.7,21-29.3l0.6-0.8l0.2,0.2c1.5-1.2,3.1-2.3,4.7-3.3l-1.3-1.8l16.7-23.3l10.8,15.1c2.2-0.3,4.3-0.6,6.6-0.7
l-13.8-19.3l10.4-14.5H268l10.4,14.5l-13.8,19.2c2.2,0.1,4.5,0.2,6.7,0.5l10.7-14.9l16.7,23.3l-0.8,1.1
c13.8,8.6,24.3,22.2,28.9,38.2l8.7,12.1L335.6,221L335.6,221z M335.6,200.9l-9.6-13.3l9.6-13.3V200.9z M335.6,164.5l-13.1,18.2
l-16.7-23.3l16.7-23.3l13.1,18.2V164.5z M335.6,144.5l-9.6-13.3l6.3-8.7c2.1,2.6,3.3,5.9,3.3,9.4V144.5z"/>
<path class="st3" d="M320.3,101.7H204.7c-16.6,0-30.1,13.5-30.1,30.1v170.9c0,16.6,13.5,30.1,30.1,30.1h115.6
c16.6,0,30.1-13.5,30.1-30.1V131.9C350.4,115.2,336.9,101.7,320.3,101.7z M343.6,302.8c0,12.8-10.4,23.2-23.3,23.2H204.7
c-12.8,0-23.3-10.4-23.3-23.2V131.9c0-12.8,10.4-23.3,23.3-23.3h115.6c12.8,0,23.3,10.4,23.3,23.3L343.6,302.8L343.6,302.8z"/>
<polygon class="st3" points="305.7,159.4 322.5,182.7 335.6,164.5 335.6,154.3 322.5,136.1 "/>
<path class="st3" d="M241.4,295.7l8.9-12.5c-9.2-1.7-17.8-5.3-25.3-10.3L241.4,295.7z"/>
<polygon class="st3" points="272.9,318 291,318 281.9,305.5 "/>
<path class="st3" d="M281.9,295.7l15-20.8c-7.1,4.3-15.2,7.3-23.7,8.6L281.9,295.7z"/>
<path class="st3" d="M329.5,217.3c0,4.9-0.5,9.6-1.5,14.2l7.6-10.5v-10.2l-8.7-12.1C328.6,204.6,329.5,210.8,329.5,217.3z"/>
<polygon class="st3" points="335.6,200.9 335.6,174.3 326,187.6 "/>
<polygon class="st3" points="232.4,318 250.4,318 241.4,305.5 "/>
<path class="st3" d="M256.8,284.1l-11.8,16.5l12.5,17.5h8.4l12.5-17.5l-11.8-16.4c-1.4,0.1-2.8,0.1-4.1,0.1
C260.6,284.3,258.7,284.2,256.8,284.1z"/>
<polygon class="st3" points="288.9,116.6 275,116.6 281.9,126.2 "/>
<path class="st3" d="M333.3,310.7c1.4-2.3,2.2-5,2.2-8v-15.5l-9.6,13.3L333.3,310.7z"/>
<path class="st3" d="M264.6,150.4l13.8-19.2L268,116.6h-12.6l-10.4,14.5l13.8,19.3c1.2-0.1,2.5-0.1,3.7-0.1
C263.2,150.3,263.9,150.4,264.6,150.4z"/>
<path class="st3" d="M189.5,289.6v13.2c0,2.4,0.5,4.6,1.5,6.6l6.4-8.9L189.5,289.6z"/>
<path class="st3" d="M298.7,159.4l-16.7-23.3l-10.7,14.9c9.7,1.3,18.7,4.6,26.6,9.5L298.7,159.4z"/>
<path class="st3" d="M207.8,116.6h-3.1c-3.3,0-6.3,1-8.8,2.8l4.9,6.8L207.8,116.6z"/>
<path class="st3" d="M326,131.1l9.6,13.3v-12.6c0-3.6-1.2-6.8-3.3-9.4L326,131.1z"/>
<polygon class="st3" points="302.2,154.5 319,131.1 308.5,116.6 295.9,116.6 285.5,131.1 "/>
<polygon class="st3" points="221.1,154.5 237.9,131.1 227.5,116.6 214.8,116.6 204.4,131.1 "/>
<polygon class="st3" points="335.6,257.4 335.6,230.8 326,244.1 "/>
<polygon class="st3" points="305.7,272.3 322.5,295.7 335.6,277.4 335.6,267.2 322.5,249 "/>
<polygon class="st3" points="217.6,159.4 200.9,136.1 189.5,151.9 189.5,166.8 200.9,182.7 "/>
<path class="st3" d="M313.5,318h6.8c3.4,0,6.5-1.1,9-3l-6.9-9.6L313.5,318z"/>
<path class="st3" d="M191.9,123.6c-1.5,2.4-2.4,5.2-2.4,8.3v10.3l7.9-11L191.9,123.6z"/>
<path class="st3" d="M194.6,314.2c2.7,2.4,6.2,3.8,10.1,3.8h5.2l-9-12.6L194.6,314.2z"/>
<path class="st3" d="M327.9,118.7c-2.2-1.3-4.8-2-7.6-2h-4.7l6.9,9.6L327.9,118.7z"/>
<path class="st3" d="M241.4,136.1l-16.7,23.3l1.3,1.8c7.8-5.1,16.7-8.6,26.3-10.1L241.4,136.1z"/>
<path class="st3" d="M199.6,194.4l-10.1,14v14.9l8.4,11.7c-1.5-5.6-2.4-11.6-2.4-17.7C195.5,209.3,196.9,201.5,199.6,194.4z"/>
<polygon class="st3" points="248.3,116.6 234.5,116.6 241.4,126.2 "/>
<polygon class="st3" points="189.5,176.6 189.5,198.6 197.4,187.6 "/>
<polygon class="st3" points="217.6,272.3 200.9,249 189.5,264.9 189.5,279.8 200.9,295.7 "/>
<polygon class="st3" points="221.1,277.2 204.4,300.6 216.9,318 225.4,318 237.9,300.6 "/>
<polygon class="st3" points="189.5,233.1 189.5,255.1 197.4,244.1 "/>
<polygon class="st3" points="302.2,277.2 285.5,300.6 298,318 306.4,318 319,300.6 "/>
</g>
</g>
</g>
</g>
<g>
<path class="st5" d="M290.5,351.2c0,15.1,12.5,28,28,28c15.1,0,28-12.5,28-28c-0.8-6.1-13.6-28.8-28-50.3
C304.5,322.1,291.3,344.8,290.5,351.2z"/>
<path class="st5" d="M238,79.5c17.5,0,31.5-13.1,31.5-29.3s-14-29.3-31.5-29.3H70.3c-17.5,0-31.8,13.1-31.8,29.3s14,29.3,31.5,29.3
h61.2V97c-15,0.6-27.8,11.9-30.3,26.5H45.7c-3.4,0-6.2,2.8-6.2,6.2v80.9c0,3.4,2.8,6.2,6.2,6.2h181.1c0,0,0.6,0,1.6,0
c9.4,0,41.2,2.5,41.2,33.1v36.8c0,3.4,2.8,6.2,6.2,6.2H355c3.4,0,6.2-2.8,6.2-6.2v-36.2c0-0.6,0-0.6,0-0.6v-0.6v-6.2
c0.6-6.2,1.9-59.6-29.7-92.7c-17.5-17.5-41.2-26.5-70.6-26.5h-51.5c-2.8-15-15.9-26.5-31.5-26.5h-0.9V79.8H238V79.5z M256.7,50.1
c0,9.1-8.4,16.5-19,16.5h-60.6V43.9c0-3.7-0.9-7.2-2.5-10.3H238C248.3,33.6,256.7,41.1,256.7,50.1z M70.3,66.7
c-10.3,0-19-7.5-19-16.5s8.4-16.5,19-16.5h63.4c-1.6,3.1-2.5,6.6-2.5,10.3v22.8C131.2,66.7,70.3,66.7,70.3,66.7z M282,280.2v-24
h66.5v24H282z M197.4,128.5c0,0.6,0,0.6,0,0.6c0,1.9,0.6,3.4,1.9,4.7c1.6,1.6,2.8,1.9,4.7,1.9H262c25.6,0,46.2,7.5,60.6,23.1
c27.8,29.7,26.5,78,25.9,83.7v0.6v0.6H282c-3.4-28.7-29.3-39.6-53.4-39.6c-0.9,0-1.9,0-1.9,0H51.9v-68.4h54.9
c3.4,0,6.2-2.8,6.2-6.2c0,0,0-0.6,0-0.9c0-10.3,9.1-19.4,19.4-19.4H178C189,109.1,197.4,118.2,197.4,128.5z M144,97V43.9
c0-5.6,4.7-10.3,10.3-10.3s10.3,4.7,10.3,10.3V97H144z"/>
<path id="Fill-95_1_" class="st6" d="M327.6,358.8c-0.8,0.4-1.9,0.8-2.6,1.1l-9.1,1.9l-2.3-10.6l9.5-2.3c3-0.8,5.7,0.8,6.4,4.2
C329.9,355.7,329.1,357.6,327.6,358.8z M310.6,338.7l8.3-1.9c1.1-0.4,2.3-0.4,3.4,0c1.5,0.4,2.6,1.9,3,3.4c0.8,2.6-0.8,4.9-3.4,5.7
l-9.1,1.9L310.6,338.7z M327.2,346.3L327.2,346.3c1.9-1.9,3-4.5,2.3-7.6c-0.8-3.4-3-5.3-5.7-5.7c-1.5-0.4-3.4,0-5.7,0.4l-1.1,0.4
l-0.8-2.6c0-0.4-0.8-0.8-1.1-0.8l-2.6,0.8c-0.4,0-0.8,0.8-0.8,1.1l0.8,2.6l-3,0.8l-0.8-2.6c0-0.4-0.8-0.8-1.1-0.8l-2.6,0.8
c-0.4,0-0.8,0.8-0.8,1.1l0.8,2.6l-2.6,0.8c-0.4,0-0.4,0.4-0.4,0.8l0.4,2.3c0,0.4,0.4,0.4,0.8,0.4l2.6-0.8l5.3,23.1l-2.3,0.4
c-0.4,0-0.8,0.4-0.4,0.8l0.4,2.3c0,0.4,0.4,0.8,0.8,0.4l2.3-0.4l0.4,2.3c0,0.4,0.8,0.8,1.1,0.8l2.6-0.8c0.4,0,0.8-0.8,0.8-1.1
l-0.4-2.3l3-0.8l0.4,2.3c0,0.4,0.8,0.8,1.1,0.8l2.6-0.8c0.4,0,0.8-0.8,0.8-1.1l-0.4-2.3l1.5-0.4c1.5-0.4,3-0.8,4.5-1.5
c3-1.9,4.5-5.3,3.8-9.5C332.9,349.3,330.6,346.7,327.2,346.3L327.2,346.3z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

3
www/views/confirm.html
View file

@ -131,7 +131,8 @@
wallet-selector-wallets="wallets"
wallet-selector-selected-wallet="wallet"
wallet-selector-show="walletSelector"
wallet-selector-on-select="onWalletSelect">
wallet-selector-on-select="onWalletSelect"
wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
</wallet-selector>
</ion-view>

9
www/views/includes/walletSelector.html
View file

@ -2,7 +2,8 @@
<img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
<span ng-repeat="wallet in wallets track by $index"
ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)"></span>
ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)">
</span>
<div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
@ -26,7 +27,8 @@
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}}</span>
<span ng-if="!displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span>
</span>
@ -57,7 +59,8 @@
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}}</span>
<span ng-if="!displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span>
</span>

6
www/views/tab-receive.html
View file

@ -94,7 +94,8 @@
{{wallet.name || wallet.id}}
</span>
<p>
<span ng-if="!wallet.balanceHidden"> {{wallet.status.totalBalanceStr}} </span>
<span ng-if="displayBalanceAsFiat && !wallet.balanceHidden" translate> {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} </span>
<span ng-if="!displayBalanceAsFiat && !wallet.balanceHidden"> {{wallet.status.totalBalanceStr}} </span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
<span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
@ -113,6 +114,7 @@
wallet-selector-wallets="wallets"
wallet-selector-selected-wallet="wallet"
wallet-selector-show="showWallets"
wallet-selector-on-select="onWalletSelect">
wallet-selector-on-select="onWalletSelect"
wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
</wallet-selector>
</ion-view>