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

move bch above btc

Browse source
This commit is contained in:
Kadir Sekha 2017-11-14 16:57:59 +09:00
commit e1630095d3
5 changed files with 37 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -424,10 +424,10 @@ angular.module('copayApp.services')
}, function(err, secret) {
if (err) return bwcError.cb(err, gettextCatalog.getString('Error creating wallet'), cb);
if (opts.bchOpts) {
opts.bchOpts.singleAddress = opts.singleAddress;
opts.bchOpts.mnemonic = walletClient.credentials.mnemonic;
root.createWallet(opts.bchOpts, null);
if (opts.btcOpts) {
opts.btcOpts.singleAddress = opts.singleAddress;
opts.btcOpts.mnemonic = walletClient.credentials.mnemonic;
root.createWallet(opts.btcOpts, null);
}
return cb(null, walletClient, secret);
@ -729,16 +729,16 @@ angular.module('copayApp.services')
opts.m = 1;
opts.n = 1;
opts.networkName = 'livenet';
opts.coin = 'btc';
opts.bwsurl = defaults.bws.url;
opts.coin = 'bch';
opts.bwsurl = defaults.bwscash.url;
var bchOpts = {};
bchOpts.m = 1;
bchOpts.n = 1;
bchOpts.networkName = 'livenet';
bchOpts.coin = 'bch';
bchOpts.bwsurl = defaults.bwscash.url;
opts.bchOpts = bchOpts;
var btcOpts = {};
btcOpts.m = 1;
btcOpts.n = 1;
btcOpts.networkName = 'livenet';
btcOpts.coin = 'btc';
btcOpts.bwsurl = defaults.bws.url;
opts.btcOpts = btcOpts;
root.createWallet(opts, cb);
};

2
www/views/includes/cash.html
View file

@ -3,7 +3,7 @@
Coin
</div>
<select ng-model="formData.coin" ng-change="coinChanged()">
<option value="btc">{{bitcoinAlias}}</option>
<option value="bch">{{bitcoinCashAlias}}</option>
<option value="btc">{{bitcoinAlias}}</option>
</select>
</label>

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

@ -6,37 +6,6 @@
<div class="header" ng-show="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
<div class="subheader" ng-if="walletsBtc[0] && walletsBch[0]" translate>
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
<span translate>Bitcoin Wallets</span>
</div>
<a
ng-repeat="wallet in walletsBtc track by $index"
class="item item-icon-left item-big-icon-left item-icon-right wallet"
ng-click="selectWallet(wallet)"
>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<div class="wallet-inner">
<div class="wallet-details">
<div class="wallet-name">
{{wallet.name}}
</div>
<p class="wallet-balance">
<span ng-if="!wallet.isComplete()" class="assertive" translate>
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span>
</span>
&nbsp;
</p>
</div>
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === wallet">
</div>
</a>
<div class="subheader" ng-if="walletsBch[0] && walletsBtc[0]">
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22">
<span translate>Bitcoin Cash Wallets</span>
@ -67,4 +36,35 @@
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === wallet">
</div>
</a>
<div class="subheader" ng-if="walletsBtc[0] && walletsBch[0]" translate>
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
<span translate>Bitcoin Wallets</span>
</div>
<a
ng-repeat="wallet in walletsBtc track by $index"
class="item item-icon-left item-big-icon-left item-icon-right wallet"
ng-click="selectWallet(wallet)"
>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<div class="wallet-inner">
<div class="wallet-details">
<div class="wallet-name">
{{wallet.name}}
</div>
<p class="wallet-balance">
<span ng-if="!wallet.isComplete()" class="assertive" translate>
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span>
</span>
&nbsp;
</p>
</div>
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === wallet">
</div>
</a>
</action-sheet>

45
www/views/tab-home.html
View file

@ -64,35 +64,7 @@
</a>
</div>
<div class="list card" ng-if="!walletsBtc[0] && !walletsBch[0]">
<div class="item item-icon-right item-heading">
<span translate>Wallets</span>
</div>
<a ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
<i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" class="bg wallet icon-create-wallet"/>
</i>
<span translate>Create bitcoin wallet</span>
<i class="icon bp-arrow-right"></i>
</a>
</div>
<div class="list card" ng-if="walletsBtc[0]">
<div class="item item-icon-right item-heading">
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
<span translate>Bitcoin Wallets</span>
<a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div>
<div>
<a ng-repeat="wallet in walletsBtc track by $index"
class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
ng-click="openWallet(wallet)">
<span ng-include="'views/includes/walletList.html'"></span>
</a>
</div>
</div>
<div class="list card" ng-if="walletsBch[0]">
<div class="list card">
<div class="item item-icon-right item-heading">
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22">
<span translate>Bitcoin Cash Wallets</span>
@ -107,6 +79,21 @@
</div>
</div>
<div class="list card">
<div class="item item-icon-right item-heading">
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
<span translate>Bitcoin Wallets</span>
<a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div>
<div>
<a ng-repeat="wallet in walletsBtc track by $index"
class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
ng-click="openWallet(wallet)">
<span ng-include="'views/includes/walletList.html'"></span>
</a>
</div>
</div>
<div class="ng-hide list card" ng-show="walletsBtc[0] && bitpayCardItems.length>0" ng-include="'views/includes/bitpayCardsCard.html'"></div>
<div class="ng-hide list card" ng-show="walletsBtc[0] && buyAndSellItems.length>0" ng-include="'views/includes/buyAndSellCard.html'"></div>
<div class="ng-hide list card" ng-show="homeIntegrations.length>0" ng-include="'views/includes/homeIntegrations.html'"></div>

16
www/views/tab-settings.html
View file

@ -89,14 +89,6 @@
<i class="icon bp-arrow-right"></i>
</a>
<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Wallets' | translate}}</div>
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': wallet.id})"
ng-repeat="wallet in walletsBtc track by $index">
<span ng-include="'views/includes/walletListSettings.html'"></span>
</a>
<div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash Wallets' | translate}}</div>
<a class="item item-icon-left item-icon-right" href
@ -105,6 +97,14 @@
<span ng-include="'views/includes/walletListSettings.html'"></span>
</a>
<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Wallets' | translate}}</div>
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': wallet.id})"
ng-repeat="wallet in walletsBtc track by $index">
<span ng-include="'views/includes/walletListSettings.html'"></span>
</a>
<div class="item item-divider" ng-show="bitpayAccounts || buyAndSellServices[0]">{{'Integrations' | translate}}</div>
<a class=" item item-icon-left item-icon-right"