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

Merge branch 'master' of https://github.com/bitpay/copay into v3.5.0

Browse source
This commit is contained in:
magmahindenburg 2017-06-16 11:20:33 +09:00
commit 19824e8fde
73 changed files with 200 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,9 +8,7 @@
<div class="tx-title">
<div class="ellipsis">
<div class="tx-message ellipsis">{{tx.merchant.name || 'Unknown Merchant'}}</div>
<!-- Removed to cleanup look and since intl card does not provide location.
<div class="tx-location ellipsis" ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.location}}</div>
-->
<div ng-show="tx.pending && tx.transactionId" class="size-12 tx-amount--pending">
<div ng-click="bitpayCard.viewOnBlockchain(tx.transactionId)">View Confirmation Status</div>
</div>

5
www/views/modals/fingerprintCheck.html
View file

@ -1,10 +1,13 @@
<ion-modal-view id="pin">
<div class="content">
<div class="block-text row"></div>
<div class="block-text row">
<div class="message" translate>Verify your identity</div>
</div>
<div class="app-icon">
<i class="icon big-icon-svg">
<div class="bg"></div>
</i>
</div>
<button style="margin-top: 15%" class="button button-standard button-primary" ng-click="checkFingerprint()" translate>Scan again</button>
</div>
</ion-modal-view>

20
www/views/tab-import-phrase.html
View file

@ -49,14 +49,28 @@
ng-model="formData.derivationPath">
</label>
<label class="item item-input item-stacked-label">
<span class="input-label" translate>Wallet Service URL</span>
<input type="text" ng-model="formData.bwsurl">
<ion-toggle ng-model="fromHardwareWallet.value" toggle-class="toggle-positive">
<span class="toggle-label" translate>From Hardware Wallet</span>
</ion-toggle>
<label class="item item-input item-select" ng-if="fromHardwareWallet.value">
<div class="input-label" translate>
Wallet Type
</div>
<select class="m10t" ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
</label>
<ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive">
<span translate>Testnet</span>
</ion-toggle>
<label class="item item-input item-stacked-label">
<span class="input-label" translate>Wallet Service URL</span>
<input type="text" ng-model="formData.bwsurl">
</label>
</div>
</div>

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

@ -5,11 +5,15 @@
<ion-content>
<div ng-if="hasFunds">
<div class="item item-heading send-heading" translate>Recipient</div>
<div class="item item-icon-left item-icon-right input">
<i class="icon icon-svg left"><img src="img/icon-bitcoin-symbol.svg"></i>
<input type="text" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur>
<i class="icon icon-svg qr" on-tap="openScanner()"><img src="img/scan-ico.svg"/></i>
<div class="send-header-wrapper">
<div class="item item-heading send-heading"><span translate>Recipient</span></div>
<div class="item input search-wrapper" ng-class="{'focus': searchFocus}">
<i class="icon icon-svg abs-v-center"><img class="svg" src="img/icon-bitcoin-symbol.svg"></i>
<div class="item-icon-right">
<input type="text" class="search-input" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur ng-focus="searchInFocus()" ng-blur="searchBlurred()">
<i class="icon icon-svg qr abs-v-center separator-left" on-tap="openScanner()"><img src="img/scan-ico.svg"></i>
</div>
</div>
</div>
</div>

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

@ -89,7 +89,7 @@
<i class="icon bp-arrow-right"></i>
</a>
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova">
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova || isDevel">
<i class="icon ion-ios-locked-outline" ng-if="locked"></i>
<i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i>
<span class="setting-title">{{'Lock App' | translate}}</span>