routes, renames and flow

This commit is contained in:
Sebastiaan Pasma 2018-07-23 16:58:32 +02:00
commit 3604ee3c3c
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
9 changed files with 160 additions and 105 deletions

View file

@ -105,31 +105,31 @@
</div>
</div>
</ion-content>
<wallet-selector
wallet-selector-title="walletSelectorTitleFrom"
wallet-selector-force-title="walletSelectorTitleForce"
wallet-selector-wallets="walletsWithFunds"
wallet-selector-selected-wallet="wallet"
wallet-selector-show="showWallets"
wallet-selector-on-select="onWalletSelect"
wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
</wallet-selector>
<wallet-selector
wallet-selector-on-hide=""
wallet-selector-title="walletSelectorTitleTo"
wallet-selector-wallets="walletsBch"
wallet-selector-selected-wallet="wallet"
wallet-selector-show="showWalletsBch"
wallet-selector-on-select="onWalletSelect"
wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
</wallet-selector>
<wallet-selector
wallet-selector-on-hide=""
wallet-selector-title="walletSelectorTitleTo"
wallet-selector-wallets="walletsBtc"
wallet-selector-selected-wallet="wallet"
wallet-selector-show="showWalletsBtc"
wallet-selector-on-select="onWalletSelect"
wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
</wallet-selector>
<!--<wallet-selector-->
<!--wallet-selector-title="walletSelectorTitleFrom"-->
<!--wallet-selector-force-title="walletSelectorTitleForce"-->
<!--wallet-selector-wallets="walletsWithFunds"-->
<!--wallet-selector-selected-wallet="wallet"-->
<!--wallet-selector-show="showWallets"-->
<!--wallet-selector-on-select="onWalletSelect"-->
<!--wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">-->
<!--</wallet-selector>-->
<!--<wallet-selector-->
<!--wallet-selector-on-hide=""-->
<!--wallet-selector-title="walletSelectorTitleTo"-->
<!--wallet-selector-wallets="walletsBch"-->
<!--wallet-selector-selected-wallet="wallet"-->
<!--wallet-selector-show="showWalletsBch"-->
<!--wallet-selector-on-select="onWalletSelect"-->
<!--wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">-->
<!--</wallet-selector>-->
<!--<wallet-selector-->
<!--wallet-selector-on-hide=""-->
<!--wallet-selector-title="walletSelectorTitleTo"-->
<!--wallet-selector-wallets="walletsBtc"-->
<!--wallet-selector-selected-wallet="wallet"-->
<!--wallet-selector-show="showWalletsBtc"-->
<!--wallet-selector-on-select="onWalletSelect"-->
<!--wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">-->
<!--</wallet-selector>-->
</ion-view>

View file

@ -1,4 +1,4 @@
<ion-view id="wallet-to-wallet-transfer" show-tabs>
<ion-view id="wallet-origin-destination" show-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Wallet to wallet transfer' | translate}}</ion-nav-title>
</ion-nav-bar>
@ -6,7 +6,7 @@
<div class="header--request" ng-if="isPaymentRequest">
<div class="header--request__title" translate>Paying</div>
<div class="header--request__amount" translate>$37.42 USD</div>
<div class="header--request__amount-alt" translate>0.04580000 BCH</div>
<div class="header--request__amount-alt" translate>0.04580000 BCH {{requestAmount}}</div>
</div>
<div class="wallets-header">
<div class="title">