Merge https://github.com/bitpay/copay into copay-cash
This commit is contained in:
commit
a0261a6c9f
146 changed files with 16800 additions and 5578 deletions
9
www/views/includes/cash.html
Normal file
9
www/views/includes/cash.html
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<label class="item item-input item-select">
|
||||
<div class="input-label" translate>
|
||||
Coin
|
||||
</div>
|
||||
<select ng-model="formData.coin" ng-change="switchTestnetOff()">
|
||||
<option value="btc">BTC</option>
|
||||
<option value="bch">BCH</option>
|
||||
</select>
|
||||
</label>
|
||||
2
www/views/includes/walletIcon.html
Normal file
2
www/views/includes/walletIcon.html
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
<img ng-if="wallet.network == 'testnet'" src="img/icon-wallet-testnet.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||
<img ng-if="wallet.network != 'testnet'" src="img/icon-wallet.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||
|
|
@ -1,9 +1,15 @@
|
|||
|
||||
<ion-spinner class="spinner-dark recent right" icon="crescent" ng-show="updatingStatus || (updatingTxHistory && updatingTxHistoryProgress<=5)" ></ion-spinner>
|
||||
<div class="actions" ng-show="(walletNotRegistered || updateStatusError)">
|
||||
<a ng-show="walletNotRegistered" ng-click="recreate()" translate>Tap to recreate</a>
|
||||
<a ng-show="updateStatusError" ng-click="updateAll(true)" translate>Tap to retry</a>
|
||||
</div>
|
||||
<ion-spinner class="spinner-dark recent right" icon="crescent" ng-show="(updatingStatus || updatingTxHistory) &&
|
||||
!walletNotRegistered && !updateStatusError && !updateTxHistoryError"></ion-spinner>
|
||||
|
||||
<div>
|
||||
<span ng-show="wallet.status.wallet.singleAddress" class="size-12"><span translate>Auditable</span></span>
|
||||
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.network != 'livenet'" src="img/icon-testnet-white.svg">
|
||||
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.network != 'livenet'" src="img/icon-text-testnet-white.svg">
|
||||
<img style="height:0.6em; margin-right: 1px;" ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" src="img/icon-read-only-white.svg">
|
||||
|
||||
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.getPrivKeyExternalSourceName() == 'trezor'" src="img/icon-trezor-white.svg">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<div class="wallet-item">
|
||||
<i class="icon big-icon-svg circle">
|
||||
<img src="img/icon-wallet.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||
</i>
|
||||
<i class="icon big-icon-svg circle" ng-include="'views/includes/walletIcon.html'"></i>
|
||||
<div class="name">
|
||||
{{wallet.name || wallet.id}}
|
||||
<span class="size-12 text-light" ng-show="wallet.n > 1">
|
||||
|
|
@ -12,4 +10,3 @@
|
|||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
22
www/views/includes/walletList.html
Normal file
22
www/views/includes/walletList.html
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
|
||||
<span>
|
||||
{{wallet.name || wallet.id}}
|
||||
</span>
|
||||
<p>
|
||||
<span ng-if="!wallet.isComplete()" class="assertive" translate>
|
||||
Incomplete
|
||||
</span>
|
||||
<span ng-if="wallet.isComplete()">
|
||||
<span ng-if="!wallet.balanceHidden && !wallet.scanning"> {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( 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>
|
||||
<span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
|
||||
{{wallet.m}}-of-{{wallet.n}}
|
||||
</span>
|
||||
<i ng-if="!wallet.balanceHidden && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)" class="tab-home__wallet__status-icon ion-ios-timer-outline"></i>
|
||||
<span class="assertive" ng-if="wallet.error">{{wallet.error}}</span>
|
||||
</span>
|
||||
|
||||
</p>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
14
www/views/includes/walletListSettings.html
Normal file
14
www/views/includes/walletListSettings.html
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<i class="icon big-icon-svg circle" ng-include="'views/includes/walletIcon.html'"></i>
|
||||
<span>
|
||||
{{wallet.name || wallet.id}}
|
||||
<span class="size-12 text-light" ng-show="wallet.n > 1">
|
||||
{{wallet.m}}-of-{{wallet.n}}
|
||||
</span>
|
||||
</span>
|
||||
<span class="right text-light assertive" ng-show="!wallet.isComplete()">
|
||||
{{'Incomplete' | translate}}
|
||||
</span>
|
||||
<span class="right text-light assertive" ng-show="wallet.isComplete() && wallet.needsBackup">
|
||||
{{'Backup needed' | translate}}
|
||||
</span>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
|
|
@ -1,32 +1,70 @@
|
|||
<action-sheet action-sheet-show="show" class="wallet-selector">
|
||||
<action-sheet action-sheet-show="show" class="wallet-selector" ng-init="walletsBtc = []; walletsBch = []">
|
||||
<img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
|
||||
<div class="header">{{title}}</div>
|
||||
|
||||
<span ng-repeat="wallet in wallets track by $index"
|
||||
ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)"></span>
|
||||
|
||||
<div class="header" ng-show="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
|
||||
|
||||
<div class="subheader" ng-if="walletsBtc[0] && walletsBch[0]" translate>
|
||||
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
|
||||
<span translate>Bitcoin Wallets</span>
|
||||
</div>
|
||||
<a
|
||||
ng-repeat="w in wallets track by $index"
|
||||
ng-repeat="wallet in walletsBtc track by $index"
|
||||
class="item item-icon-left item-big-icon-left item-icon-right wallet"
|
||||
ng-click="selectWallet(w)"
|
||||
ng-click="selectWallet(wallet)"
|
||||
>
|
||||
<i class="icon big-icon-svg">
|
||||
<img src="img/icon-wallet.svg" ng-class="{'wallet-background-color-default': !w.color}" ng-style="{'background-color': w.color}" class="bg">
|
||||
</i>
|
||||
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
|
||||
<div class="wallet-inner">
|
||||
<div class="wallet-details">
|
||||
<div class="wallet-name">
|
||||
{{w.name}}
|
||||
{{wallet.name}}
|
||||
</div>
|
||||
<p class="wallet-balance">
|
||||
<span ng-if="!w.isComplete()" class="assertive" translate>
|
||||
<span ng-if="!wallet.isComplete()" class="assertive" translate>
|
||||
Incomplete
|
||||
</span>
|
||||
<span ng-if="w.isComplete()">
|
||||
<span ng-if="!w.balanceHidden">{{w.status.availableBalanceStr}}</span>
|
||||
<span ng-if="w.balanceHidden" translate>[Balance Hidden]</span>
|
||||
<span ng-if="wallet.isComplete()">
|
||||
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
|
||||
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</p>
|
||||
</div>
|
||||
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === w">
|
||||
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === wallet">
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<div class="subheader" ng-if="walletsBch[0] && walletsBtc[0]">
|
||||
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22">
|
||||
<span translate>Bitcoin Cash Wallets</span>
|
||||
</div>
|
||||
<a
|
||||
ng-repeat="wallet in walletsBch track by $index"
|
||||
class="item item-icon-left item-big-icon-left item-icon-right wallet"
|
||||
ng-click="selectWallet(wallet)"
|
||||
>
|
||||
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
|
||||
<div class="wallet-inner">
|
||||
<div class="wallet-details">
|
||||
<div class="wallet-name">
|
||||
{{wallet.name}}
|
||||
</div>
|
||||
<p class="wallet-balance">
|
||||
<span ng-if="!wallet.isComplete()" class="assertive" translate>
|
||||
Incomplete
|
||||
</span>
|
||||
<span ng-if="wallet.isComplete()">
|
||||
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
|
||||
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</p>
|
||||
</div>
|
||||
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === wallet">
|
||||
</div>
|
||||
</a>
|
||||
</action-sheet>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue