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

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-27 11:44:03 -04:00
commit d4513ba46b
53 changed files with 263 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/views/advancedSettings.html
View file

@ -38,7 +38,7 @@
</div>
<div class="item item-divider" translate>Experimental Features</div>
<div class="settings-explaination">
<div class="settings-explanation">
<div class="settings-description" translate>
These features aren't quite ready for primetime. They may change, stop working, or disappear at any time.
</div>

11
www/views/confirm.html
View file

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds}">
<ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds && !noMatchingWallet}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -46,10 +46,13 @@
<span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span> -->
</span>
</div>
<div class="text-center" ng-show="noMatchingWallet">
<span class="badge badge-energized" translate>No wallets available</span>
</div>
<div class="text-center" ng-show="insuffientFunds">
<span class="badge badge-energized" translate>Insufficient funds</span>
</div>
<a class="item item-icon-right" ng-hide="insuffientFunds" ng-click="showWalletSelector()">
<a class="item item-icon-right" ng-hide="insuffientFunds || noMatchingWallet" ng-click="showWalletSelector()">
<span class="label" translate>From</span>
<div class="wallet">
<i class="icon big-icon-svg">
@ -59,14 +62,14 @@
</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item single-line item-icon-right" ng-hide="insuffientFunds" ng-click="showDescriptionPopup()">
<a class="item single-line item-icon-right" ng-hide="insuffientFunds || noMatchingWallet" ng-click="showDescriptionPopup()">
<span class="label" translate>Add Memo</span>
<span class="item-note m10l">
{{description}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item single-line" ng-hide="insuffientFunds">
<div class="item single-line" ng-hide="insuffientFunds || noMatchingWallet">
<span class="label" translate>Fee: {{feeLevel}}</span>
<span class="item-note">
{{fee || '...'}}

18
www/views/glidera.html
View file

@ -4,8 +4,8 @@
</ion-nav-back-button>
<ion-nav-title>Glidera</ion-nav-title>
<ion-nav-buttons side="secondary">
<button class="button back-button" ng-show="token" ui-sref="tabs.buyandsell.glidera.preferences">
<i class="icon ion-ios-gear-outline"></i>
<button class="button no-border" ui-sref="tabs.buyandsell.glidera.preferences">
<i class="icon ion-ios-settings"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
@ -28,7 +28,7 @@
</div>
<div class="text-center small-10 small-centered columns" ng-show="!showOauthForm">
<p class="glidera-lead">You can buy and sell Bitcoin with a US bank account directly in this app.</p>
<p class="glidera-text">Connect your Glidera account to get started.</p>
<button class="button button-standard button-primary"
@ -76,32 +76,28 @@
</a>
</div>
<div class="list"
<div class="list card"
ng-show="status && status.userCanTransact">
<a ng-show="status.userCanBuy"
class="item item-icon-right"
href ui-sref="tabs.buyandsell.glidera.buy">
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="30">
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="45" class="item-img-buy">
Buy Bitcoin
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-right"
ng-show="status.userCanSell"
href ui-sref="tabs.buyandsell.glidera.sell">
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="30">
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="45" class="item-img-sell">
Sell Bitcoin
<i class="icon bp-arrow-right"></i>
</a>
</div>
<div class="list card" ng-show="permissions && permissions.transaction_history">
<div class="list card" ng-show="permissions && permissions.transaction_history && txs.length > 0">
<div class="item item-heading">
Activity
</div>
<div ng-show="txs.length == 0 "
class="item">
No activity in your account
</div>
<a ng-repeat="tx in txs"
ng-click="glidera.openTxModal(token, tx)"
class="item">

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

@ -7,7 +7,7 @@
<div class="popup-modal-heading" translate>Backup Needed</div>
<div class="popup-modal-message" translate>Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup.</div>
<button class="button button-clear" ng-click="doBackup()" translate>Backup now</button>
<button class="button button-secondary button-clear" ng-click="close()" translate>Remind me later</button>
<button class="button button-secondary button-clear" ng-click="close()" translate>I'll do it later</button>
</div>
</div>
</div>

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

@ -4,8 +4,8 @@
{{tx.amountStr}}
</div>
<span ng-show="!tx.merchant">
<span ng-show="addressbook[tx.toAddress] && addressbook[tx.toAddress].name && !tx.message">
{{addressbook[tx.toAddress].name}}
<span ng-show="addressbook[tx.toAddress] && !tx.message">
{{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}}
</span>
<span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
{{tx.message}}

9
www/views/modals/tx-details.html
View file

@ -41,6 +41,12 @@
<div>{{wallet.name}}</div>
</div>
</div>
<div class="item single-line">
<span class="label" translate>Created by</span>
<span class="item-note">
{{btx.creatorName}} <time>{{ (btx.ts || btx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
</span>
</div>
<a class="item single-line item-icon-right" ng-hide="insuffientFunds" ng-click="showCommentPopup()">
<span class="label" translate>Memo</span>
<span class="item-note m10l">
@ -54,7 +60,6 @@
{{btx.feeStr}}
</span>
</div>
<div ng-if="actionList[0]">
<div class="item item-divider" translate>Timeline</div>
<div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList | orderBy: 'time' :true track by $index">
@ -72,7 +77,7 @@
</div>
<div>
<span class="item-note">
<time>{{ a.time * 1000 | amDateFormat:'hh:mm a'}}</time>
<time>{{ a.time * 1000 | amTimeAgo}}</time>
</span>
</div>
</div>

6
www/views/modals/txp-details.html
View file

@ -85,8 +85,8 @@
{{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
</span>
</div>
<div class="item" ng-show="tx.message">
{{'Memo'|translate}}
<div class="item single-line" ng-show="tx.message">
<span class="label" translate>{{'Memo'|translate}}</span>
<span class="item-note">
{{tx.message}}
</span>
@ -141,7 +141,7 @@
</div>
<div>
<span class="item-note">
<time>{{ a.time * 1000 | amDateFormat:'hh:mm a'}}</time>
<time>{{ a.time * 1000 | amTimeAgo}}</time>
</span>
</div>
</div>

2
www/views/paperWallet.html
View file

@ -7,7 +7,7 @@
<ion-content>
<div class="settings" class="row" ng-show="needsBackup">
<div class="settings-explaination">
<div class="settings-explanation">
<div class="settings-heading" translate>Backup Needed</div>
<div class="settings-description" translate>
Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup.

2
www/views/preferencesAlias.html
View file

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>
<div class="settings-explaination">
<div class="settings-explanation">
<div class="settings-heading" translate>What do you call this wallet?</div>
<div class="settings-description" translate>When this wallet was created, it was called &ldquo;{{walletName}}&rdquo;. You can change the name displayed on this device below.</div>
</div>

2
www/views/preferencesEmail.html
View file

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>
<div class="settings-explaination">
<div class="settings-explanation">
<div class="settings-description" translate>
You'll receive email notifications about payments sent and received from {{wallet.name}}.
</div>

2
www/views/preferencesFee.html
View file

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>
<div class="settings-explaination">
<div class="settings-explanation">
<div class="settings-heading" translate>Bitcoin transactions include a fee collected by miners on the network.</div>
<div class="settings-description" translate>The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy.</div>
<div class="estimates" ng-repeat="fee in feeLevels.livenet" ng-if="fee.level == currentFeeLevel">

10
www/views/preferencesHistory.html
View file

@ -5,7 +5,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>
<div class="item item-divider"></div>
<div class="item item-divider" ng-show="!isCordova"></div>
<a class="item ng-hide" href ng-show="csvReady && !isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{wallet.name}}.csv">
<span translate>Export to file</span>
</a>
@ -18,8 +18,14 @@
{{err | translate}}
</span>
</a>
<div class="item item-divider"></div>
<a class="item" ng-click="clearTransactionHistory()">
<span class="assertive" translate>Clear cache</span>
<span translate>Clear cache</span>
</a>
<div class="settings-explanation">
<div class="settings-description" translate>
The transaction history and every new incoming transaction are cached in the app. This feature clean this up and synchronizes again from the server
</div>
</div>
</ion-content>
</ion-view>

4
www/views/preferencesInformation.html
View file

@ -90,7 +90,7 @@
<div class="item item-divider" translate>
Latest Wallet Addresses
</div>
<div class="settings-explaination">
<div class="settings-explanation">
<div class="settings-description" translate>
Only &ldquo;main&rdquo; addresses are shown below. This excludes &ldquo;change&rdquo; address.
</div>
@ -99,7 +99,7 @@
<span>{{a.address}}</span>
<span class="item-note">{{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}</span>
</div>
<div class="settings-explaination">
<div class="settings-explanation">
<div class="settings-description" translate>
Please note: due to resource constraints, this list of addresses is not verified locally. A compromised BWS node could return addresses which are not controlled by this wallet.
</div>

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

@ -10,6 +10,9 @@
spinner="ios-small"
on-refresh="onRefresh()">
</ion-refresher>
<div class="release" ng-show="newRelease" ng-click="openExternalLink('https://github.com/bitpay/copay/releases/latest', true, 'Update Available', 'An update to this app is available. For your security, please update to the latest version.', 'View Update', 'Go Back')">
<span translate>An update to this app is available</span><span><i class="icon bp-arrow-right"></i></span>
</div>
<div class="list card homeTip" ng-if="homeTip">
<div class="item item-icon-right item-heading">
<a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>

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

@ -46,7 +46,7 @@
</div>
</article>
<article ng-if="wallet && wallet.isComplete()">
<div class="row backup" ng-show="!wallet.showBackupNeededModal && wallet.needsBackup" ng-click="goToBackupFlow()">
<div class="row backup" ng-show="wallet.needsBackup" ng-click="openBackupNeededModal()">
<div class="text-center col center-block">
<i class="icon ion-alert"></i><span translate>Wallet not backed up</span><i class="icon ion-ios-arrow-thin-right"></i>
</div>

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

@ -2,73 +2,75 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Send' | translate}}</ion-nav-title>
</ion-nav-bar>
<ion-content scroll="false" class="ng-hide" ng-show="!hasFunds">
<div class="zero-state">
<i class="icon zero-state-icon">
<img src="img/tab-icons/ico-send-selected.svg"/>
</i>
<div class="zero-state-heading" translate>Start sending bitcoin</div>
<div class="zero-state-description" ng-show="hasWallets" translate>To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service.</div>
<div class="zero-state-description" ng-show="!hasWallets" translate>To get started, you'll need to create a bitcoin wallet and get some bitcoin.</div>
<div class="zero-state-cta">
<button class="button button-standard button-primary" ng-click="buyBitcoin()" ng-show="hasWallets" translate>Buy Bitcoin</button>
<button class="button button-standard button-primary" ng-click="createWallet()" ng-show="!hasWallets" translate>Create bitcoin wallet</button>
<button class="button button-standard button-secondary" ui-sref="tabs.receive" ng-show="hasWallets" translate>Show bitcoin address</button>
</div>
</div>
</ion-content>
<ion-content class="ng-hide has-funds" ng-show="hasFunds">
<div class="item item-heading send-heading" translate>Recipient</div>
<label class="item item-input bitcoin-address">
<i class="icon icon-svg placeholder-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
<div class="qr-scan-icon" ng-style="{'width': '100%'}">
<a on-tap="openScanner()" ng-style="{'top': '6px'}">
<i class="icon ion-qr-scanner"></i>
</a>
<input type="text" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur>
</div>
</label>
<div class="card">
<div class="item item-icon-right item-heading">
<span translate>Contacts</span>
<a ng-if="hasContacts" ui-sref="tabs.send.addressbook">
<i class="icon ion-ios-plus-empty list-add-button"></i>
</a>
</div>
<div class="list">
<a class="item item-icon-left item-icon-right" ng-if="!hasContacts" ui-sref="tabs.send.addressbook">
<i class="icon big-icon-svg">
<gravatar class="send-gravatar" name="" width="30" email=""></gravatar>
</i>
<span translate>Add a Contact</span>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
<i class="icon big-icon-svg">
<gravatar class="send-gravatar" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
</i>
{{item.name}}
<i class="icon bp-arrow-right"></i>
</a>
<div class="show-more" ng-if="contactsShowMore" ng-click="showMore()" translate>
Show more
<ion-content>
<div ng-if="hasFunds == false" class="zero-state">
<div>
<i class="icon zero-state-icon">
<img src="img/tab-icons/ico-send-selected.svg"/>
</i>
<div class="zero-state-heading" translate>Start sending bitcoin</div>
<div class="zero-state-description" ng-show="hasWallets" translate>To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service.</div>
<div class="zero-state-description" ng-show="!hasWallets" translate>To get started, you'll need to create a bitcoin wallet and get some bitcoin.</div>
<div class="zero-state-cta">
<button class="button button-standard button-primary" ng-click="buyBitcoin()" ng-show="hasWallets" translate>Buy Bitcoin</button>
<button class="button button-standard button-primary" ng-click="createWallet()" ng-show="!hasWallets" translate>Create bitcoin wallet</button>
<button class="button button-standard button-secondary" ui-sref="tabs.receive" ng-show="hasWallets" translate>Show bitcoin address</button>
</div>
</div>
</div>
<div ng-if="hasFunds" class="has-funds">
<div class="item item-heading send-heading" translate>Recipient</div>
<label class="item item-input bitcoin-address">
<i class="icon icon-svg placeholder-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
<div class="qr-scan-icon" ng-style="{'width': '100%'}">
<a on-tap="openScanner()" ng-style="{'top': '6px'}">
<i class="icon ion-qr-scanner"></i>
</a>
<input type="text" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur>
</div>
</label>
<div class="card">
<div class="item item-icon-right item-heading">
<span translate>Contacts</span>
<a ng-if="hasContacts" ui-sref="tabs.send.addressbook">
<i class="icon ion-ios-plus-empty list-add-button"></i>
</a>
</div>
<div class="list">
<a class="item item-icon-left item-icon-right" ng-if="!hasContacts" ui-sref="tabs.send.addressbook">
<i class="icon big-icon-svg">
<gravatar class="send-gravatar" name="" width="30" email=""></gravatar>
</i>
<span translate>Add a Contact</span>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
<i class="icon big-icon-svg">
<gravatar class="send-gravatar" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
</i>
{{item.name}}
<i class="icon bp-arrow-right"></i>
</a>
<div class="show-more" ng-if="contactsShowMore" ng-click="showMore()" translate>
Show more
</div>
</div>
</div>
<div class="card" ng-if="hasWallets && !oneWallet">
<div class="list">
<div class="item item-heading">
<span translate>Transfer to Wallet</span>
<div class="card" ng-if="hasWallets && !oneWallet">
<div class="list">
<div class="item item-heading">
<span translate>Transfer to Wallet</span>
</div>
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.isWallet" ng-click="goToAmount(item)">
<!-- <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> -->
<i class="icon big-icon-svg" ng-if="item.isWallet">
<img src="img/icon-wallet.svg" ng-style="{'background-color': item.color}" class="bg"/>
</i>
{{item.name}}
<i class="icon bp-arrow-right"></i>
</a>
</div>
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.isWallet" ng-click="goToAmount(item)">
<!-- <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> -->
<i class="icon big-icon-svg" ng-if="item.isWallet">
<img src="img/icon-wallet.svg" ng-style="{'background-color': item.color}" class="bg"/>
</i>
{{item.name}}
<i class="icon bp-arrow-right"></i>
</a>
</div>
</div>
</ion-content>

8
www/views/walletDetails.html
View file

@ -99,7 +99,7 @@
<div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
<span ng-include="'views/includes/txp.html'"></span>
</div>
<div class="item item-footer" ng-show="status.lockedBalanceSat">
<div class="item item-footer description" ng-show="status.lockedBalanceSat">
<span translate>Total Locked Balance</span>:
<b>{{status.lockedBalanceStr}} </b>
<span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
@ -158,10 +158,10 @@
<div ng-show="btx.action == 'sent'" class="ellipsis">
<div ng-if="btx.message">{{btx.message}}</div>
<div ng-if="!btx.message && btx.note.body">{{btx.note.body}}</div>
<div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo] && addressbook[btx.addressTo].name">
{{addressbook[btx.addressTo].name}}
<div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo]">
{{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}}
</div>
<div ng-if="!btx.message && !btx.note.body && !(addressbook[btx.addressTo] && addressbook[btx.addressTo].name)" translate>Sent</div>
<div ng-if="!btx.message && !btx.note.body && !addressbook[btx.addressTo]" translate>Sent</div>
</div>
<div ng-show="btx.action == 'moved'" class="ellipsis">