Merge remote-tracking branch 'origin/wallet/task/514' into wallet/task/427
This commit is contained in:
Sebastiaan Pasma
commit
01a7024b52
61 changed files with 3583 additions and 924 deletions
|
|
@ -1,82 +1,95 @@
|
|||
<ion-view id="view-amount" hide-tabs>
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-title>
|
||||
{{'Enter amount' | translate}}
|
||||
{{'Enter Amount' | translate}}
|
||||
</ion-nav-title>
|
||||
<ion-nav-back-button ng-click="goBack()"></ion-nav-back-button>
|
||||
<ion-nav-back-button ng-click="vm.goBack()"></ion-nav-back-button>
|
||||
</ion-nav-bar>
|
||||
<ion-content scroll="false" style="background: #fff;">
|
||||
|
||||
<ion-content scroll="false">
|
||||
<div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
|
||||
<div style="order: 0; position: relative;">
|
||||
|
||||
<div class="item send-amount">
|
||||
<div ng-if="shapeshiftOrderId">
|
||||
Minimum amount: {{minShapeshiftAmount}} <br/>
|
||||
Maximum amount: {{maxShapeshiftAmount}} <br/>
|
||||
<div class="card item send-amount">
|
||||
<div class="send-amount-header-footer">
|
||||
<span class="send-amount-header-footer__min" ng-if="vm.minAmount">Min: {{vm.minAmount}}</span> <span class="send-amount-header-footer__max" ng-if="vm.maxAmount">Max: {{vm.maxAmount}}</span>
|
||||
</div>
|
||||
<div class="send-amount-tool">
|
||||
<div class="send-amount-tool-input amount">
|
||||
<div class="primary-amount"
|
||||
ng-class="{long: amountModel.amount.length > 5, 'very-long': amountModel.amount.length > 10}">
|
||||
<span class="primary-amount-display text-selectable">{{ amountModel.amount || 0 }}</span><span class="unit">{{unit}}</span>
|
||||
ng-class="{long: vm.amount.length > 5, 'very-long': vm.amount.length > 10}">
|
||||
<span class="primary-amount-display text-selectable">{{vm.amount || '0'}} {{vm.unit}}</span>
|
||||
</div>
|
||||
<span ng-show="globalResult">{{globalResult}} {{unit}}</span>
|
||||
<span ng-show="vm.globalResult">{{vm.globalResult}} {{vm.unit}}</span>
|
||||
<div class="alternative-amount">
|
||||
<span class="text-selectable">{{alternativeAmount || '0.00'}}</span> <span>{{alternativeUnit}}</span>
|
||||
<span class="text-selectable">{{vm.alternativeAmount || '0.00'}}</span> <span>{{vm.alternativeUnit}}</span>
|
||||
</div>
|
||||
<div class="switch-currencies" ng-click="changeUnit()"><img src="img/icon-convert.svg"></div>
|
||||
<div class="switch-currencies" ng-click="vm.changeUnit()"><img src="img/icon-convert.svg"></div>
|
||||
</div>
|
||||
<div class="send-amount-actions text-center">
|
||||
<button class="button button-sendmax" ng-click="sendMax()">
|
||||
<span>
|
||||
<i class="icon ion-ios-speedometer-outline"></i> 
|
||||
<span translate>Send max amount</span>
|
||||
</span>
|
||||
</button>
|
||||
<button class="button button-sendmax" ng-click="openPopup()">
|
||||
<span>
|
||||
<i class="icon ion-social-usd"></i> 
|
||||
<span translate>Change currency</span>
|
||||
</span>
|
||||
</button>
|
||||
<div class="send-amount-header-footer">
|
||||
<div class="warning" ng-show="vm.errorMessage">
|
||||
{{vm.errorMessage}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="send-amount-extras text-center">
|
||||
<button class="extra button" ng-click="vm.openPopup()">
|
||||
<span>
|
||||
<img src="img/icon-alternative-currency-black.svg"/>
|
||||
 
|
||||
<span translate>Change Currency</span>
|
||||
</span>
|
||||
</button>
|
||||
<div class="extra available-funds"
|
||||
ng-class="{warning: vm.fundsAreInsufficient}"
|
||||
ng-if="!vm.isRequestingSpecificAmount" translate>
|
||||
<span>Available Funds:</span> <span>{{vm.availableFunds}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="keypad-container" style="background: #fff; position: absolute; bottom: 0; margin-bottom: 57px; width: 100%;">
|
||||
<div class="keypad" style="background: #f2f2f2; position: relative;">
|
||||
<div class="sendmax" ng-if="vm.availableFunds && !vm.isRequestingSpecificAmount">
|
||||
<button class="button button-sendmax" ng-click="vm.sendMax()">
|
||||
<span>
|
||||
<span translate>Use All Available Funds</span> 
|
||||
<span class="available-funds-amount">({{vm.availableFunds}})</span>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="keypad" style="position: relative;">
|
||||
|
||||
<div class="row">
|
||||
<div class="col digit" ng-click="pushDigit('7')">7</div>
|
||||
<div class="col digit" ng-click="pushDigit('8')">8</div>
|
||||
<div class="col digit" ng-click="pushDigit('9')">9</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('7')">7</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('8')">8</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('9')">9</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col digit" ng-click="pushDigit('4')">4</div>
|
||||
<div class="col digit" ng-click="pushDigit('5')">5</div>
|
||||
<div class="col digit" ng-click="pushDigit('6')">6</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('4')">4</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('5')">5</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('6')">6</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col digit" ng-click="pushDigit('1')">1</div>
|
||||
<div class="col digit" ng-click="pushDigit('2')">2</div>
|
||||
<div class="col digit" ng-click="pushDigit('3')">3</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('1')">1</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('2')">2</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('3')">3</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col digit" ng-click="pushDigit('.')">.</div>
|
||||
<div class="col digit" ng-click="pushDigit('0')">0</div>
|
||||
<div class="col digit icon ion-backspace-outline" ng-click="removeDigit()"></div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('.')">.</div>
|
||||
<div class="col digit" ng-click="vm.pushDigit('0')">0</div>
|
||||
<div class="col digit icon ion-backspace-outline" ng-click="vm.removeDigit()"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button
|
||||
class="button button-full button-primary no-margin"
|
||||
ng-disabled="!allowSend"
|
||||
ng-click="finish()"
|
||||
ng-disabled="!vm.allowSend"
|
||||
ng-click="vm.finish()"
|
||||
style="position: absolute; bottom: 0;"
|
||||
translate>
|
||||
Next
|
||||
|
|
|
|||
|
|
@ -105,13 +105,13 @@
|
|||
</ion-content>
|
||||
<click-to-accept
|
||||
ng-click="approve(tx, wallet, statusChangeHandler)"
|
||||
ng-if="(!isCordova || isWindowsPhoneApp) && wallet"
|
||||
ng-if="(!isCordova) && wallet"
|
||||
click-send-status="sendStatus"
|
||||
is-disabled="!wallet">
|
||||
{{buttonText}}
|
||||
</click-to-accept>
|
||||
<slide-to-accept
|
||||
ng-if="isCordova && !isWindowsPhoneApp && wallet"
|
||||
ng-if="isCordova && wallet"
|
||||
slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
|
||||
slide-send-status="sendStatus"
|
||||
is-disabled="!wallet">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div class="title">
|
||||
{{'Alternative Currency'|translate}}
|
||||
</div>
|
||||
<button class="button button-clear" ng-click="close()" translate>
|
||||
<button class="button button-clear" ng-click="vm.close()" translate>
|
||||
{{'Close'|translate}}
|
||||
</button>
|
||||
</ion-header-bar>
|
||||
|
|
@ -11,23 +11,23 @@
|
|||
<div class="bar bar-header item-input-inset m20b">
|
||||
<label class="item-input-wrapper">
|
||||
<i class="icon ion-ios-search placeholder-icon"></i>
|
||||
<input type="search" ng-init="searchedAltCurrency = ''" ng-model="searchedAltCurrency" ng-change="findCurrency(searchedAltCurrency)"
|
||||
<input type="search" ng-init="searchedAltCurrency = ''" ng-model="searchedAltCurrency" ng-change="vm.findCurrency(searchedAltCurrency)"
|
||||
placeholder="{{'Search your currency' | translate}}">
|
||||
</label>
|
||||
</div>
|
||||
<div class="list" ng-if="lastUsedPopularList[0] && searchedAltCurrency.length == 0">
|
||||
<ion-radio class="alt-currency-radio" ng-repeat="lastUsedAltCurrency in lastUsedPopularList" ng-value="lastUsedAltCurrency.isoCode" ng-model="currentCurrency"
|
||||
ng-click="save(lastUsedAltCurrency)">{{lastUsedAltCurrency.name}} <span class="item-note">{{lastUsedAltCurrency.isoCode}}</span>
|
||||
<div class="list" ng-if="vm.lastUsedPopularList[0] && searchedAltCurrency.length == 0">
|
||||
<ion-radio class="alt-currency-radio" ng-repeat="lastUsedAltCurrency in vm.lastUsedPopularList" ng-value="lastUsedAltCurrency.isoCode" ng-model="currentCurrency"
|
||||
ng-click="vm.save(lastUsedAltCurrency)">{{lastUsedAltCurrency.name}} <span class="item-note">{{lastUsedAltCurrency.isoCode}}</span>
|
||||
</ion-radio>
|
||||
</div>
|
||||
<div class="list">
|
||||
<div class="item" ng-repeat="altCurrency in altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
|
||||
ng-click="save(altCurrency)">{{altCurrency.name}} <span class="item-note">{{altCurrency.isoCode}}</span>
|
||||
<div class="item" ng-repeat="altCurrency in vm.altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
|
||||
ng-click="vm.save(altCurrency)">{{altCurrency.name}} <span class="item-note">{{altCurrency.isoCode}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<ion-infinite-scroll
|
||||
ng-if="!listComplete"
|
||||
on-infinite="loadMore()"
|
||||
ng-if="!vm.listComplete"
|
||||
on-infinite="vm.loadMore()"
|
||||
distance="50%">
|
||||
</ion-infinite-scroll>
|
||||
</ion-content>
|
||||
|
|
|
|||
119
www/views/review.html
Normal file
119
www/views/review.html
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
<ion-view id="view-review" hide-tabs>
|
||||
<ion-nav-bar class="bar-royal {{vm.origin.currency.toLowerCase()}}">
|
||||
<ion-nav-title>
|
||||
{{'Review Transaction' | translate}}
|
||||
</ion-nav-title>
|
||||
<ion-nav-back-button>
|
||||
</ion-nav-back-button>
|
||||
</ion-nav-bar>
|
||||
|
||||
<ion-content class="padded-bottom-cta-with-summary bg-neutral">
|
||||
<div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
|
||||
<div class="header {{vm.origin.currency.toLowerCase()}}" ng-class="vm.thirdParty.id">
|
||||
<div class="content">
|
||||
<p>{{vm.sendingTitle}}</p>
|
||||
<p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</p>
|
||||
<p ng-show="vm.secondaryAmount">{{vm.secondaryAmount}} {{vm.secondaryCurrency}}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content-frame negative-top">
|
||||
<div class="card card-gutter-compact">
|
||||
<div class="item item-compact" translate>From:</div>
|
||||
<div class="item item-gutterless item-complex item-avatar">
|
||||
<div class="item-content item-content-avatar">
|
||||
<i class="icon big-icon-svg theme-circle theme-circle-services">
|
||||
<div class="bg icon-wallet"
|
||||
style="background-color: {{vm.originWallet.color}}"
|
||||
></div>
|
||||
</i>
|
||||
<h2>{{vm.originWallet.name}} <span class="highlight" style="color: {{vm.origin.currencyColor}}">({{vm.origin.currency}})</span></h2>
|
||||
<p ng-show="vm.origin.balanceAmount">{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card card-gutter-compact">
|
||||
<div class="item item-compact" translate>To:</div>
|
||||
<div class="item item-gutterless item-complex item-avatar">
|
||||
<div class="item-content item-content-avatar"
|
||||
ng-if="vm.destination.kind === 'contact' || vm.destination.kind === 'wallet' || vm.destination.kind == 'shapeshift'">
|
||||
<img src="img/contact-placeholder.svg" class="bg" ng-if="vm.destination.kind === 'contact'">
|
||||
<i class="icon big-icon-svg theme-circle theme-circle-services" ng-if="vm.destination.kind === 'wallet' || vm.destination.kind === 'shapeshift'">
|
||||
<div class="bg icon-wallet"
|
||||
style="background-color: {{vm.destination.color}}"
|
||||
></div>
|
||||
</i>
|
||||
<h2>{{vm.destination.name}}<span class="highlight" style="color: {{vm.destination.currencyColor}}" ng-if="vm.destination.currency"> ({{vm.destination.currency}})</span></h2></h2>
|
||||
<p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p>
|
||||
</div>
|
||||
<div class="item-content item-content-avatar"
|
||||
ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'
|
||||
&& (vm.thirdParty.name === 'BitPay' || vm.thirdParty.name === 'eGifter')">
|
||||
<img ng-if="vm.thirdParty.name === 'BitPay'" src="img/icon-bitpay.svg" class="bg">
|
||||
<img ng-if="vm.thirdParty.name === 'eGifter'" src="img/icon-egifter.png" class="bg">
|
||||
<h2>{{vm.destination.name}}</h2>
|
||||
<p translate ng-if="!vm.paymentExpired">Payment expires: {{vm.remainingTimeStr}}</p>
|
||||
<p class="warning" translate ng-if="vm.paymentExpired">Payment request has expired</p>
|
||||
</div>
|
||||
<div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address' && !vm.thirdParty">
|
||||
<div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded">
|
||||
<span class="prefix">{{vm.destination.address.substring(0,5)}}</span><span class="mid">{{vm.destination.address.substring(5,vm.destination.address.length-4)}}</span><span class="suffix">{{vm.destination.address.substring(vm.destination.address.length-4)}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="expand-content-frame">
|
||||
<div class="action-minor mt-negative text-right expand-content-trigger"
|
||||
ng-class="{ 'expand-content-revealed': vm.memoExpanded }"
|
||||
ng-click="vm.memoExpanded = !vm.memoExpanded">
|
||||
<img src="img/icon-bookmark.svg" class="action-icon">
|
||||
<span class="action-text">Add personal note</span>
|
||||
</div>
|
||||
<div class="card card-gutter-compact expand-content"
|
||||
ng-class="{ 'expand-content-revealed': vm.memoExpanded }">
|
||||
<div class="item item-compact" translate>Personal Note:</div>
|
||||
<div class="item">
|
||||
<div class="item-content">
|
||||
<textarea elastic placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" class="elastic" ng-model="vm.memo"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
<div class="fee-summary">
|
||||
<div ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'" translate="">Suggested by merchant:</div>
|
||||
<div class="amount">
|
||||
<div class="fee-fiat positive" ng-if="vm.feeLessThanACent">Fee: Less than 1 cent</div>
|
||||
<div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent">Fee: {{vm.feeFiat}} {{vm.feeCurrency}}</div>
|
||||
<div class="fee-crypto" ng-if="vm.feeCrypto">
|
||||
{{vm.feeCrypto}} {{vm.origin.currency}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<click-to-accept
|
||||
ng-click="vm.approve()"
|
||||
ng-if="!vm.isCordova"
|
||||
click-send-status="vm.sendStatus"
|
||||
is-disabled="!vm.readyToSend">
|
||||
{{vm.buttonText}}
|
||||
</click-to-accept>
|
||||
<slide-to-accept
|
||||
ng-if="vm.isCordova"
|
||||
slide-on-confirm="vm.approve()"
|
||||
slide-send-status="vm.sendStatus"
|
||||
is-disabled="!vm.readyToSend">
|
||||
{{vm.buttonText}}
|
||||
</slide-to-accept>
|
||||
<slide-to-accept-success
|
||||
slide-success-show="vm.sendStatus === 'success'"
|
||||
slide-success-on-confirm="vm.onSuccessConfirm()"
|
||||
slide-success-hide-on-confirm="true">
|
||||
<span ng-show="vm.originWallet.m == 1 && (vm.originWallet.canSign() || vm.originWallet.isPrivKeyExternal())" translate>Payment Sent</span>
|
||||
<span ng-show="vm.originWallet.m > 1 && (vm.originWallet.canSign() || vm.originWallet.isPrivKeyExternal())" translate>Proposal Created</span>
|
||||
<span ng-show="!vm.originWallet.canSign() && !vm.originWallet.isPrivKeyExternal()" translate>Transaction Created</span>
|
||||
</slide-to-accept-success>
|
||||
</ion-view>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<ion-view class="settings" show-tabs>
|
||||
<ion-view id="shapeshift" class="settings" show-tabs>
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-title>
|
||||
{{'Shapeshift'|translate}}
|
||||
|
|
@ -7,14 +7,29 @@
|
|||
</ion-nav-back-button>
|
||||
</ion-nav-bar>
|
||||
<ion-content>
|
||||
<div class="send-header-wrapper shapeshift-banner">
|
||||
<img class="shapeshift-logo" src="img/shapeshiftlogo.svg"/>
|
||||
</div>
|
||||
<div class="list card ng-hide" ng-show="fromWallets.length == 0 || toWallets.length == 0">
|
||||
<div class="item item-heading">
|
||||
<span translate>No available wallets to convert between.</span>
|
||||
<div ng-include="'views/thirdparty/shapeshift-header.html'"></div>
|
||||
<div class="list card empty-case">
|
||||
<div>
|
||||
<img class="swap-image" src="img/shapeshift_swap.png"/>
|
||||
</div>
|
||||
<div class="subtitle">
|
||||
<p translate>Exchange your BTC to BCH in minutes.</p>
|
||||
<div ng-show="!walletsWithFunds.length">
|
||||
<p translate>To start the process you need to add funds to your wallet.</p>
|
||||
</div>
|
||||
<div ng-show="walletsWithFunds.length">
|
||||
<p translate>The process is fast and you will receive the exchanged amount in your wallet.</p>
|
||||
</div>
|
||||
<div ng-show="!hasWallets" translate>To get started, you'll need to create a bitcoin wallet and get some bitcoin.</div>
|
||||
<div class="padding buttons">
|
||||
<button class="button button-standard button-green" ng-click="buyBitcoin()" ng-show="!walletsWithFunds.length" translate>Buy Bitcoin now</button>
|
||||
<button class="button button-standard button-green" ng-click="createWallet()" ng-show="!hasWallets" translate>Create bitcoin wallet</button>
|
||||
<button class="button button-standard button-shapeshift track_shapeshift_start_click" ng-click="shapeshift()" ng-show="walletsWithFunds.length" translate>Start ShapeShift</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="third-party-notice" translate>This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction.</div>
|
||||
|
||||
<shapeshift-coin-trader class="ng-hide" ng-show="fromWallets.length > 0 && toWallets.length > 0">
|
||||
<div class="list card">
|
||||
<div class="item item-heading">
|
||||
|
|
@ -94,21 +109,21 @@
|
|||
</shapeshift-coin-trader>
|
||||
</ion-content>
|
||||
|
||||
<wallet-selector
|
||||
wallet-selector-title="fromWalletSelectorTitle"
|
||||
wallet-selector-wallets="fromWallets"
|
||||
wallet-selector-selected-wallet="fromWallet"
|
||||
wallet-selector-show="showFromWallets"
|
||||
wallet-selector-on-select="onFromWalletSelect"
|
||||
wallet-selector-always-display-bitcoin-core="true">
|
||||
</wallet-selector>
|
||||
<!--<wallet-selector-->
|
||||
<!--wallet-selector-title="fromWalletSelectorTitle"-->
|
||||
<!--wallet-selector-wallets="fromWallets"-->
|
||||
<!--wallet-selector-selected-wallet="fromWallet"-->
|
||||
<!--wallet-selector-show="showFromWallets"-->
|
||||
<!--wallet-selector-on-select="onFromWalletSelect"-->
|
||||
<!--wallet-selector-always-display-bitcoin-core="true">-->
|
||||
<!--</wallet-selector>-->
|
||||
|
||||
<wallet-selector
|
||||
wallet-selector-title="toWalletSelectorTitle"
|
||||
wallet-selector-wallets="toWallets"
|
||||
wallet-selector-selected-wallet="toWallet"
|
||||
wallet-selector-show="showToWallets"
|
||||
wallet-selector-on-select="onToWalletSelect"
|
||||
wallet-selector-always-display-bitcoin-core="true">
|
||||
</wallet-selector>
|
||||
</ion-view>
|
||||
<!--<wallet-selector-->
|
||||
<!--wallet-selector-title="toWalletSelectorTitle"-->
|
||||
<!--wallet-selector-wallets="toWallets"-->
|
||||
<!--wallet-selector-selected-wallet="toWallet"-->
|
||||
<!--wallet-selector-show="showToWallets"-->
|
||||
<!--wallet-selector-on-select="onToWalletSelect"-->
|
||||
<!--wallet-selector-always-display-bitcoin-core="true">-->
|
||||
<!--</wallet-selector>-->
|
||||
<!--</ion-view>-->
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
</button>
|
||||
</div>
|
||||
<div class="col-60">
|
||||
<button class="button button-standard button-primary button-outline" ng-click="showWalletSelector()">
|
||||
<button class="button button-standard button-primary button-outline" ui-sref="tabs.send.wallet-to-wallet">
|
||||
<img src="img/icon-w2w.svg"/><br/>
|
||||
<span translate>Wallet to Wallet Transfer</span>
|
||||
</button>
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
</div>
|
||||
<div class="list">
|
||||
<a class="item item-icon-left item-icon-right" ng-repeat="item in list"
|
||||
ng-if="!item.isWallet && item.recipientType != 'wallet'" ng-click="goToAmount(item)">
|
||||
ng-if="!item.isWallet && item.recipientType != 'wallet'" ng-click="sendToContact(item)">
|
||||
<i class="icon big-icon-svg">
|
||||
<gravatar class="send-gravatar" name="{{item.name}}" width="120" email="{{item.email}}"></gravatar>
|
||||
</i>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
3
www/views/thirdparty/bitpay-header.html
vendored
Normal file
3
www/views/thirdparty/bitpay-header.html
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<div class="send-header-wrapper bitpay-banner">
|
||||
<img class="bitpay-logo" src="img/bitpay_banner.svg"/>
|
||||
</div>
|
||||
3
www/views/thirdparty/egifter-header.html
vendored
Normal file
3
www/views/thirdparty/egifter-header.html
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<div class="send-header-wrapper egifter-banner">
|
||||
<img class="egifter-logo" src="img/egifter_banner.png"/>
|
||||
</div>
|
||||
3
www/views/thirdparty/shapeshift-header.html
vendored
Normal file
3
www/views/thirdparty/shapeshift-header.html
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<div class="send-header-wrapper shapeshift-banner">
|
||||
<img class="shapeshift-logo" src="img/shapeshiftlogo.svg"/>
|
||||
</div>
|
||||
59
www/views/walletSelector.html
Normal file
59
www/views/walletSelector.html
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<ion-view id="wallet-origin-destination" show-tabs>
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-title>{{sendFlowTitle}}</ion-nav-title>
|
||||
<ion-nav-back-button ng-click="goBack()"></ion-nav-back-button>
|
||||
</ion-nav-bar>
|
||||
<ion-content>
|
||||
<div ng-if="thirdParty && thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
|
||||
<div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'BitPay'" ng-include="'views/thirdparty/bitpay-header.html'"></div>
|
||||
<div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'eGifter'" ng-include="'views/thirdparty/egifter-header.html'"></div>
|
||||
<div class="header--request" ng-if="isPaymentRequest">
|
||||
<div class="header--request__title" translate>Paying</div>
|
||||
<div class="header--request__amount" translate>{{requestAmount}} {{requestCurrency}}</div>
|
||||
<div class="header--request__amount-alt" ng-show="requestAmountSecondary" translate>{{requestAmountSecondary}} {{requestCurrencySecondary}}</div>
|
||||
</div>
|
||||
<div class="wallets-header">
|
||||
<div class="title">
|
||||
{{headerTitle}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="list card" ng-if="walletsBch.length > 0">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<div translate>Bitcoin Cash (BCH)</div>
|
||||
<div translate class="subtitle">Instant transactions with low fees</div>
|
||||
</div>
|
||||
<div>
|
||||
<a ng-repeat="wallet in walletsBch track by $index"
|
||||
class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
|
||||
ng-click="useWallet(wallet)">
|
||||
<span ng-include="'views/includes/walletList.html'"></span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="list card" ng-if="walletsBtc.length > 0">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<div translate>Bitcoin Core (BTC)</div>
|
||||
</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="useWallet(wallet)">
|
||||
<span ng-include="'views/includes/walletList.html'"></span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="list card card-insufficient" ng-if="walletsInsufficientFunds.length > 0">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<span class="card-insufficient__dot"></span><div translate>Insufficient funds</div>
|
||||
</div>
|
||||
<div>
|
||||
<a ng-repeat="wallet in walletsInsufficientFunds track by $index"
|
||||
class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet">
|
||||
<span ng-include="'views/includes/walletList.html'"></span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
Loading…
Add table
Add a link
Reference in a new issue