Permalink
Browse files

feat(BCH): add to exchange tab

  • Loading branch information...
plondon committed Nov 24, 2017
1 parent 001e677 commit 0c44b5bca7951a9a298d5599d5fd872b0eff5de5
View
@@ -10,14 +10,14 @@ blocket-loading(loading="!isWalletInitialized()")
.flex-column.width-20.border-top-blue
span Bitcoin
fiat.em-200(btc="btc.total()")
a.f-10(ng-if="btc.accounts.length" translate="VIEW_ALL_BALANCES" ui-sref="wallet.common.settings.accounts_index")
a.f-10(ng-if="btc.accounts.length > 1" translate="VIEW_ALL_BALANCES" ui-sref="wallet.common.settings.accounts_index")
.flex-column.width-20.border-top-primary
span Ether
fiat.em-200(eth="eth.total()")
.flex-column.width-20.border-top-light-blue
span Bitcoin Cash
fiat.em-200(bch="bch.total()")
a.f-10(ng-if="bch.accounts.length" translate="VIEW_ALL_BALANCES" ui-sref="wallet.common.settings.accounts_index")
a.f-10(ng-if="bch.accounts.length > 1" translate="VIEW_ALL_BALANCES" ui-sref="wallet.common.settings.accounts_index")
activity-feed(data-preflight-tag="ActivityFeed")
.col-md-6.col-sm-12.col-xs-12.col-home
.border.flex-column.pal.chart-control(ng-controller="PriceChartController")
@@ -10,7 +10,7 @@
shift-state-select(next-step="vm.goTo('create')" states="vm.states")
.flex-row(ng-if="vm.onStep('create')")
div.width-60.border-desktop.pv-20.mr-25.no-margin-mobile.no-padding-mobile(ng-controller="ShapeShiftCreateController")
shift-create(on-complete="onComplete(payment, fee, quote, destination)" build-payment="buildPayment(quote, fee, from)" handle-approximate-quote="approximateQuoteHandler(from, to, amount)" handle-quote="quoteHandler(from, to, amount)" handle-rate="rateHandler(rate)" fees="{'btc': 'priority'}" wallets="vm.wallets")
shift-create(on-complete="onComplete(payment, fee, quote, destination)" build-payment="buildPayment(quote, fee, from)" handle-approximate-quote="approximateQuoteHandler(from, to, amount)" handle-quote="quoteHandler(from, to, amount)" handle-rate="rateHandler(rate)" fees="{'btc': 'priority', 'bch': 2}" wallets="vm.wallets")
div.width-40.ml-25.hidden-sm.hidden-xs
p.blue.f-18.em-600(translate="SIMPLE_SEAMLESS_SECURE")
p.f-13.em-300(translate="{{ vm.trades().length ? 'SHIFT.EXCHANGE_NOTICE' : 'SHIFT.WELCOME_INFO' }}")
@@ -16,12 +16,13 @@ function ShapeShiftCheckoutController ($scope, $stateParams, ShapeShift, modals,
this.steps = enumify('state-select', 'create', 'confirm', 'receipt');
this.onStep = (s) => this.steps[s] === this.step;
this.goTo = (s) => this.step = this.steps[s];
this.wallets = Wallet.accounts().concat(Ethereum.defaultAccount);
this.wallets = Wallet.accounts().concat(Ethereum.defaultAccount).concat(MyWallet.wallet.bch.accounts);
if (Wallet.accounts().length < 2) {
this.wallets = this.wallets.map(w => {
if (w.coinCode === 'btc') w.altLabel = 'Bitcoin';
if (w.coinCode === 'eth') w.altLabel = 'Ether';
if (w.coinCode === 'bch') w.altLabel = 'Bitcoin Cash';
return w;
});
}

0 comments on commit 0c44b5b

Please sign in to comment.