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

Merge branch 'wallet/sprint/20' into wallet/task/514

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-14 11:41:31 +09:00 • committed by GitHub
commit 24033f4615
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
70 changed files with 3335 additions and 861 deletions
Download patch file Download diff file Expand all files Collapse all files

64
www/css/main.css
View file

@ -11168,16 +11168,8 @@ qrcode {
background-color: #fab915 !important; }
#tab-send-header {
height: 300px;
width: 100%; }
#tab-send-contacts {
height: calc(100vh - 300px - 50px - 44px);
/* screen size - button container - bottom-tab-menu - header top */
overflow: scroll; }
#tab-send-contacts.ios {
height: calc(100vh - 300px - 50px - 44px - 18px); }
#tab-send .input {
width: 100%; }
#tab-send .input input {
@ -11358,14 +11350,7 @@ qrcode {
#tab-send .send-wrapper .buttons .button-qr {
height: 60px; }
#tab-send .send-wrapper .buttons .button-qr span {
font-size: 16px; }
#tab-send #tab-send-header {
height: 270px; }
#tab-send #tab-send-contacts {
height: calc(100vh - 270px - 50px - 44px);
/* screen size - button container - bottom-tab-menu - header top */ }
#tab-send #tab-send-contacts.ios {
height: calc(100vh - 270px - 50px - 44px - 18px); } }
font-size: 16px; } }
#wallet-origin-destination .header--request {
padding: 30px 24px;
@ -15374,8 +15359,6 @@ log-options #check-bar .checkbox-icon {
#view-review .fee-summary {
position: absolute;
bottom: 92px; }
#view-review .fee-summary-spacer {
height: 15px; }
#view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner {
box-shadow: none; }
#view-review .warning {
@ -15551,31 +15534,28 @@ ion-content.padded-bottom-cta-with-summary {
.fee-summary .amount .fee-crypto {
color: #A7A7A7; }
.amount .start,
.amount .middle,
.amount .end,
.amount .currency {
.formatted-amount {
display: inline-block; }
.amount .start {
font-size: 1em; }
.amount .middle {
font-size: 0.7857em;
margin-left: 5px; }
.amount .end {
font-size: 0.7857em;
margin-left: 5px; }
.amount.size-equal .middle,
.amount.size-equal .end {
font-size: 1em; }
.amount .currency {
font-size: 1em;
margin-left: 5px;
text-transform: uppercase; }
.formatted-amount .start,
.formatted-amount .middle,
.formatted-amount .end,
.formatted-amount .currency {
display: inline-block; }
.formatted-amount .start {
font-size: 1em; }
.formatted-amount .middle {
font-size: 0.7857em;
margin-left: 5px; }
.formatted-amount .end {
font-size: 0.7857em;
margin-left: 5px; }
.formatted-amount.size-equal .middle,
.formatted-amount.size-equal .end {
font-size: 1em; }
.formatted-amount .currency {
font-size: 1em;
margin-left: 5px;
text-transform: uppercase; }
/* This is for rules that don't yet have a home.
* Our goal is to delete this file. Search the regex: /class=".*CLASS.*?"/

35
www/views/amount.html
View file

@ -14,12 +14,14 @@
<div class="send-amount-tool">
<div class="send-amount-tool-input amount">
<div class="primary-amount"
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>
ng-class="{long: vm.amount.length > 5, 'very-long': vm.amount.length > 8}">
<span class="primary-amount-display text-selectable">
{{vm.amount || '0'}} {{vm.unit}}
</span>
</div>
<span ng-show="vm.globalResult">{{vm.globalResult}} {{vm.unit}}</span>
<span ng-show="vm.globalResult"><formatted-amount value="{{vm.globalResult}}" currency="{{vm.unit}}"></formatted-amount></span>
<div class="alternative-amount">
<span class="text-selectable">{{vm.alternativeAmount || '0.00'}}</span> <span>{{vm.alternativeUnit}}</span>
<span class="text-selectable">{{vm.alternativeAmount || '0.00'}} {{vm.alternativeUnit}}</span>
</div>
<div class="switch-currencies" ng-click="vm.changeUnit()"><img src="img/icon-convert.svg"></div>
</div>
@ -32,17 +34,20 @@
</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"/>
&ensp;
<span translate>Change Currency</span>
</span>
</button>
<div class="extra available-funds"
<div class="extra change-currency">
<button class="button" ng-click="vm.openPopup()">
<span>
<img src="img/icon-alternative-currency-black.svg"/>
<pre> </pre>
<span translate>Change Currency</span>
</span>
</button>
</div>
<div class="extra available-funds"
ng-class="{warning: vm.fundsAreInsufficient}"
ng-if="!vm.isRequestingSpecificAmount" translate>
<span>Available Funds:</span>&ensp;<span>{{vm.availableFunds}}</span>
<span translate>Available Funds</span>: <span><formatted-amount value="{{vm.availableFunds}}" size-equal="true"></formatted-amount></span>
</div>
</div>
</div>
</div>
@ -52,7 +57,7 @@
<button class="button button-sendmax" ng-click="vm.sendMax()">
<span>
<span translate>Use All Available Funds</span>&ensp;
<span class="available-funds-amount">({{vm.availableFunds}})</span>
<span class="available-funds-amount">(<formatted-amount value="{{vm.availableFunds}}"></formatted-amount>)</span>
</span>
</button>
</div>
@ -88,7 +93,7 @@
<button
class="button button-full button-primary no-margin"
ng-disabled="!vm.allowSend"
ng-click="vm.finish()"
ng-click="vm.next()"
style="position: absolute; bottom: 0;"
translate>
Next

8
www/views/customAmount.html
View file

@ -32,15 +32,15 @@
</div>
<div ng-show="!showingPaymentReceived" class="amount">
<div ng-show="selectedPriceDisplay=='fiat'">
<span class="size-36">{{amountUnitStr}}</span>
<span class="size-36"><formatted-amount value="{{amountUnitStr}}"></formatted-amount></span>
<div class="size-14 amount-alternative">
{{altAmountStr | uppercase}}
<formatted-amount value="{{altAmountStr | uppercase}}"></formatted-amount>
</div>
</div>
<div ng-show="selectedPriceDisplay=='crypto'">
<span class="size-36">{{altAmountStr | uppercase}}</span>
<span class="size-36"><formatted-amount value="{{altAmountStr | uppercase}}"></formatted-amount></span>
<div class="size-14 amount-alternative">
{{amountUnitStr}}
<formatted-amount value="{{amountUnitStr}}"></formatted-amount>
</div>
</div>
</div>

6
www/views/includes/amount.html → www/views/includes/formatted-amount.html
View file

@ -1,4 +1,4 @@
<div class="amount"
ng-class="{ 'size-equal': displaySizeEqual }">
<span ng-if="start.length > 0" class="start">{{start}}</span><span ng-if="middle.length > 0" class="middle">{{middle}}</span><span ng-if="end.length > 0" class="end">{{end}}</span><span ng-if="currency.length > 0" class="currency">{{currency}}</span>
<div class="formatted-amount"
ng-class="{ 'size-equal': displaySizeEqual }" ng-show="canShow">
<span ng-if="start.length > 0" class="start">{{start}}</span><span ng-if="middle.length > 0" class="middle">{{middle}}</span><span ng-if="end.length > 0" class="end">{{end}}</span><span ng-if="vm.currency.length > 0" class="currency">{{vm.currency}}</span>
</div>

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

@ -24,7 +24,7 @@
(possible double spend)
</span>
<span ng-if="tx.action != 'invalid'">
– {{tx.amountStr}}
– <formatted-amount value={{tx.amountStr}}></formatted-amount>
</span>
</span>
<div>

3
www/views/includes/wallet-balance.html Normal file
View file

@ -0,0 +1,3 @@
<div class="wallet-balance-directive">
<formatted-amount value="{{displayAmount}}"></formatted-amount><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn * 1000 | amTimeAgo)}}</span>
</div>

12
www/views/includes/walletActivity.html
View file

@ -10,7 +10,7 @@
<div ng-if="notification.type == 'NewOutgoingTx'">
<span translate>Payment Sent </span>
<div class="wallet-activity-amount">
{{notification.amountStr}}
<formatted-amount value={{notification.amountStr}}
</div>
</div>
@ -19,7 +19,7 @@
<div ng-if="notification.type == 'NewIncomingTx'">
<span translate>Payment Received</span>
<div class="wallet-activity-amount">
{{notification.amountStr}}
<formatted-amount value={{notification.amountStr}}></formatted-amount>
</div>
</div>
@ -27,7 +27,7 @@
<span translate>Proposal Deleted</span>:
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{notification.amountStr}}:
<formatted-amount value={{notification.amountStr}}></formatted-amount>:
</div>
</div>
@ -35,7 +35,7 @@
<span translate>Proposal Rejected</span>:
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{notification.amountStr}}:
<formatted-amount value={{notification.amountStr}}></formatted-amount>:
</div>
</div>
@ -43,7 +43,7 @@
<span translate>New Proposal</span>:
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{notification.amountStr}}
<formatted-amount value={{notification.amountStr}}></formatted-amount>
</div>
</span>
@ -51,7 +51,7 @@
<span translate>Proposal Accepted</span>:
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{notification.amountStr}}
<formatted-amount value={{notification.amountStr}}></formatted-amount>
</div>
</span>

5
www/views/includes/walletHistory.html
View file

@ -64,17 +64,16 @@
<span class="item-note text-right wallet-details__tx-amount">
<span class="wallet-details__tx-amount" ng-class="{'wallet-details__tx-amount--recent': btx.recent, 'wallet-details__tx-amount--received': btx.action == 'received', 'wallet-details__tx-amount--sent': btx.action == 'sent'}">
<span ng-if="btx.action == 'sent'">–</span>
<span class="size-12" ng-if="btx.action == 'invalid'" translate>
(possible double spend)
</span>
<span ng-if="btx.action != 'invalid'">
{{btx.amountValueStr}} {{btx.amountUnitStr}}
<formatted-amount value="{{btx.action == 'sent'?'-':''}}{{btx.amountValueStr}}" currency="{{btx.amountUnitStr}}"></formatted-amount>
</span>
</span>
<div>
<span class="size-12 wallet-details__tx-amount" ng-class="{'wallet-details__tx-amount--recent': btx.recent, 'wallet-details__tx-amount--received': btx.action == 'received', 'wallet-details__tx-amount--sent': btx.action == 'sent'}">
{{btx.alternativeAmountStr}}
<formatted-amount value="{{btx.action == 'sent'?'-':''}}{{btx.alternativeAmountStr}}"></formatted-amount>
</span>
</div>
</span>

8
www/views/includes/walletList.html
View file

@ -7,8 +7,12 @@
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<span ng-if="selectedPriceDisplay == 'crypto' && !wallet.balanceHidden && !wallet.scanning"> {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} </span>
<span ng-if="selectedPriceDisplay == 'fiat' && !wallet.balanceHidden && !wallet.scanning"> {{wallet.status.totalBalanceAlternative ? wallet.status.totalBalanceAlternative : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} {{wallet.status.alternativeIsoCode}}</span>
<span ng-if="selectedPriceDisplay == 'crypto' && !wallet.balanceHidden && !wallet.scanning">
<formatted-amount value="{{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance : '' ) }}"></formatted-amount> {{(!wallet.status.totalBalanceStr && wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '')}}
</span>
<span ng-if="selectedPriceDisplay == 'fiat' && !wallet.balanceHidden && !wallet.scanning">
<formatted-amount value="{{wallet.status.totalBalanceAlternative ? wallet.status.totalBalanceAlternative : (wallet.cachedBalance ? wallet.cachedBalance : '') }}" currency="{{wallet.status.alternativeIsoCode}}"></formatted-amount> {{( !wallet.status.totalBalanceAlternative && wallet.cachedBalance ? (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' )}}
</span>
<span ng-if="wallet.scanning" translate> Scanning funds... </span>
<span ng-if="wallet.balanceHidden && !wallet.scanning" translate>[Balance Hidden]</span>

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

@ -27,8 +27,8 @@
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<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="displayBalanceAsFiat && !wallet.balanceHidden"><formatted-amount value="{{wallet.status.totalBalanceAlternative}}" currency="{{wallet.status.alternativeIsoCode}}"></formatted-amount></span>
<span ng-if="!displayBalanceAsFiat && !wallet.balanceHidden"><formatted-amount value="{{wallet.status.availableBalanceStr}}"></formatted-amount></span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span>
</span>
@ -58,8 +58,8 @@
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<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="displayBalanceAsFiat && !wallet.balanceHidden"><formatted-amount value="{{wallet.status.totalBalanceAlternative}}" currency="{{wallet.status.alternativeIsoCode}}"></formatted-amount></span>
<span ng-if="!displayBalanceAsFiat && !wallet.balanceHidden"><formatted-amount value="{{wallet.status.availableBalanceStr}}"></formatted-amount></span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span>
</span>

23
www/views/review.html
View file

@ -3,8 +3,7 @@
<ion-nav-title>
{{'Review Transaction' | translate}}
</ion-nav-title>
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-back-button ng-click="vm.goBack()"></ion-nav-back-button>
</ion-nav-bar>
<ion-content class="padded-bottom-cta-with-summary bg-neutral">
@ -12,14 +11,14 @@
<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>
<p class="large"><formatted-amount value="{{vm.primaryAmount}}" currency="{{vm.primaryCurrency}}"></formatted-amount></p>
<p ng-show="vm.secondaryAmount"><formatted-amount value="{{vm.secondaryAmount}}" currency="{{vm.secondaryCurrency}}"></formatted-amount></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-compact"><span translate>From</span>:</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">
@ -53,7 +52,7 @@
<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 translate ng-if="!vm.paymentExpired"><span translate>Payment expires:</span> {{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">
@ -68,14 +67,14 @@
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>
<span class="action-text" translate>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>
<textarea elastic placeholder="{{btx.note.body || btx.message || vm.personalNotePlaceholder}}" class="elastic" ng-model="vm.memo"></textarea>
</div>
</div>
</div>
@ -85,12 +84,12 @@
</ion-content>
<div class="fee-summary">
<div ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'" translate="">Suggested by merchant:</div>
<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-fiat positive" ng-if="vm.feeLessThanACent"><span translate>Fee:</span> <span translate>Less than 1 cent</span></div>
<div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent"><span translate>Fee:</span> {{vm.feeFiat}} {{vm.feeCurrency}}</div>
<div class="fee-crypto" ng-if="vm.feeCrypto">
{{vm.feeCrypto}} {{vm.origin.currency}}
<formatted-amount value="{{vm.feeCrypto}}" currency="{{vm.origin.currency}}"></formatted-amount>
</div>
</div>
</div>

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

@ -34,7 +34,7 @@
<span translate>Buy Bitcoin</span>
</div>
<div class="button button-outline button-grey-outline" ng-class="{'ng-hide': !walletsWithFunds.length}"
ui-sref="tabs.send">
ng-click="startFreshSend()">
<span translate>Send</span>
</div>
</div>

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

@ -61,8 +61,8 @@
</svg>
<p class="success animated fadeIn">
<br/>Payment Received!
<span ng-if="!(displayBalanceAsFiat && paymentReceivedAlternativeAmount)" class="payment-received-amount">{{ paymentReceivedAmount }} <span class="payment-received-currency">{{ paymentReceivedCoin }}</span></span>
<span ng-if="displayBalanceAsFiat && paymentReceivedAlternativeAmount" class="payment-received-amount">{{ paymentReceivedAlternativeAmount }}</span></span>
<span ng-if="!(displayBalanceAsFiat && paymentReceivedAlternativeAmount)" class="payment-received-amount"><formatted-amount value="{{ paymentReceivedAmount }}" currency="{{paymentReceivedCoin}}"></formatted-amount></span>
<span ng-if="displayBalanceAsFiat && paymentReceivedAlternativeAmount" class="payment-received-amount"><formatted-amount value="{{ paymentReceivedAlternativeAmount }}"></formatted-amount></span></span>
Return To Address<br/>
</p>
</div>
@ -95,8 +95,8 @@
{{wallet.name || wallet.id}}
</span>
<p>
<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="displayBalanceAsFiat && !wallet.balanceHidden" translate> <formatted-amount value="{{wallet.status.totalBalanceAlternative}}" currency="{{wallet.status.alternativeIsoCode}}"></formatted-amount></span>
<span ng-if="!displayBalanceAsFiat && !wallet.balanceHidden"> <formatted-amount value="{{wallet.status.totalBalanceStr}}"></formatted-amount> </span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
<span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">

28
www/views/tab-send.html
View file

@ -4,6 +4,32 @@
</ion-nav-bar>
<ion-content>
<div id="tab-send-header" ng-if="hasFunds">
<div class="content-frame" ng-if="fromWallet">
<div class="card card-gutter-compact">
<div class="item item-compact"><span translate>From</span>:</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: {{fromWallet.color}}"
></div>
</i>
<h2>{{fromWallet.name}}</h2>
<wallet-balance
display-as-fiat="{{displayBalanceAsFiat}}"
wallet-status="{{fromWallet.status}}"
wallet-cached-balance="{{fromWallet.cachedBalance}}"
wallet-cached-balance-updated-on="{{fromWallet.cachedBalanceUpdatedOn}}"
wallet-cached-status="{{fromWallet.cachedStatus}}"
total-balance-sat="{{fromWallet.status.totalBalanceSat}}"></wallet-balance>
<!--<p ng-show="vm.origin.balanceAmount">{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}</p>-->
<!--<formatted-amount value="{{fromWallet.status.totalBalanceStr ? fromWallet.status.totalBalanceStr : ( fromWallet.cachedBalance ? fromWallet.cachedBalance + (fromWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( fromWallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }}"></formatted-amount>-->
</div>
</div>
</div>
</div>
<div class="send-wrapper item">
<div class="row">
<div class="input" ng-class="{'focus': searchFocus}">
@ -22,7 +48,7 @@
</button>
</div>
<div class="col-60">
<button class="button button-standard button-primary button-outline" ui-sref="tabs.send.wallet-to-wallet">
<button class="button button-standard button-primary button-outline" ng-click="startWalletToWalletTransfer()">
<img src="img/icon-w2w.svg"/><br/>
<span translate>Transfer between wallets</span>
</button>

2
www/views/tabs.html
View file

@ -11,7 +11,7 @@
<ion-nav-view name="tab-scan"></ion-nav-view>
</ion-tab>
<ion-tab class="track_tab_open" id="tab_open_send" title="{{'Send'|translate}}" icon-off="ico-send" icon-on="ico-send-selected" ui-sref="tabs.send">
<ion-tab class="track_tab_open" id="tab_open_send" title="{{'Send'|translate}}" icon-off="ico-send" icon-on="ico-send-selected" ng-click="startFreshSend()">
<ion-nav-view name="tab-send"></ion-nav-view>
</ion-tab>

8
www/views/tx-details.html
View file

@ -24,13 +24,13 @@
<span ng-if="btx.action == 'received'" translate>Receiving</span>
</div>
<div class="amount-label">
<div class="amount">{{btx.amountValueStr}} <span class="unit">{{btx.amountUnitStr}}</span></div>
<div class="amount"><formatted-amount value="{{btx.action == 'sent'?'-':''}}{{btx.amountValueStr}}" currency="{{btx.amountUnitStr}}"></formatted-amount></div>
<div class="alternative" ng-click="showRate = !showRate">
<span ng-if="!showRate">{{btx.alternativeAmountStr}}</span>
<span ng-if="!showRate"><formatted-amount value="{{btx.action == 'sent'?'-':''}}{{btx.alternativeAmountStr}}"></formatted-amount></span>
<span ng-if="showRate">
<span ng-if="!rate">...</span>
<span ng-if="rate">
{{rate| currency:'':2}} {{alternativeIsoCode}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
<formatted-amount value="{{rate| currency:'':2}}" currency="{{alternativeIsoCode}}"></formatted-amount> ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
</span>
</span>
</div>
@ -115,7 +115,7 @@
<span class="label" translate>Fee</span>
<span class="m10l">{{btx.feeStr || '...'}}</span>
<span class="item-note m10l">
<span>{{btx.feeFiatStr || '...'}}&nbsp;<span class="fee-rate" ng-if="btx.feeRateStr" translate>- {{btx.feeRateStr}} of the transaction</span></span>
<span><span ng-if="btx.feeFiatStr"><formatted-amount value="{{btx.feeFiatStr}}"></formatted-amount></span><span ng-if="!btx.feeFiatStr">...</span><span class="fee-rate" ng-if="btx.feeRateStr" translate>- {{btx.feeRateStr}} of the transaction</span></span>
</span>
</div>
<div class="item low-fees" ng-if="btx.action == 'received' && btx.lowFees">

38
www/views/walletDetails.html
View file

@ -10,6 +10,11 @@
</button>
</ion-nav-buttons>
</ion-nav-bar>
<style type="text/css">
.button-white-outline.button-outline.active, .button-white-outline.button-outline.activated {
color: {{ wallet.color }};
}
</style>
<div class="bp-content" ng-class="{'status-bar': isCordova}">
@ -34,12 +39,14 @@
on-hold="hideToggle()"
ng-style="{'transform': amountScale}"
ng-class="{amount__balance: amountIsCollapsible}">
<strong class="size-25">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</strong>
<strong class="size-36" ng-show="status.totalBalanceAlternative">
<formatted-amount value="{{status.totalBalanceAlternative}}" currency="{{status.alternativeIsoCode}}"></formatted-amount>
</strong>
<div
class="size-14 amount-alternative"
ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
ng-if="status.totalBalanceStr && wallet.network == 'livenet'"
ng-style="{opacity: altAmountOpacity}">
{{status.totalBalanceStr}}
<formatted-amount value="{{status.totalBalanceStr}}" size-equal="true"></formatted-amount>
</div>
</div>
@ -47,13 +54,16 @@
ng-show="selectedPriceDisplay=='crypto' && !updateStatusError && !wallet.balanceHidden && !wallet.scanning"
on-hold="hideToggle()"
ng-style="{'transform': amountScale}"
ng-if="status.totalBalanceStr"
ng-class="{amount__balance: amountIsCollapsible}">
<strong class="size-25">{{status.totalBalanceStr}}</strong>
<strong class="size-36">
<formatted-amount value="{{status.totalBalanceStr}}"></formatted-amount>
</strong>
<div
class="size-14 amount-alternative"
ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
ng-style="{opacity: altAmountOpacity}">
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
<formatted-amount value="{{status.totalBalanceAlternative}}" currency="{{status.alternativeIsoCode}}"></formatted-amount>
</div>
</div>
@ -86,7 +96,7 @@
</strong>
&nbsp;
<span>
{{status.spendableBalanceAlternative}} {{status.alternativeIsoCode}}
<formatted-amount value="{{status.spendableBalanceAlternative}}" currency="{{status.alternativeIsoCode}}"></formatted-amount>
</span>
</button>
</div>
@ -143,12 +153,12 @@
on-hold="hideToggle()"
ng-style="{'transform': amountScale}"
ng-class="{amount__balance: amountIsCollapsible}">
<strong class="size-25">{{status.totalBalanceStr}}</strong>
<strong ng-if="status.totalBalanceStr" class="size-36"><formatted-amount value="{{status.totalBalanceStr}}"></formatted-amount></strong>
<div
class="size-14 amount-alternative"
ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
ng-style="{opacity: altAmountOpacity}">
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
<formatted-amount value="{{status.totalBalanceAlternative}}" currency="{{status.alternativeIsoCode}}"></formatted-amount>
</div>
</div>
@ -158,12 +168,12 @@
on-hold="hideToggle()"
ng-style="{'transform': amountScale}"
ng-class="{amount__balance: amountIsCollapsible}">
<strong class="size-25">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</strong>
<strong class="size-36"><formatted-amount value="{{status.totalBalanceAlternative}}" currency="{{status.alternativeIsoCode}}"></formatted-amount></strong>
<div
class="size-16 amount-alternative"
ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
class="size-14 amount-alternative"
ng-if="status.totalBalanceStr && wallet.network == 'livenet'"
ng-style="{opacity: altAmountOpacity}">
{{status.totalBalanceStr}}
<formatted-amount value="{{status.totalBalanceStr}}"></formatted-amount>
</div>
</div>
@ -196,7 +206,7 @@
</strong>
&nbsp;
<span>
{{status.spendableBalanceAlternative}} {{status.alternativeIsoCode}}
<formatted-amount value="{{status.spendableBalanceAlternative}}" currency="{{status.alternativeIsoCode}}"></formatted-amount>
</span>
</button>
</div>
@ -205,7 +215,7 @@
<button class="button button-standard button-primary amount__button-balance size-14" ng-click="openBalanceModal()">
<i class="icon ion-ios-checkmark-outline"></i>
<strong>
{{status.spendableBalanceAlternative}} {{status.alternativeIsoCode}}
<formatted-amount value="{{status.spendableBalanceAlternative}}" currency="{{status.alternativeIsoCode}}"></formatted-amount>
</strong>
&nbsp;
<span>