Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser
# Conflicts: # www/views/glidera.html
This commit is contained in:
commit
7becb504f4
59 changed files with 500 additions and 28777 deletions
|
|
@ -29,7 +29,7 @@
|
|||
<span class="input-label" translate>Email</span>
|
||||
<input type="text"
|
||||
id="email"
|
||||
placeholder="name@example.com"
|
||||
placeholder="name@example.com"
|
||||
name="email"
|
||||
ng-model="addressbookEntry.email">
|
||||
</label>
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
|
||||
<div class="padding">
|
||||
<button type="submit"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-click="add(addressbookEntry)"
|
||||
ng-disabled="!addressbookForm.$valid" translate>
|
||||
Save
|
||||
|
|
|
|||
|
|
@ -52,9 +52,7 @@
|
|||
You haven’t added any contacts to your address book yet. Get started by adding your first one.
|
||||
</p>
|
||||
</div>
|
||||
<div class="row">
|
||||
<button class="button button-block button-positive col" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
|
||||
</div>
|
||||
<button class="button button-standard button-primary" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
ng-click="sendTo()" translate>
|
||||
Send Money
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
<div ng-if="!giftCards" class="m20t padding text-center">
|
||||
|
||||
<button class="button button-block button-positive" ui-sref="tabs.giftcards.amazon.buy">
|
||||
<button class="button button-standard button-primary" ui-sref="tabs.giftcards.amazon.buy">
|
||||
Buy now
|
||||
</button>
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
<div class="input-label" translate>In order to verify your wallet backup, please type your password.</div>
|
||||
<input type="text" id="passphrase" ng-model="data.passphrase" autocapitalize="off" spellcheck="false" autofocus/>
|
||||
</label>
|
||||
<button ng-disabled="!data.passphrase" class="button button-block button-positive" ng-click="goToStep(4);" translate>Confirm
|
||||
<button ng-disabled="!data.passphrase" class="button button-standard button-primary" ng-click="goToStep(4);" translate>Confirm
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
|
||||
|
||||
<div class="padding">
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
ng-disabled="!formData.fiat"
|
||||
type="submit">
|
||||
Buy now
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
<span ng-show="buy.giftCard.status == 'FAILURE'">
|
||||
This failure could not be recoverable. Request your refund from your list of cards
|
||||
</span>
|
||||
<button class="button button-block button-positive" ng-click="$root.go('amazon')">
|
||||
<button class="button button-standard button-primary" ng-click="$root.go('amazon')">
|
||||
Back
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
...
|
||||
</div>
|
||||
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
type="submit"
|
||||
ng-disabled="limits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading">
|
||||
Continue
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
<input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
|
||||
</label>
|
||||
</div>
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
type="submit" ng-disabled="buyForm.$invalid || buy.loading">
|
||||
Buy
|
||||
</button>
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.
|
||||
</p>
|
||||
|
||||
<button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button>
|
||||
<button class="button button-standard button-primary" ui-sref="tabs.buyandsell.glidera">OK</button>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
<div ng-show="secret">
|
||||
<div class="text-center m10t" ng-if="isCordova">
|
||||
<button class="button button-outline button-positive"
|
||||
<button class="button button-outline button-primary"
|
||||
ng-click="shareSecret()">
|
||||
<i class="icon ion-ios-upload-outline"></i>
|
||||
<span translate>Share invitation</span>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
</p>
|
||||
|
||||
<p class="m20t text-gray size-12">Connect your Glidera account to get started</p>
|
||||
|
||||
<button class="button button-block button-positive"
|
||||
ng-click="openExternalLink(glidera.getAuthenticateUrl(), 'Glidera authentication'); showOauthForm = true">
|
||||
Connect to Glidera
|
||||
|
|
@ -65,7 +64,7 @@
|
|||
</div>
|
||||
<div class="col">
|
||||
<input
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
type="submit"
|
||||
value="Get started"
|
||||
ng-disabled="oauthCodeForm.$invalid">
|
||||
|
|
|
|||
|
|
@ -3,25 +3,11 @@
|
|||
<div class="popup-modal-header-img-warning popup-modal-header-img"></div>
|
||||
</div>
|
||||
<div class="popup-modal-content popup-modal-content-warning">
|
||||
<div class="text-center">
|
||||
<h5 translate>Backup Needed</h5>
|
||||
<p 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.</p>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<button
|
||||
class="button button-clear expand"
|
||||
ng-click="close()"
|
||||
translate>Not now
|
||||
</button>
|
||||
</div>
|
||||
<div class="col">
|
||||
<button
|
||||
class="button button-clear expand"
|
||||
ng-click="doBackup()"
|
||||
translate>Backup wallet now
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<button class="button button-block button-positive" ng-disabled="sendStatus">
|
||||
<button class="button button-standard button-primary" ng-disabled="sendStatus">
|
||||
<span ng-if="!sendStatus">
|
||||
<ng-transclude></ng-transclude>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@
|
|||
</div> <!-- advanced -->
|
||||
</div> <!-- list -->
|
||||
|
||||
<button type="submit" class="button button-block button-positive"
|
||||
<button type="submit" class="button button-standard button-primary"
|
||||
ng-disabled="joinForm.$invalid || ((encrypt && !passwordSaved) || encrypt && ((join.seedSourceId == 'new' && !createPassphrase) || (join.seedSourceId == 'set' && !passphrase)))"
|
||||
translate>Join
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
|
||||
<div class="list">
|
||||
<div class="item item-icon-left" ng-show="btx.action == 'sent'">
|
||||
<i class="icon ion-social-bitcoin-outline"></i>
|
||||
<i class="icon icon-svg"><img src="img/icon-bitcoin-symbol.svg"></i>
|
||||
<div ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" copy-to-clipboard="btx.addressTo">
|
||||
<span ng-if="btx.merchant">
|
||||
<span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span>
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item" ng-if="btx.action != 'received' && btx.feeLevel" copy-to-clipboard="btx.feeStr">
|
||||
<div class="item" ng-if="btx.action != 'received' && btx.feeStr" copy-to-clipboard="btx.feeStr">
|
||||
{{'Fee'|translate}}: {{btx.feeStr}}
|
||||
<span class="item-note">
|
||||
<span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
<span class="label gray radius" ng-show="btx.safeConfirmed">
|
||||
{{btx.safeConfirmed}}
|
||||
</span>
|
||||
<span translate>Confirmations</span>
|
||||
<span ng-show="btx.confirmations && btx.confirmations > 0" translate>Confirmations</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<ion-modal-view id="txp-details" ng-controller="txpDetailsController" ng-init="init()">
|
||||
<ion-header-bar align-title="center" class="bar-royal" ng-style="{'background-color': wallet.color}">
|
||||
<ion-header-bar align-title="center" class="bar-royal">
|
||||
<button class="button button-clear" ng-click="close()">
|
||||
Close
|
||||
</button>
|
||||
|
|
@ -11,15 +11,15 @@
|
|||
</button>
|
||||
</ion-header-bar>
|
||||
|
||||
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && isCordova}">
|
||||
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && !hasClick}">
|
||||
<div class="list">
|
||||
<div class="item head">
|
||||
<div class="sending-label">
|
||||
<i class="icon ion-arrow-up-c"></i>
|
||||
<img src="img/sending-icon.svg">
|
||||
<span translate>Sending</span>
|
||||
</div>
|
||||
<div class="amount-label">
|
||||
<div class="amount">{{tx.amountStr}}</div>
|
||||
<div class="amount">{{displayAmount}} <span class="unit">{{displayUnit}}</span></div>
|
||||
<div class="alternative" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -50,9 +50,9 @@
|
|||
|
||||
<div class="info">
|
||||
<div class="item">
|
||||
<span translate>To</span>
|
||||
<span class="label" translate>To</span>
|
||||
<span class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
|
||||
<i class="icon ion-social-bitcoin"></i>
|
||||
<img src="img/icon-bitcoin-small.svg">
|
||||
<contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{tx.toAddress}}"></contact>
|
||||
<span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span>
|
||||
</span>
|
||||
|
|
@ -71,18 +71,18 @@
|
|||
</div>
|
||||
|
||||
<div class="item">
|
||||
{{'From'|translate}}
|
||||
<span class="item-note">
|
||||
<i class="icon big-icon-svg right">
|
||||
<span class="label" translate>From</span>
|
||||
<div class="wallet">
|
||||
<i class="icon big-icon-svg">
|
||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||
</i>
|
||||
<div class="m10t m55r">{{wallet.name}}</div>
|
||||
</span>
|
||||
<div>{{wallet.name}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
{{'Created by'|translate}}
|
||||
<div class="item single-line">
|
||||
<span class="label" translate>Created by</span>
|
||||
<span class="item-note">
|
||||
{{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||
{{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">
|
||||
|
|
@ -91,8 +91,8 @@
|
|||
{{tx.message}}
|
||||
</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
{{'Fee'|translate}}
|
||||
<div class="item single-line">
|
||||
<span class="label" translate>Fee</span>
|
||||
<span class="item-note">
|
||||
{{tx.feeStr}}
|
||||
</span>
|
||||
|
|
@ -129,20 +129,20 @@
|
|||
</div>
|
||||
<div ng-if="actionList[0]">
|
||||
<div class="item item-divider" translate>Timeline</div>
|
||||
|
||||
<div class="item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList track by $index">
|
||||
<div class="row">
|
||||
<div class="col col-10">
|
||||
<span id="timeline-icon">{{$index + 1}}</span>
|
||||
<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' track by $index">
|
||||
<div class="timeline-content">
|
||||
<div class="timeline-content__icon">
|
||||
<div class="rejected" ng-if="a.type === 'reject'">!</div>
|
||||
<div ng-if="a.type !== 'reject'">{{$index + 1}}</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div>{{a.description}}</div>
|
||||
<div>
|
||||
<span>{{a.by}}</span>
|
||||
<span class="item-note">
|
||||
<time>{{ a.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||
</span>
|
||||
</div>
|
||||
<div class="timeline-content__label">
|
||||
<div class="action">{{a.description}}</div>
|
||||
<div class="name">{{a.by}}</div>
|
||||
</div>
|
||||
<div>
|
||||
<span class="item-note">
|
||||
<time>{{ a.time * 1000 | amDateFormat:'hh:mm a'}}</time>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
Click to accept
|
||||
</click-to-accept>
|
||||
<div class="m30t text-center" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
|
||||
<div class="size-12 padding" ng-show="!tx.isGlidera && isShared" translate>
|
||||
<div class="size-12 padding proposal-deletion-help" ng-show="!tx.isGlidera && isShared" translate>
|
||||
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
|
||||
</div>
|
||||
<button class="button button-assertive button-clear" ng-click="remove()" ng-disabled="loading">
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
<button type="submit"
|
||||
ng-disabled="scanning || !scannedKey"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-style="{'background-color': wallet.color}"
|
||||
translate>Scan Wallet Funds
|
||||
</button>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<button
|
||||
ng-show="balanceSat > 0"
|
||||
ng-disabled="sending"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-style="{'background-color': wallet.color}"
|
||||
ng-click="sweepWallet()"
|
||||
translate>Sweep Wallet
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
|
||||
<button
|
||||
ng-show="balanceSat <= 0 && scanned"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-style="{'background-color': wallet.color}"
|
||||
ng-click="init()"
|
||||
translate>Scan Again
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</label>
|
||||
</div>
|
||||
<button type="submit"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-disabled="aliasForm.$invalid" translate>
|
||||
Save
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -15,6 +15,6 @@
|
|||
</a>
|
||||
</label>
|
||||
</div>
|
||||
<button class="button button-block button-positive" ng-click="save()" translate>Save</button>
|
||||
<button class="button button-standard button-primary" ng-click="save()" translate>Save</button>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</label>
|
||||
</div>
|
||||
<button type="submit"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-disabled="emailForm.$invalid" translate>
|
||||
Save
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -98,10 +98,10 @@
|
|||
<div class="padding text-center" translate>
|
||||
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
|
||||
</div>
|
||||
<button class="button button-block button-positive" ng-click="scan()" translate>
|
||||
<button class="button button-standard button-primary" ng-click="scan()" translate>
|
||||
Scan addresses for funds
|
||||
</button>
|
||||
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate>
|
||||
<button class="button button-standard button-primary" ng-show="isCordova" ng-click="sendAddrs()" translate>
|
||||
Send addresses by email
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
</ion-nav-back-button>
|
||||
</ion-nav-bar>
|
||||
<ion-content>
|
||||
<button class="button button-block button-positive" copy-to-clipboard="prepare()">
|
||||
<button class="button button-standard button-primary" style="margin-top: 1rem" copy-to-clipboard="prepare()">
|
||||
<i class="icon ion-clipboard"></i>
|
||||
<span translate>Copy to clipboard</span>
|
||||
</button>
|
||||
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendLogs()">
|
||||
<button class="button button-standard button-secondary" ng-show="isCordova" ng-click="sendLogs()">
|
||||
<i class="icon ion-ios-email-outline"></i>
|
||||
<span translate>Send by email</span>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
...
|
||||
</div>
|
||||
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
type="submit"
|
||||
ng-disabled="limits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty">
|
||||
Continue
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
<input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
|
||||
</label>
|
||||
</div>
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
type="submit"
|
||||
ng-disabled="sellForm.$invalid ">
|
||||
Sell
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
A transfer has been initiated to your bank account and should arrive in 4-6 business days.
|
||||
</p>
|
||||
|
||||
<button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button>
|
||||
<button class="button button-standard button-primary" ui-sref="tabs.buyandsell.glidera">OK</button>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
|
|||
|
|
@ -98,11 +98,10 @@
|
|||
</div> <!-- advanced -->
|
||||
</div> <!-- list -->
|
||||
|
||||
<button type="submit" class="button button-block button-positive"
|
||||
<button type="submit" class="button button-standard button-primary"
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
|
||||
<span translate>Create new wallet</span>
|
||||
</button>
|
||||
</form>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
||||
|
|
|
|||
|
|
@ -128,12 +128,10 @@
|
|||
</div> <!-- advanced -->
|
||||
</div> <!-- list -->
|
||||
|
||||
<button type="submit" class="button button-block button-positive"
|
||||
<button type="submit" class="button button-standard button-primary"
|
||||
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
|
||||
<span translate>Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet</span>
|
||||
</button>
|
||||
</form>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
<button
|
||||
ng-click="downloadWalletBackup()"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
|
||||
ng-style="{'background-color':wallet.color}"
|
||||
ng-show="!isSafari && !isCordova">
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<button
|
||||
ng-click="viewWalletBackup()"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
|
||||
ng-style="{'background-color':wallet.color}"
|
||||
ng-show="isSafari && !isCordova">
|
||||
|
|
@ -69,13 +69,13 @@
|
|||
|
||||
<div ng-show="isCordova">
|
||||
<h4 translate>Export options</h4>
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
|
||||
ng-style="{'background-color':wallet.color}"
|
||||
ng-click="copyWalletBackup()">
|
||||
<i class="fi-clipboard-pencil"></i>
|
||||
<span translate>Copy to clipboard</span></button>
|
||||
<button class="button button-block button-positive" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
|
||||
<button class="button button-standard button-primary" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
|
||||
ng-style="{'background-color':wallet.color}"
|
||||
ng-click="sendWalletBackup()"><i class="fi-mail"></i>
|
||||
<span translate>Send by email</span></button>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="button button-block button-positive" ng-disabled="importForm.$invalid || !formData.password" translate>
|
||||
<button type="submit" class="button button-standard button-primary" ng-disabled="importForm.$invalid || !formData.password" translate>
|
||||
Import backup
|
||||
</button>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<button translate type="submit" class="button button-block button-positive">
|
||||
<button translate type="submit" class="button button-standard button-primary">
|
||||
Import
|
||||
</button>
|
||||
</div> <!-- seedoptions show -->
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
</div>
|
||||
|
||||
<button type="submit"
|
||||
class="button button-block button-positive"
|
||||
class="button button-standard button-primary"
|
||||
ng-disabled="importForm12.$invalid" translate>Import
|
||||
</button>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
<ion-view id="tab-receive">
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
|
||||
<ion-nav-buttons side="secondary">
|
||||
<button class="button button-clear" ng-click="checkTips(true)">
|
||||
<i class="ion-help-circled"></i>
|
||||
</button>
|
||||
</ion-nav-buttons>
|
||||
</ion-nav-bar>
|
||||
<ion-content>
|
||||
<div class="list card padding text-center" ng-if="!wallets[0]">
|
||||
|
|
@ -23,7 +18,7 @@
|
|||
<div class="row border-top">
|
||||
<div class="col col-90 center-block bit-address text-center">
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-social-bitcoin-outline"></i>
|
||||
<i class="icon icon-svg receive-tab-bitcoin-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
|
||||
<span class="bit-address-gen-address">...</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -38,13 +33,13 @@
|
|||
<span translate>All signing devices must be added to this multisig wallet before bitcoin addresses can be created.</span>
|
||||
</div>
|
||||
<div>
|
||||
<button class="button button-block button-positive" ng-click="goCopayers()" translate>Open wallet</button>
|
||||
<button class="button button-standard button-primary" ng-click="goCopayers()" translate>Open wallet</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row border-top">
|
||||
<div class="col col-90 center-block bit-address text-center">
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-social-bitcoin-outline"></i>
|
||||
<i class="icon icon-svg receive-tab-bitcoin-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
|
||||
<span class="bit-address-gen-address" ng-if="!generatingAddress" translate>address not yet available</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -81,7 +76,7 @@
|
|||
<div class="row border-top">
|
||||
<div class="col col-90 center-block bit-address text-center">
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-social-bitcoin-outline"></i>
|
||||
<i class="icon icon-svg receive-tab-bitcoin-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
|
||||
<span class="bit-address-gen-address" ng-if="generatingAddress">...</span>
|
||||
<span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
</ion-nav-buttons>
|
||||
</ion-nav-bar>
|
||||
<ion-content scroll="false">
|
||||
<div class="ng-hide" id="tab-scan-has-problems" ng-show="currentState === scannerStates.unauthorized || currentState === scannerStates.denied || currentState === scannerStates.unavailable">
|
||||
<div class="ng-hide zero-state" id="tab-scan-has-problems" ng-show="currentState === scannerStates.unauthorized || currentState === scannerStates.denied || currentState === scannerStates.unavailable">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/tab-icons/ico-receive.svg"/>
|
||||
</i>
|
||||
|
|
|
|||
|
|
@ -2,25 +2,38 @@
|
|||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-title>{{'Send' | translate}}</ion-nav-title>
|
||||
</ion-nav-bar>
|
||||
|
||||
<ion-content>
|
||||
<div class="item item-heading" translate>Recipient</div>
|
||||
<ion-content scroll="false">
|
||||
<div class="ng-hide zero-state" ng-show="!hasFunds">
|
||||
<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">Buy Bitcoin</button>
|
||||
<button class="button button-standard button-primary" ng-click="createWallet()" ng-show="!hasWallets">Create bitcoin wallet</button>
|
||||
<button class="button button-standard button-secondary" ui-sref="tabs.receive" ng-show="hasWallets">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 ion-social-bitcoin placeholder-icon"></i>
|
||||
<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 ui-sref="tabs.scan" 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>
|
||||
<a ui-sref="tabs.scan" 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>
|
||||
<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">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<div class="card">
|
||||
<div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div>
|
||||
</div>
|
||||
<button class="button button-block button-positive"
|
||||
<button class="button button-standard button-primary"
|
||||
ng-show="lang != 'en'"
|
||||
ng-click="openExternalLink(disclaimerUrl, 'Bitpay disclaimer')" translate>
|
||||
Official English Disclaimer
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue