mirror of https://github.com/BTCPrivate/copay.git
Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps
# Conflicts: # src/js/controllers/backup.js
This commit is contained in:
commit
19a3e9afdc
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||||
|
<!-- Generator: sketchtool 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
|
||||||
|
<title>CF22B02A-463B-4798-B448-F6A878730EDC</title>
|
||||||
|
<desc>Created with sketchtool.</desc>
|
||||||
|
<defs>
|
||||||
|
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
|
||||||
|
<stop stop-color="#EFF2FF" offset="0%"></stop>
|
||||||
|
<stop stop-color="#F7F7F7" offset="100%"></stop>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<g id="Settings" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||||
|
<g id="1.7.4---Address-book-(Empty)" transform="translate(-122.000000, -125.000000)">
|
||||||
|
<g id="Header/Jumbo-W-Text/Light" transform="translate(0.000000, 70.000000)">
|
||||||
|
<g id="users-24px-outline-2_a-add" transform="translate(64.000000, 41.000000)">
|
||||||
|
<g id="Group" transform="translate(58.000000, 14.000000)">
|
||||||
|
<circle id="Oval-2" fill="url(#linearGradient-1)" cx="64" cy="64" r="64"></circle>
|
||||||
|
<path d="M59.8058824,65.8235294 C51.3947922,65.8235294 43.9338216,67.7071485 39.0313235,69.3457199 C35.4125294,70.5591485 33,73.9396246 33,77.7275294 L33,89.442577 L62.7843137,89.442577" id="Shape" stroke="#647CE8" stroke-width="2"></path>
|
||||||
|
<path d="M65.8843137,68.4285714 L65.8843137,68.4285714 C57.6608647,68.4285714 50.9921569,58.8658095 50.9921569,50.7142857 L50.9921569,47.7619048 C50.9921569,39.610381 57.6608647,33 65.8843137,33 L65.8843137,33 C74.1077627,33 80.7764706,39.610381 80.7764706,47.7619048 L80.7764706,50.7142857 C80.7764706,58.8658095 74.1077627,68.4285714 65.8843137,68.4285714 L65.8843137,68.4285714 Z" id="Shape" stroke="#647CE8" stroke-width="2"></path>
|
||||||
|
<path d="M85.2745098,77.2857143 L85.2745098,95" id="Shape" stroke="#647CE8" stroke-width="2"></path>
|
||||||
|
<path d="M77.1294118,85.2745098 L95,85.2745098" id="Shape" stroke="#647CE8" stroke-width="2"></path>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
@ -1,4 +1,4 @@
|
||||||
<ion-view>
|
<ion-view id="add-address">
|
||||||
<ion-nav-bar class="bar-royal">
|
<ion-nav-bar class="bar-royal">
|
||||||
<ion-nav-title>
|
<ion-nav-title>
|
||||||
<span translate>Add Contact</span>
|
<span translate>Add Contact</span>
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
<form name="addressbookForm" no-validate>
|
<form name="addressbookForm" no-validate>
|
||||||
|
|
||||||
<div class="card list">
|
<div class="list">
|
||||||
<label class="item item-input item-stacked-label">
|
<label class="item item-input item-stacked-label">
|
||||||
<span class="input-label" translate>Name</span>
|
<span class="input-label" translate>Name</span>
|
||||||
<input type="text"
|
<input type="text"
|
||||||
|
@ -29,11 +29,12 @@
|
||||||
<span class="input-label" translate>Email</span>
|
<span class="input-label" translate>Email</span>
|
||||||
<input type="text"
|
<input type="text"
|
||||||
id="email"
|
id="email"
|
||||||
|
placeholder="name@example.com"
|
||||||
name="email"
|
name="email"
|
||||||
ng-model="addressbookEntry.email">
|
ng-model="addressbookEntry.email">
|
||||||
</label>
|
</label>
|
||||||
<label class="item item-input item-stacked-label">
|
<label class="item item-input item-stacked-label">
|
||||||
<span class="input-label" translate>Address</span>
|
<span class="input-label" translate>Bitcoin Address</span>
|
||||||
<div class="input-notification">
|
<div class="input-notification">
|
||||||
<i class="icon ion-checkmark-circled balanced"
|
<i class="icon ion-checkmark-circled balanced"
|
||||||
ng-show="!addressbookForm.address.$invalid"></i>
|
ng-show="!addressbookForm.address.$invalid"></i>
|
||||||
|
|
|
@ -39,12 +39,22 @@
|
||||||
|
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
<div class="row text-center absolute-center" ng-show="isEmptyList">
|
<div class="text-center absolute-center" ng-show="isEmptyList">
|
||||||
<div id="add-contact" class="col col-80 center-block">
|
<div id="add-contact" class="col col-80 center-block">
|
||||||
<img class="col" src="img/item-ico-contact.svg">
|
<div class="row">
|
||||||
<a class="col col-40 center-block" ui-sref="tabs.addressbook.add">
|
<img class="col col-60 center-block" src="img/address-book-add.svg">
|
||||||
Add Contact
|
</div>
|
||||||
</a>
|
<div class="row text-center">
|
||||||
|
<h2 class="col" translate>No contacts yet</h2>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<p class="text-center" translate>
|
||||||
|
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>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
<ion-view id="advanced-settings" class="settings">
|
||||||
|
<ion-nav-bar class="bar-royal">
|
||||||
|
<ion-nav-title>{{'Advanced Settings' | translate}}</ion-nav-title>
|
||||||
|
<ion-nav-back-button>
|
||||||
|
</ion-nav-back-button>
|
||||||
|
</ion-nav-bar>
|
||||||
|
|
||||||
|
<ion-content>
|
||||||
|
<div class="list">
|
||||||
|
<div class="item item-divider" translate>Enabled Integrations</div>
|
||||||
|
|
||||||
|
<ion-toggle ng-show="!isWP" ng-model="bitpayCardEnabled.value" toggle-class="toggle-balanced" ng-change="bitpayCardChange()">
|
||||||
|
<span class="toggle-label" translate>Enable Bitpay Card Integration</span>
|
||||||
|
</ion-toggle>
|
||||||
|
|
||||||
|
<ion-toggle ng-show="!isWP" ng-model="amazonEnabled.value" toggle-class="toggle-balanced" ng-change="amazonChange()">
|
||||||
|
<span class="toggle-label" translate>Enable Amazon Integration</span>
|
||||||
|
</ion-toggle>
|
||||||
|
|
||||||
|
<ion-toggle ng-show="!isWP" ng-model="glideraEnabled.value" toggle-class="toggle-balanced" ng-change="glideraChange()">
|
||||||
|
<span class="toggle-label" translate>Enable Glidera Service</span>
|
||||||
|
</ion-toggle>
|
||||||
|
|
||||||
|
<!-- disable coinbase for this release -->
|
||||||
|
|
||||||
|
<!-- <ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()">
|
||||||
|
<span class="toggle-label" translate>Enable Coinbase Service</span>
|
||||||
|
</ion-toggle> -->
|
||||||
|
|
||||||
|
|
||||||
|
<div class="item item-divider" translate>Wallet Operation</div>
|
||||||
|
|
||||||
|
<ion-toggle ng-model="spendUnconfirmed.value" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
|
||||||
|
<span class="toggle-label" translate>Use Unconfirmed Funds</span>
|
||||||
|
</ion-toggle>
|
||||||
|
<div class="comment">
|
||||||
|
<span translate>If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays.</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="item item-divider" translate>Experimental Features</div>
|
||||||
|
<div class="divider-comment">
|
||||||
|
<span translate>These features aren't quite ready for primetime. They may change, stop working, or disappear at any time.</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ion-toggle ng-show="!isWP" ng-model="recentTransactionsEnabled.value" toggle-class="toggle-balanced" ng-change="recentTransactionsChange()">
|
||||||
|
<span class="toggle-label" translate>Recent Transaction Card</span>
|
||||||
|
</ion-toggle>
|
||||||
|
<div class="comment">
|
||||||
|
<span transaction>If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab.</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- disable frequently used for this release -->
|
||||||
|
|
||||||
|
<!-- <ion-toggle ng-show="!isWP" ng-model="frequentlyUsedEnabled.value" toggle-class="toggle-balanced" ng-change="frequentlyUsedChange()">
|
||||||
|
<span class="toggle-label" translate>Frequently Used Card</span>
|
||||||
|
</ion-toggle>
|
||||||
|
<div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
|
||||||
|
<span transaction>If enabled, the Frequently Used card - a list of the most commonly chosen recipients - will appear in the Send tab.</span>
|
||||||
|
</div> -->
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</ion-content>
|
||||||
|
</ion-view>
|
|
@ -12,10 +12,15 @@
|
||||||
<div>
|
<div>
|
||||||
<div class="item item-no-bottom-border" translate>Recipient</div>
|
<div class="item item-no-bottom-border" translate>Recipient</div>
|
||||||
|
|
||||||
<div class="item item-text-wrap item-icon-left bitcoin-address">
|
<div class="item item-text-wrap item-icon-left bitcoin-address" ng-class="{'item-big-icon-left':isCard}">
|
||||||
<i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
|
<i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
|
||||||
<gravatar ng-if="!isWallet" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
|
<span ng-if="!isWallet">
|
||||||
<span>{{toName || toAddress}}</span>
|
<gravatar ng-if="!isCard" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
|
||||||
|
<i ng-if="isCard" class="icon big-icon-svg">
|
||||||
|
<div class="bg icon-bitpay-card"></div>
|
||||||
|
</i>
|
||||||
|
</span>
|
||||||
|
<span ng-class="{'m10l':isCard}">{{toName || toAddress}}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
<ion-view id="wallet-backup-phrase" title="{{viewTitle}}">
|
<ion-view id="wallet-backup-phrase">
|
||||||
<ion-nav-bar class="bar-royal">
|
<ion-nav-bar class="bar-royal">
|
||||||
<ion-nav-buttons side="primary">
|
<ion-nav-title>
|
||||||
<button class="button button-back button-clear" ng-click="backupGoBack()">
|
{{viewTitle}}
|
||||||
<i class="icon ion-ios-arrow-thin-left"></i>
|
</ion-nav-title>
|
||||||
</button>
|
<ion-nav-back-button>
|
||||||
</ion-nav-buttons>
|
</ion-nav-back-button>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<div class="ng-hide" ng-show="deleted">
|
<div class="ng-hide" ng-show="deleted">
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<ion-view id="onboarding-backup-warning" class="onboarding" ng-controller="backupWarningController">
|
<ion-view id="backup-warning" class="onboarding" ng-controller="backupWarningController">
|
||||||
<ion-nav-bar class="bar-royal">
|
<ion-nav-bar class="bar-royal">
|
||||||
<ion-nav-buttons side="primary">
|
<ion-nav-buttons side="primary">
|
||||||
<button class="button button-back button-clear" href ui-sref="onboarding.backupRequest({walletId: walletId})">
|
<button class="button button-back button-clear" ng-click="goBack()">
|
||||||
<i class="icon ion-ios-arrow-thin-left"></i>
|
<i class="icon ion-ios-arrow-thin-left"></i>
|
||||||
</button>
|
</button>
|
||||||
</ion-nav-buttons>
|
</ion-nav-buttons>
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<img src="img/onboarding-backup-warning.svg" class="col col-60 warning-image">
|
<img src="img/backup-warning.svg" class="col col-60 warning-image">
|
||||||
</div>
|
</div>
|
||||||
<div class="row text-center">
|
<div class="row text-center">
|
||||||
<p class="col col-60">
|
<p class="col col-60">
|
|
@ -1,21 +1,18 @@
|
||||||
<ion-view>
|
<ion-view id="bitpayCard">
|
||||||
<ion-nav-bar class="bar-royal">
|
<ion-nav-bar class="bar-royal">
|
||||||
<ion-nav-buttons side="primary">
|
<ion-nav-back-button>
|
||||||
<button class="button button-clear" ui-sref="tabs.home">
|
</ion-nav-back-button>
|
||||||
Close
|
|
||||||
</button>
|
|
||||||
</ion-nav-buttons>
|
|
||||||
<ion-nav-title>BitPay Card</ion-nav-title>
|
<ion-nav-title>BitPay Card</ion-nav-title>
|
||||||
<ion-nav-buttons side="secondary">
|
<ion-nav-buttons side="secondary" ng-show="bitpayCard.bitpayCardAuthenticated">
|
||||||
<button class="button button-clear" ui-sref="bitpayCard.preferences">
|
<button class="button back-button" ui-sref="tabs.bitpayCard.preferences">
|
||||||
<i class="icon ion-gear-b"></i>
|
<i class="icon ion-ios-gear-outline"></i>
|
||||||
</button>
|
</button>
|
||||||
</ion-nav-buttons>
|
</ion-nav-buttons>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
||||||
<ion-content ng-controller="bitpayCardController as bitpayCard" ng-init="bitpayCard.init()">
|
<ion-content>
|
||||||
|
|
||||||
<div class="box-notification warning" ng-show="network == 'testnet'">
|
<div class="box-notification warning m0" ng-show="network == 'testnet'">
|
||||||
Sandbox version. Only for testing purpose
|
Sandbox version. Only for testing purpose
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -35,7 +32,7 @@
|
||||||
<form
|
<form
|
||||||
ng-show="!bitpayCard.bitpayCardTwoFactorPending"
|
ng-show="!bitpayCard.bitpayCardTwoFactorPending"
|
||||||
name="authenticateForm"
|
name="authenticateForm"
|
||||||
ng-submit="bitpayCard.authenticate()"
|
ng-submit="bitpayCard.authenticate(email, password)"
|
||||||
novalidate>
|
novalidate>
|
||||||
|
|
||||||
<div class="card list">
|
<div class="card list">
|
||||||
|
@ -71,7 +68,7 @@
|
||||||
<form
|
<form
|
||||||
ng-show="bitpayCard.bitpayCardTwoFactorPending"
|
ng-show="bitpayCard.bitpayCardTwoFactorPending"
|
||||||
name="authenticate2FAForm"
|
name="authenticate2FAForm"
|
||||||
ng-submit="bitpayCard.authenticate2FA()"
|
ng-submit="bitpayCard.authenticate2FA(twoFactorCode)"
|
||||||
novalidate>
|
novalidate>
|
||||||
|
|
||||||
<div class="list">
|
<div class="list">
|
||||||
|
@ -92,47 +89,43 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="bitpayCard.bitpayCardAuthenticated && !bitpayCard.visaCardActivated && !addFunds">
|
<div ng-show="bitpayCard.bitpayCardAuthenticated">
|
||||||
<div id="bitpayCard" class="oh pr">
|
<div class="oh pr">
|
||||||
<div class="amount">
|
<div class="amount">
|
||||||
<div ng-show="!loadingHistory && bitpayCard.bitpayCardCurrentBalance" ng-click="bitpayCard.update()">
|
<div ng-if="!loadingHistory && bitpayCard.bitpayCardCurrentBalance" ng-click="bitpayCard.update()">
|
||||||
<strong class="size-36">${{bitpayCard.bitpayCardCurrentBalance}}</strong>
|
<div class="size-36 m20b">${{bitpayCard.bitpayCardCurrentBalance}}</div>
|
||||||
<div class="size-12">Available balance</div>
|
<a class="button button-positive button-small" ui-sref="tabs.bitpayCard.amount({'isCard': true, 'toName': 'BitPay Card'})">
|
||||||
|
<i class="icon ion-ios-plus-empty"></i> {{'Add Funds'|translate}}
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="loadingHistory">
|
<div ng-if="loadingHistory" class="m10t">
|
||||||
<strong class="size-36">...</strong>
|
<strong class="size-36">...</strong>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="camera-icon" ng-show="bitpayCard.bitpayCardCurrentBalance">
|
|
||||||
<a ng-click="addFunds = true">
|
|
||||||
<i class="icon ion-plus size-21"></i>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<select class="m10" ng-model="dateRange" ng-change="bitpayCard.update(dateRange)">
|
|
||||||
<option value="last30Days">Recent Activity</option>
|
|
||||||
<option value="lastMonth">Last Month</option>
|
|
||||||
<option value="all">All Activity</option>
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="oh pr m20t text-gray size-12 text-center"
|
class="m10t text-center padding"
|
||||||
ng-show="!bitpayCard.bitpayCardTransactionHistory[0] &&
|
ng-show="!bitpayCard.bitpayCardTransactionHistory[0] &&
|
||||||
!bitpayCard.bitpayCardInvoiceHistory[0] && !loadingHistory">
|
!bitpayCard.bitpayCardInvoiceHistory[0] && (!loadingHistory || !bitpayCardCached)">
|
||||||
No transactions yet
|
<i class="icon ion-ios-arrow-thin-up size-24"></i>
|
||||||
|
<h1>Get started</h1>
|
||||||
|
<h4>Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.</h4>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="loadingHistory" class="oh pr m20t text-gray text-center">
|
<div class="list" ng-if="bitpayCardCached">
|
||||||
<i class="icon ion-android-sync"></i>
|
<div class="item item-divider">
|
||||||
</div>
|
<select class="select-style" ng-model="dateRange" ng-change="bitpayCard.update(dateRange)">
|
||||||
|
<option value="last30Days">Recent Activity</option>
|
||||||
<div class="card list" ng-show="!loadingHistory">
|
<option value="lastMonth">Last Month</option>
|
||||||
|
<option value="all">All Activity</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
|
ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
|
||||||
class="item row"
|
class="item row"
|
||||||
ng-init="bitpayCard.getMerchantInfo(tx)">
|
ng-init="bitpayCard.getMerchantInfo(tx)">
|
||||||
<div class="col" ng-init="icon = bitpayCard.getIconName(tx)">
|
<div class="col col-10" ng-init="icon = bitpayCard.getIconName(tx)">
|
||||||
<img class="m5t" ng-src="img/mcc-icons/{{icon}}.svg" width="22">
|
<img class="m5t" ng-src="img/mcc-icons/{{icon}}.svg" width="22">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -146,7 +139,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
ng-init="desc = bitpayCard.processDescription(tx)"
|
ng-init="desc = bitpayCard.processDescription(tx)"
|
||||||
class="col">
|
class="col size-12">
|
||||||
{{desc}}
|
{{desc}}
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
|
@ -165,55 +158,5 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="bitpayCard.bitpayCardAuthenticated && !bitpayCard.visaCardActivated && addFunds">
|
|
||||||
<form
|
|
||||||
name="createInvoiceForm"
|
|
||||||
ng-submit="bitpayCard.sendFunds()"
|
|
||||||
novalidate>
|
|
||||||
|
|
||||||
<div class="card list">
|
|
||||||
<label class="item item-input item-stacked-label">
|
|
||||||
<span class="input-label">Amount</span>
|
|
||||||
<input
|
|
||||||
type="number"
|
|
||||||
id="fiat"
|
|
||||||
name="fiat"
|
|
||||||
ng-attr-placeholder="{{'Amount in USD'}}"
|
|
||||||
min="0.01"
|
|
||||||
max="2000"
|
|
||||||
ng-model="fiat"
|
|
||||||
autocomplete="off"
|
|
||||||
required>
|
|
||||||
<a class="postfix">USD</a>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p class="size-12 text-warning" ng-show="bitpayCard.isMultisigWallet">
|
|
||||||
You selected a multisignature wallet. Please note that the transaction will only appear on your card's
|
|
||||||
Activity when the payment is fully signed.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<button class="button button-block button-light"
|
|
||||||
type="button"
|
|
||||||
ng-click="addFunds = false; fiat = null">
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<button class="button button-block button-positive"
|
|
||||||
ng-disabled="!fiat"
|
|
||||||
type="submit">
|
|
||||||
Send
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</ion-content>
|
</ion-content>
|
||||||
</ion-view>
|
</ion-view>
|
||||||
|
|
|
@ -26,14 +26,21 @@
|
||||||
|
|
||||||
<div class="item item-icon-left">
|
<div class="item item-icon-left">
|
||||||
<i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
|
<i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
|
||||||
<gravatar ng-if="!isWallet" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
|
<div ng-if="!isWallet">
|
||||||
<span translate>To</span>: {{toAddress}}
|
<gravatar ng-if="!isCard" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
|
||||||
<p ng-show="toName">{{toName}}</p>
|
<i ng-if="isCard" class="icon big-icon-svg">
|
||||||
|
<div class="bg icon-bitpay-card"></div>
|
||||||
|
</i>
|
||||||
|
</div>
|
||||||
|
<div ng-class="{'m10l':isCard}">
|
||||||
|
<span translate>To</span>: {{toAddress}}
|
||||||
|
<p ng-show="toName">{{toName}}</p>
|
||||||
|
|
||||||
<div ng-show="_paypro" ng-click="openPPModal(_paypro)">
|
<div ng-show="_paypro" ng-click="openPPModal(_paypro)">
|
||||||
<i ng-show="_paypro.verified && _paypro.caTrusted" class="ion-locked" style="color:green"></i>
|
<i ng-show="_paypro.verified && _paypro.caTrusted" class="ion-locked" style="color:green"></i>
|
||||||
<i ng-show="!_paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
|
<i ng-show="!_paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
|
||||||
{{_paypro.domain}}
|
{{_paypro.domain}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
<div id="backup-needed-modal" class="popup-modal">
|
||||||
|
<div class="popup-modal-header popup-modal-header-warning">
|
||||||
|
<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>
|
||||||
|
</div>
|
|
@ -1,5 +1,5 @@
|
||||||
<div id="screenshot-warning-modal" class="popup-modal">
|
<div id="screenshot-warning-modal" class="popup-modal">
|
||||||
<div class="popup-modal-header">
|
<div class="popup-modal-header-success">
|
||||||
<div class="popup-modal-header-img"></div>
|
<div class="popup-modal-header-img"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="popup-modal-content" ng-class="{'popup-modal-content-success': !backupError, 'popup-modal-content-fail': backupError}">
|
<div class="popup-modal-content" ng-class="{'popup-modal-content-success': !backupError, 'popup-modal-content-fail': backupError}">
|
||||||
|
|
|
@ -8,10 +8,6 @@
|
||||||
<span class="item-note m10l" ng-show="wallet.n > 1 && wallet.isComplete()">
|
<span class="item-note m10l" ng-show="wallet.n > 1 && wallet.isComplete()">
|
||||||
{{wallet.m}}-of-{{wallet.n}}
|
{{wallet.m}}-of-{{wallet.n}}
|
||||||
</span>
|
</span>
|
||||||
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
|
|
||||||
Incomplete
|
|
||||||
</span>
|
|
||||||
<!-- <i ng-show="wallet.needsBackup" class="icon ion-android-warning assertive"></i> -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ion-slide-page>
|
</ion-slide-page>
|
||||||
|
|
|
@ -1,60 +1,57 @@
|
||||||
<ion-modal-view ng-controller="payproController">
|
<ion-modal-view ng-controller="payproController">
|
||||||
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
<ion-header-bar align-title="center" class="bar-royal" ng-style="{'background-color': color}">
|
||||||
<div class="left-small">
|
<button class="button button-clear" ng-click="cancel()">
|
||||||
<a ng-click="cancel()" class="p10">
|
{{'Close' | translate}}
|
||||||
<span class="text-close" translate>Close</span>
|
</button>
|
||||||
</a>
|
<div class="title" translate>
|
||||||
|
Payment request
|
||||||
</div>
|
</div>
|
||||||
<h1 class="title ellipsis" translate>Payment request</h1>
|
|
||||||
</ion-header-bar>
|
</ion-header-bar>
|
||||||
|
|
||||||
<ion-content ng-style="{'background-color': '#F6F7F9'}">
|
<ion-content>
|
||||||
<div class="modal-content">
|
<div class="header-modal text-center size-42">
|
||||||
<div class="header-modal text-center p50t">
|
{{amountStr}}
|
||||||
<div class="size-42">
|
</div>
|
||||||
{{amountStr}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h4 class="title m10l" translate>Details</h4>
|
<div class="list">
|
||||||
<ul class="no-bullet size-14 m10t">
|
<div class="item item-divider" translate>
|
||||||
<li class="line-b p10 oh">
|
Details
|
||||||
<span class="text-gray" translate>Pay To</span>
|
</div>
|
||||||
<span class="right enable_text_select">{{_paypro.domain}}</span>
|
<div class="item">
|
||||||
</li>
|
{{'Pay To'|translate}}
|
||||||
<li class="line-b p10 oh" ng-if="_paypro.toAddress">
|
<span class="item-note">{{_paypro.domain}}</span>
|
||||||
<span class="text-gray" translate>Address</span>
|
</div>
|
||||||
<span class="right enable_text_select">{{_paypro.toAddress}}</span>
|
<div class="item" ng-if="_paypro.toAddress">
|
||||||
</li>
|
{{'Address'|translate}}
|
||||||
<li class="line-b p10 oh">
|
<span class="item-note">{{_paypro.toAddress}}</span>
|
||||||
<span class="text-gray" translate>Certified by</span>
|
</div>
|
||||||
<span class="right text-right">
|
<div class="item">
|
||||||
|
{{'Certified by'|translate}}
|
||||||
|
<span class="item-note">
|
||||||
<span ng-show="_paypro.caTrusted">
|
<span ng-show="_paypro.caTrusted">
|
||||||
<i class="fi-lock color-greeni"></i>
|
<i class="ion-locked" style="color:green"></i>
|
||||||
{{_paypro.caName}}<br>
|
{{_paypro.caName}}<br>
|
||||||
<span translate>(Trusted)</span>
|
<span translate>(Trusted)</span>
|
||||||
</span>
|
</span>
|
||||||
<span ng-show="!_paypro.caTrusted">
|
<span ng-show="!_paypro.caTrusted">
|
||||||
<span ng-show="_paypro.selfSigned">
|
<span ng-show="_paypro.selfSigned">
|
||||||
<i class="fi-unlock color-yellowi"></i> <span translate>Self-signed Certificate</span>
|
<i class="ion-unlocked" style="color:red"></i> <span translate>Self-signed Certificate</span>
|
||||||
</span>
|
</span>
|
||||||
<span ng-show="!_paypro.selfSigned">
|
<span ng-show="!_paypro.selfSigned">
|
||||||
<i class="fi-unlock color-yellowi"></i>{{_paypro.caName}}<br>
|
<i class="ion-locked" style="color:yellow"></i>{{_paypro.caName}}<br>
|
||||||
<span translate>WARNING: UNTRUSTED CERTIFICATE</span>
|
<span translate>WARNING: UNTRUSTED CERTIFICATE</span>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</div>
|
||||||
<li class="line-b p10 oh" ng-if="_paypro.memo">
|
<div class="item" ng-if="_paypro.memo">
|
||||||
<span class="text-gray" translate>Memo</span>
|
{{'Memo'|translate}}
|
||||||
<span class="right">{{_paypro.memo}}</span>
|
<span class="item-note wrapword">{{_paypro.memo}}</span>
|
||||||
</li>
|
</div>
|
||||||
<li class="line-b p10 oh" ng-if="_paypro.expires">
|
<div class="item" ng-if="_paypro.expires">
|
||||||
<span class="text-gray" translate>Expires</span>
|
{{'Expires'|translate}}
|
||||||
<span class="right">{{_paypro.expires * 1000 | amTimeAgo }}</span>
|
<span class="item-note">{{_paypro.expires * 1000 | amTimeAgo }}</span>
|
||||||
</li>
|
</div>
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="extra-margin-bottom"></div>
|
|
||||||
</ion-content>
|
</ion-content>
|
||||||
</ion-modal-view>
|
</ion-modal-view>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<button class="button button-clear" ng-click="cancel()">
|
<button class="button button-clear" ng-click="cancel()">
|
||||||
{{'Close' | translate}}
|
{{'Close' | translate}}
|
||||||
</button>
|
</button>
|
||||||
<div class="title" translate>
|
<div class="title">
|
||||||
{{title}}
|
{{title}}
|
||||||
</div>
|
</div>
|
||||||
</ion-header-bar>
|
</ion-header-bar>
|
||||||
|
@ -16,25 +16,26 @@
|
||||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': color}" class="bg"/>
|
<img src="img/icon-wallet.svg" ng-style="{'background-color': color}" class="bg"/>
|
||||||
</i>
|
</i>
|
||||||
|
|
||||||
<div class="size-36" copy-to-clipboard="btx.amountStr">
|
<div class="size-36 m20t" copy-to-clipboard="btx.amountStr">
|
||||||
<span class="enable_text_select">{{btx.amountStr}}</span>
|
{{btx.amountStr}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="alternative-amount" ng-click="showRate =! showRate">
|
<div class="m10t" style="height:20px;" ng-click="showRate =! showRate">
|
||||||
<span class="label gray radius" ng-show="!showRate && alternativeAmountStr">
|
<span ng-show="!showRate && alternativeAmountStr">
|
||||||
{{alternativeAmountStr}}
|
{{alternativeAmountStr}}
|
||||||
</span>
|
</span>
|
||||||
<span class="size-12" ng-show="showRate && alternativeAmountStr">
|
<span ng-show="showRate && alternativeAmountStr">
|
||||||
{{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
|
{{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="btx.action == 'sent'">
|
<div ng-show="btx.action == 'sent'">
|
||||||
<span translate>Sent from</span> {{wallet.credentials.walletName}}
|
<div>
|
||||||
<div class="padding-vertical">
|
<span translate>Sent from</span>
|
||||||
<i class="icon ion-ios-arrow-thin-down size-24"></i>
|
<strong ng-style="{'color': color}">{{wallet.credentials.walletName}}</strong>
|
||||||
</div>
|
</div>
|
||||||
|
<i class="icon ion-ios-arrow-thin-down size-24"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="btx.action == 'received'">
|
<div ng-show="btx.action == 'received'">
|
||||||
|
@ -63,27 +64,26 @@
|
||||||
</span>
|
</span>
|
||||||
<span ng-if="!btx.merchant">
|
<span ng-if="!btx.merchant">
|
||||||
<span ng-show="btx.labelTo">{{btx.labelTo}}</span>
|
<span ng-show="btx.labelTo">{{btx.labelTo}}</span>
|
||||||
<contact ng-show="!btx.labelTo" class="enable_text_select" address="{{btx.addressTo}}"></contact>
|
<contact ng-show="!btx.labelTo" address="{{btx.addressTo}}"></contact>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item item-icon-left" ng-click="openExternalLink('https://' +
|
<div class="item item-icon-left"
|
||||||
(getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
|
ng-click="openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
|
||||||
<i class="icon ion-ios-upload-outline"></i>
|
<i class="icon ion-ios-upload-outline"></i>
|
||||||
<span class="text-gray" translate>View transaction on the blockchain</span>
|
<span class="text-gray" translate>View transaction on the blockchain</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<div ng-if="btx.action == 'received' || 'moved'">
|
<div ng-if="btx.action == 'received' || btx.action == 'moved'">
|
||||||
<span translate>Date</span>
|
{{'Date'|translate}}
|
||||||
<span class="item-note">
|
<span class="item-note">
|
||||||
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="btx.action == 'sent'">
|
<div ng-if="btx.action == 'sent'">
|
||||||
<div translate>Created by</div>
|
{{'Created by'|translate}} <strong>{{btx.creatorName}}</strong>
|
||||||
<span>{{btx.creatorName}}</span>
|
|
||||||
<span class="item-note">
|
<span class="item-note">
|
||||||
<time>{{ btx.createdOn * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
<time>{{ btx.createdOn * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||||
</span>
|
</span>
|
||||||
|
@ -91,9 +91,8 @@
|
||||||
</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.feeLevel" copy-to-clipboard="btx.feeStr">
|
||||||
<div translate>Fee</div>
|
{{'Fee'|translate}}: {{btx.feeStr}}
|
||||||
<span class="enable_text_select">{{btx.feeLevel}} ({{btx.feeStr}})</span>
|
<span class="item-note">
|
||||||
<span class="right">
|
|
||||||
<span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
|
<span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
|
||||||
Unconfirmed
|
Unconfirmed
|
||||||
</span>
|
</span>
|
||||||
|
@ -108,20 +107,23 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item" ng-if="btx.message && btx.action != 'received'" copy-to-clipboard="btx.message">
|
<div class="item" ng-if="btx.message && btx.action != 'received'" copy-to-clipboard="btx.message">
|
||||||
<div translate>Description</div>
|
{{'Description'|translate}}
|
||||||
<span class="enable_text_select">{{btx.message}}</span>
|
<span class="item-note">
|
||||||
|
{{btx.message}}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="btx.merchant" class="item" copy-to-clipboard="btx.merchant.pr.pd.memo">
|
<div ng-if="btx.merchant" class="item" copy-to-clipboard="btx.merchant.pr.pd.memo">
|
||||||
<div translate>Merchant message</div>
|
{{'Merchant message'|translate}}
|
||||||
<span class="enable_text_select">
|
<span class="item-note">
|
||||||
{{btx.merchant.pr.pd.memo}}
|
{{btx.merchant.pr.pd.memo}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="btx.hasMultiplesOutputs" class="item" ng-click="showMultiplesOutputs = !showMultiplesOutputs">
|
<div ng-show="btx.hasMultiplesOutputs" class="item" ng-click="showMultiplesOutputs = !showMultiplesOutputs">
|
||||||
<div translate>Recipients</div>
|
{{'Recipients'|translate}}
|
||||||
<span class="right">{{btx.recipientCount}}
|
<span class="item-note">
|
||||||
|
{{btx.recipientCount}}
|
||||||
<i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
|
<i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
|
||||||
<i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
|
<i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
|
||||||
</span>
|
</span>
|
||||||
|
@ -138,21 +140,22 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item item-icon-right" ng-click="showCommentPopup()">
|
<div class="item" ng-click="showCommentPopup()">
|
||||||
<span class="text-gray" translate ng-if="!btx.note">Add Memo</i></span>
|
{{'Memo'|translate}}
|
||||||
<span class="text-gray" translate ng-if="btx.note">Memo</span>
|
<span class="item-note" translate ng-if="!btx.note">
|
||||||
<div ng-if="btx.note && btx.note.body">
|
<i class="icon ion-ios-plus-empty"></i>
|
||||||
<span class="enable_text_select">{{btx.note.body}}</span><br>
|
</span>
|
||||||
<span class="text-italic item-note size-12">
|
<span class="item-note" ng-if="btx.note && btx.note.body">
|
||||||
<span translate>Edited by</span> <span>{{btx.note.editedByName}}</span>,
|
{{btx.note.body}}
|
||||||
<time>{{btx.note.editedOn * 1000 | amTimeAgo}}</time></span>
|
<div>
|
||||||
</span>
|
<span translate>Edited by</span> {{btx.note.editedByName}},
|
||||||
</div>
|
<time>{{btx.note.editedOn * 1000 | amTimeAgo}}</time>
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="actionList[0]">
|
<div ng-if="actionList[0]">
|
||||||
<div class="item item-divider" translate>Timeline</div>
|
<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="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="row">
|
||||||
<div class="col col-10">
|
<div class="col col-10">
|
||||||
|
|
|
@ -4,13 +4,14 @@
|
||||||
<div ng-show="tx.amountStr" class="m20t size-36">
|
<div ng-show="tx.amountStr" class="m20t size-36">
|
||||||
{{tx.amountStr}}
|
{{tx.amountStr}}
|
||||||
</div>
|
</div>
|
||||||
<div class="size-16 text-gray m10v">
|
<div class="size-24 text-gray m20v">
|
||||||
<span translate>Sent</span>
|
<span ng-if="!fromBitPayCard" translate>Sent</span>
|
||||||
|
<span ng-if="fromBitPayCard" translate>Funds sent</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center m20t" ng-if="entryExist || !fromSendTab">
|
<div class="text-center m20t" ng-if="entryExist || !fromSendTab || fromPayPro">
|
||||||
<a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
|
<a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collect-address" ng-if="!entryExist && fromSendTab">
|
<div class="collect-address" ng-if="!entryExist && fromSendTab && !fromPayPro">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p translate class="col">Would you like to add this address to your address book?</p>
|
<p translate class="col">Would you like to add this address to your address book?</p>
|
||||||
</div>
|
</div>
|
||||||
|
@ -40,7 +41,7 @@
|
||||||
|
|
||||||
<div ng-if="type == 'created'" class="popup-txsigned text-center m30tp">
|
<div ng-if="type == 'created'" class="popup-txsigned text-center m30tp">
|
||||||
<i class="icon ion-checkmark-round"></i>
|
<i class="icon ion-checkmark-round"></i>
|
||||||
<div class="text-center size-18 tu text-bold m20t">
|
<div class="text-center size-24 tu text-bold m20v">
|
||||||
<span translate>Payment Proposal Created</span>
|
<span translate>Payment Proposal Created</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
|
@ -52,7 +53,7 @@
|
||||||
|
|
||||||
<div ng-if="type == 'accepted'" class="popup-txsigned text-center m30tp">
|
<div ng-if="type == 'accepted'" class="popup-txsigned text-center m30tp">
|
||||||
<i class="icon ion-checkmark-round"></i>
|
<i class="icon ion-checkmark-round"></i>
|
||||||
<div class="text-center size-18 tu text-bold m20t">
|
<div class="text-center size-24 tu text-bold m20v">
|
||||||
<span translate>Payment Accepted</span>
|
<span translate>Payment Accepted</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
|
@ -62,7 +63,7 @@
|
||||||
|
|
||||||
<div ng-if="type=='rejected'" class="popup-txrejected text-center m30tp">
|
<div ng-if="type=='rejected'" class="popup-txrejected text-center m30tp">
|
||||||
<i class="icon ion-close-round"></i>
|
<i class="icon ion-close-round"></i>
|
||||||
<div class="text-center size-18 tu text-bold m20t">
|
<div class="text-center size-24 tu text-bold m20v">
|
||||||
<span translate>Payment Rejected</span>
|
<span translate>Payment Rejected</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
|
|
|
@ -22,32 +22,30 @@
|
||||||
<div class="amount">{{tx.amountStr}}</div>
|
<div class="amount">{{tx.amountStr}}</div>
|
||||||
<div class="alternative" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
|
<div class="alternative" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row" ng-if="tx.removed">
|
<div class="text-center m10t assertive" ng-if="tx.removed" translate>
|
||||||
<div class="column m20t text-center text-warning size-12" translate>
|
|
||||||
The payment was removed by creator
|
The payment was removed by creator
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="text-center m10t" ng-show="tx.status != 'pending'">
|
||||||
|
<div ng-show="tx.status == 'accepted' && !tx.isGlidera">
|
||||||
|
<div class="m10b positive" translate>Payment accepted, but not yet broadcasted</div>
|
||||||
|
|
||||||
|
<button class="button button-positive button-block" ng-click="broadcast(tx)" ng-disabled="loading">
|
||||||
|
<i class="icon ion-ios-cloud-upload-outline"></i>
|
||||||
|
<span translate>Broadcast Payment</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div ng-show="tx.status == 'accepted' && tx.isGlidera" >
|
||||||
|
<div class="m10h" translate>Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.</div>
|
||||||
|
</div>
|
||||||
|
<div class="balanced" ng-show="tx.status == 'broadcasted'" translate>Payment Sent</div>
|
||||||
|
<div class="assertive" ng-show="tx.status=='rejected'" translate>Payment Rejected</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="tx.status != 'pending'">
|
<div class="item assertive text-center" ng-show="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs" translate>
|
||||||
<div ng-show="tx.status=='accepted' && !tx.isGlidera">
|
Warning: this transaction has unconfirmed inputs
|
||||||
<div class="m10b" translate>Payment accepted, but not yet broadcasted</div>
|
|
||||||
|
|
||||||
<button class="button button-balanced button-block" ng-style="{'background-color':color}" ng-click="broadcast(tx)" ng-disabled="loading">
|
|
||||||
<i class="fi-upload-cloud"></i>
|
|
||||||
<span translate>Broadcast Payment</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div ng-show="tx.status=='accepted' && tx.isGlidera" >
|
|
||||||
<div class="m10h" translate>Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.</div>
|
|
||||||
</div>
|
|
||||||
<div class="balanced" ng-show="tx.status == 'broadcasted'" translate>Payment Sent</div>
|
|
||||||
<div class="assertive" ng-show="tx.status=='rejected'" translate>Payment Rejected</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="item" ng-show="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs">
|
|
||||||
<span class="text-warning" translate>Warning: this transaction has unconfirmed inputs</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="info">
|
<div class="info">
|
||||||
|
@ -55,7 +53,7 @@
|
||||||
<span translate>To</span>
|
<span translate>To</span>
|
||||||
<span class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
|
<span class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
|
||||||
<i class="icon ion-social-bitcoin"></i>
|
<i class="icon ion-social-bitcoin"></i>
|
||||||
<contact ng-if="!tx.hasMultiplesOutputs" class="enable_text_select ellipsis" address="{{tx.toAddress}}"></contact>
|
<contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{tx.toAddress}}"></contact>
|
||||||
<span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span>
|
<span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -73,61 +71,61 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<span translate>From</span>
|
{{'From'|translate}}
|
||||||
<i class="icon big-icon-svg">
|
<span class="item-note">
|
||||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
|
<i class="icon big-icon-svg right">
|
||||||
</i>
|
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||||
<span>
|
</i>
|
||||||
{{wallet.name}}
|
<div class="m10t m55r">{{wallet.name}}</div>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<span translate>Created by</span>
|
{{'Created by'|translate}}
|
||||||
<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>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item" ng-show="tx.message">
|
<div class="item" ng-show="tx.message">
|
||||||
<span translate>Memo</span>
|
{{'Memo'|translate}}
|
||||||
<span>
|
<span class="item-note">
|
||||||
{{tx.message}}
|
{{tx.message}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<span translate>Fee</span>
|
{{'Fee'|translate}}
|
||||||
<span>
|
<span class="item-note">
|
||||||
{{tx.feeStr}}
|
{{tx.feeStr}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="tx.paypro">
|
<div ng-if="tx.paypro">
|
||||||
<div class="item item-divider" translate>Payment details</div>
|
<div class="item item-divider" translate>Payment details</div>
|
||||||
<li class="item">
|
<div class="item">
|
||||||
<span class="text-gray" translate>To</span>
|
{{'To'|translate}}
|
||||||
<span class="right">
|
<span class="item-note">
|
||||||
<span>
|
<span>
|
||||||
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.paypro.domain}}</span>
|
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.paypro.domain}}</span>
|
||||||
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.paypro.domain}}</span>
|
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.paypro.domain}}</span>
|
||||||
</span>
|
</span>
|
||||||
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"></contact>
|
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"></contact>
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</div>
|
||||||
<li class="item" ng-if="paymentExpired">
|
<div class="item" ng-if="paymentExpired">
|
||||||
<span class="text-gray" translate>Expired</span>
|
{{'Expired'|translate}}
|
||||||
<span class="right text-alert">
|
<span class="item-note">
|
||||||
<time>{{tx.paypro.expires * 1000 | amTimeAgo }}</time>
|
<time>{{tx.paypro.expires * 1000 | amTimeAgo }}</time>
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</div>
|
||||||
<li class="item" ng-if="!paymentExpired">
|
<div class="item" ng-if="!paymentExpired">
|
||||||
<span class="text-gray" translate>Expires</span>
|
{{'Expires'|translate}}
|
||||||
<span class="right">
|
<span class="item-note">
|
||||||
<time>{{expires}}</time>
|
<time>{{expires}}</time>
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</div>
|
||||||
<li class="item">
|
<div class="item">
|
||||||
<span class="text-gray" translate>Merchant Message</span>
|
{{'Merchant Message'|translate}}
|
||||||
<span class="db">{{tx.paypro.pr.pd.memo}}</span>
|
<span class="item-note">{{tx.paypro.pr.pd.memo}}</span>
|
||||||
</li>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="actionList[0]">
|
<div ng-if="actionList[0]">
|
||||||
<div class="item item-divider" translate>Timeline</div>
|
<div class="item item-divider" translate>Timeline</div>
|
||||||
|
@ -151,16 +149,20 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="m20t" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
|
<button class="button button-block button-positive"
|
||||||
|
ng-click="sign()"
|
||||||
|
ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && !isCordova" translate>
|
||||||
|
Click to accept
|
||||||
|
</button>
|
||||||
|
<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" 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.
|
* 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>
|
</div>
|
||||||
<button class="button button-assertive button-block" ng-click="remove()" ng-disabled="loading">
|
<button class="button button-assertive button-clear" ng-click="remove()" ng-disabled="loading">
|
||||||
<i class="fi-trash size-14 m5r"></i>
|
<i class="fi-trash size-14 m5r"></i>
|
||||||
<span translate>Delete Payment Proposal</span>
|
<span translate>Delete Payment Proposal</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<button class="button button-block button-positive" ng-click="approve()" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && !isCordova" translate>Click to pay</button>
|
|
||||||
</ion-content>
|
</ion-content>
|
||||||
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
|
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
|
||||||
</ion-modal-view>
|
</ion-modal-view>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<div class="cta-buttons">
|
<div class="cta-buttons">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<button class="button button-block button-positive col-75 col" href
|
<button class="button button-block button-positive col-75 col" href
|
||||||
ui-sref="onboarding.backupWarning({walletId: walletId})" translate>Backup wallet</button>
|
ui-sref="onboarding.backupWarning({from: 'onboarding.backupRequest', walletId: walletId})" translate>Backup wallet</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<button class="button button-block button-transparent col-75 col" ng-click="openPopup()" translate>I'll backup my wallet later</button>
|
<button class="button button-block button-transparent col-75 col" ng-click="openPopup()" translate>I'll backup my wallet later</button>
|
||||||
|
|
|
@ -21,9 +21,11 @@
|
||||||
<ion-checkbox ng-model="accept2"><span translate>I understand if this app moved to another device or deleted, my bitcoin can only be recovered with the backup phrase</span></ion-checkbox>
|
<ion-checkbox ng-model="accept2"><span translate>I understand if this app moved to another device or deleted, my bitcoin can only be recovered with the backup phrase</span></ion-checkbox>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
<div id="agree-to-terms" ng-if="accept1 && accept2">
|
<div id="agree-to-terms" ng-if="accept1 && accept2">
|
||||||
<ion-checkbox ng-model="terms.accept3"></ion-checkbox>
|
<div id="agree-to-terms-content" class="center-block">
|
||||||
<p translate>I have read, understood, and agree with the <a ng-click="openTermsModal()" translate>Terms of use</a>.</p>
|
<ion-checkbox ng-model="terms.accept3"></ion-checkbox>
|
||||||
<button ng-disabled="!accept1 || !accept2 || !terms.accept3" class="button button-block button-positive" ng-click="confirm()" translate>Confirm & Finish</button>
|
<p translate>I have read, understood, and agree with the <a ng-click="openTermsModal()" translate>Terms of use</a>.</p>
|
||||||
|
<button ng-disabled="!accept1 || !accept2 || !terms.accept3" class="button button-block button-positive" ng-click="confirm()" translate>Confirm & Finish</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
</ion-view>
|
</ion-view>
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
<div class="item item-divider" translate>
|
<div class="item item-divider" translate>
|
||||||
Security
|
Security
|
||||||
</div>
|
</div>
|
||||||
<a class="item item-icon-right" ui-sref="tabs.preferences.backup" ng-hide="wallet.isPrivKeyExternal()">
|
<a class="item item-icon-right" ui-sref="tabs.preferences.backupWarning({from: 'tabs.preferences'})" ng-hide="wallet.isPrivKeyExternal()">
|
||||||
<span translate>Backup</span>
|
<span translate>Backup</span>
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<ion-view>
|
<ion-view>
|
||||||
<ion-nav-bar class="bar-royal">
|
<ion-nav-bar class="bar-royal">
|
||||||
|
<ion-nav-title>{{title}}</ion-nav-title>
|
||||||
<ion-nav-back-button>
|
<ion-nav-back-button>
|
||||||
</ion-nav-back-button>
|
</ion-nav-back-button>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
|
@ -5,13 +5,17 @@
|
||||||
</ion-nav-back-button>
|
</ion-nav-back-button>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<div class="card">
|
<div class="white-bg padding">
|
||||||
<h1 class="text-center" translate>Warning!</h2>
|
<h1 class="text-center assertive" translate>Warning!</h2>
|
||||||
<div class="assertive padding" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
|
<div class="padding text-center">
|
||||||
<div class="text-center padding">
|
<p translate>
|
||||||
<span ng-show="alias">{{alias}}</span>{{walletName}}
|
Permanently delete this wallet.
|
||||||
|
</p>
|
||||||
|
<p translate class="bold-text">
|
||||||
|
THIS ACTION CANNOT BE REVERSED
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button class="button button-block button-assertive" ng-click="showDeletePopup()"translate>Delete</button>
|
<button class="button button-block button-assertive" ng-click="showDeletePopup()"translate>Delete <span ng-show="alias">{{alias}}</span>{{walletName}}</button>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
</ion-view>
|
</ion-view>
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
<ion-view id="tab-notifications" class="settings">
|
||||||
|
<ion-nav-bar class="bar-royal">
|
||||||
|
<ion-nav-title>{{'Notifications' | translate}}</ion-nav-title>
|
||||||
|
<ion-nav-back-button>
|
||||||
|
</ion-nav-back-button>
|
||||||
|
</ion-nav-bar>
|
||||||
|
|
||||||
|
<ion-content>
|
||||||
|
<div class="list">
|
||||||
|
<div ng-show="PNEnabledByUser">
|
||||||
|
<div class="item item-divider" translate>Notifications</div>
|
||||||
|
|
||||||
|
<ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
|
||||||
|
<span class="toggle-label" translate>Enable push notifications</span>
|
||||||
|
</ion-toggle>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div ng-show="!PNEnabledByUser && isIOSApp">
|
||||||
|
<div class="item item-divider" translate>Notifications</div>
|
||||||
|
<div class="padding text-light" translate>
|
||||||
|
Push notifications for Copay are currently disabled. Enable them in the Settings app.
|
||||||
|
</div>
|
||||||
|
<a class="item" ng-click="openSettings()">
|
||||||
|
<span translate>Open Settings app</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</ion-content>
|
||||||
|
</ion-view>
|
|
@ -4,7 +4,7 @@
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
||||||
<ion-content class="padding">
|
<ion-content class="padding">
|
||||||
<div class="list card homeTip" ng-show="homeTip">
|
<div class="list card homeTip" ng-if="homeTip">
|
||||||
<div class="item item-icon-right item-heading">
|
<div class="item item-icon-right item-heading">
|
||||||
<a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
|
<a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
|
||||||
</div>
|
</div>
|
||||||
|
@ -22,11 +22,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card" ng-hide="!txps[0]">
|
<div class="list card" ng-hide="!txps[0]">
|
||||||
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
|
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals">
|
||||||
Payment Proposals
|
{{'Payment Proposals'|translate}}
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
<span class="badge badge-assertive m5t m10r" ng-show="txpsN>3"> {{txpsN}}</span>
|
||||||
<span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
|
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
|
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
|
||||||
|
@ -34,9 +33,9 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card" ng-if="notifications[0]">
|
<div class="list card" ng-if="notifications[0] && recentTransactionsEnabled">
|
||||||
<a class="item item-icon-right item-heading" ui-sref="tabs.activity">
|
<a class="item item-icon-right item-heading" ui-sref="tabs.activity">
|
||||||
<span translate>Recent Activity</span>
|
<span translate>Recent Transactions</span>
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<span ng-if="fetchingNotifications" class="item text-center">
|
<span ng-if="fetchingNotifications" class="item text-center">
|
||||||
|
@ -61,50 +60,51 @@
|
||||||
</i>
|
</i>
|
||||||
<h2>
|
<h2>
|
||||||
{{wallet.name || wallet.id}}
|
{{wallet.name || wallet.id}}
|
||||||
<span class="size-12 text-light" ng-show="wallet.n > 1">
|
<span class="size-12 text-light" ng-if="wallet.n > 1">
|
||||||
{{wallet.m}}-of-{{wallet.n}}
|
{{wallet.m}}-of-{{wallet.n}}
|
||||||
</span>
|
</span>
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<span ng-show="!wallet.isComplete()" class="assertive" translate>
|
<span ng-if="!wallet.isComplete()" class="assertive" translate>
|
||||||
Incomplete
|
Incomplete
|
||||||
</span>
|
</span>
|
||||||
<div ng-show="wallet.isComplete()">
|
<div ng-if="wallet.isComplete()">
|
||||||
<span ng-show="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
|
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
|
||||||
<span ng-show="wallet.balanceHidden" translate>[Balance Hidden]</span>
|
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<a ui-sref="bitpayCard.main"
|
<a ui-sref="tabs.bitpayCard"
|
||||||
ng-show="externalServices.BitpayCard"
|
ng-if="externalServices.BitpayCard"
|
||||||
class="item item-icon-left item-big-icon-left item-icon-right">
|
class="item item-icon-left item-big-icon-left item-icon-right">
|
||||||
<i class="icon big-icon-svg">
|
<i class="icon big-icon-svg">
|
||||||
<div class="bg icon-bitpay-card"></div>
|
<div class="bg icon-bitpay-card"></div>
|
||||||
</i>
|
</i>
|
||||||
<h2>BitPay Card</h2>
|
<h2>BitPay Card</h2>
|
||||||
<p translate>Add funds to get started</p>
|
<p ng-if="!bitpayCard" translate>Add funds to get started</p>
|
||||||
|
<span ng-if="bitpayCard">${{bitpayCard.balance}}</span>
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card" ng-show="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
|
<div class="list card" ng-if="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
|
||||||
<div class="item item-icon-right item-heading" translate>
|
<div class="item item-icon-right item-heading" translate>
|
||||||
Buy & Sell Bitcoin
|
Buy & Sell Bitcoin
|
||||||
<a ui-sref="tabs.buyandsell"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
<a ui-sref="tabs.buyandsell"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||||
</div>
|
</div>
|
||||||
<a ng-show="glideraEnabled" ui-sref="tabs.buyandsell.glidera" class="item item-icon-right">
|
<a ng-if="glideraEnabled" ui-sref="tabs.buyandsell.glidera" class="item item-icon-right">
|
||||||
<img src="img/glidera-logo.png" width="90"/>
|
<img src="img/glidera-logo.png" width="90"/>
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<!-- disable coinbase for this release -->
|
<!-- disable coinbase for this release -->
|
||||||
<!-- <a ng-show="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
|
<!-- <a ng-if="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
|
||||||
<img src="img/coinbase-logo.png" width="90"> TODO
|
<img src="img/coinbase-logo.png" width="90"> TODO
|
||||||
</a> -->
|
</a> -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card" ng-show="externalServices.AmazonGiftCards">
|
<div class="list card" ng-if="externalServices.AmazonGiftCards">
|
||||||
<a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="tabs.giftcards.amazon">
|
<a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="tabs.giftcards.amazon">
|
||||||
<i class="icon big-icon-svg">
|
<i class="icon big-icon-svg">
|
||||||
<div class="bg icon-gift"></div>
|
<div class="bg icon-gift"></div>
|
||||||
|
@ -115,38 +115,42 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card"
|
<div class="list card"
|
||||||
ng-show="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
|
ng-if="(!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]) && nextStepEnabled">
|
||||||
<div class="item item-heading" translate>
|
<div class="item item-icon-right item-heading" ng-click="shouldHideNextSteps()" translate>
|
||||||
Next steps
|
Next steps
|
||||||
|
<i class="icon nav-item-arrow-down" ng-if="!hideNextSteps"></i>
|
||||||
|
<i class="icon nav-item-arrow-up" ng-if="hideNextSteps"></i>
|
||||||
|
</div>
|
||||||
|
<div ng-if="!hideNextSteps">
|
||||||
|
<a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
||||||
|
<i class="icon big-icon-svg">
|
||||||
|
<div class="bg icon-create-wallet"></div>
|
||||||
|
</i>
|
||||||
|
<span translate>Create a bitcoin wallet</span>
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
</a>
|
||||||
|
<a ui-sref="bitpayCard.main" ng-if="!externalServices.BitpayCard && bitpayCardEnabled" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
||||||
|
<i class="icon big-icon-svg">
|
||||||
|
<div class="bg icon-bitpay-card"></div>
|
||||||
|
</i>
|
||||||
|
<span translate>Add BitPay Card</span>
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
</a>
|
||||||
|
<a ng-if="!externalServices.BuyAndSell && (coinbaseEnabled || glideraEnabled)" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
||||||
|
<i class="icon big-icon-svg">
|
||||||
|
<div class="bg icon-buy-bitcoin"></div>
|
||||||
|
</i>
|
||||||
|
<span translate>Buy or Sell Bitcoin</span>
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
</a>
|
||||||
|
<a ui-sref="tabs.giftcards.amazon" ng-if="!externalServices.AmazonGiftCards && amazonEnabled" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
||||||
|
<i class="icon big-icon-svg">
|
||||||
|
<div class="bg icon-gift"></div>
|
||||||
|
</i>
|
||||||
|
<span translate>Buy Amazon.com Gift Card</span>
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
|
||||||
<i class="icon big-icon-svg">
|
|
||||||
<div class="bg icon-create-wallet"></div>
|
|
||||||
</i>
|
|
||||||
<span translate>Create a bitcoin wallet</span>
|
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
|
||||||
</a>
|
|
||||||
<a ui-sref="bitpayCard.main" ng-if="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
|
||||||
<i class="icon big-icon-svg">
|
|
||||||
<div class="bg icon-bitpay-card"></div>
|
|
||||||
</i>
|
|
||||||
<span translate>Add BitPay Card</span>
|
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
|
||||||
</a>
|
|
||||||
<a ng-if="!externalServices.BuyAndSell" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
|
||||||
<i class="icon big-icon-svg">
|
|
||||||
<div class="bg icon-buy-bitcoin"></div>
|
|
||||||
</i>
|
|
||||||
<span translate>Buy or Sell Bitcoin</span>
|
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
|
||||||
</a>
|
|
||||||
<a ui-sref="tabs.giftcards.amazon" ng-if="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
|
||||||
<i class="icon big-icon-svg">
|
|
||||||
<div class="bg icon-gift"></div>
|
|
||||||
</i>
|
|
||||||
<span translate>Buy Amazon.com Gift Card</span>
|
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p class="padding" style="text-align:center; color:#999">
|
<p class="padding" style="text-align:center; color:#999">
|
||||||
|
|
|
@ -8,42 +8,67 @@
|
||||||
</ion-nav-buttons>
|
</ion-nav-buttons>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<article id="address">
|
<div id="address">
|
||||||
<div class="row">
|
<article class="text-center" ng-if="!wallet.isComplete()">
|
||||||
<div class="m15t text-center col center-block" copy-to-clipboard="addr">
|
<div class="incomplete">
|
||||||
<qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}"></qrcode>
|
<div class="title">
|
||||||
<div ng-if="!addr" style="height:220px; width:220px; margin:auto; background: white; padding-top: 20%;">
|
<span translate>Incomplete wallet</span>
|
||||||
...
|
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="wallet.needsBackup" class="assertive m10t" translate>
|
<div class="subtitle">
|
||||||
Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup.
|
<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>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="row border-top">
|
||||||
<div class="row">
|
<div class="col col-90 center-block bit-address text-center">
|
||||||
<div class="col" ng-show="isCordova && addr">
|
<div class="item item-icon-left">
|
||||||
<div class="item item-icon-left" ng-click="shareAddress(addr)">
|
<i class="icon ion-social-bitcoin-outline"></i>
|
||||||
<i class="icon ion-ios-upload-outline"></i>
|
<span class="bit-address-gen-address" ng-if="!generatingAddress" translate>address not yet available</span>
|
||||||
<span translate>Share</span>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col" ng-class="{'center-block col-50': !isCordova || !addr}">
|
</article>
|
||||||
<div class="item item-icon-left" ng-click="setAddress(true)">
|
<article ng-if="wallet.isComplete()">
|
||||||
<i class="icon ion-ios-loop"></i>
|
<div class="row backup" ng-show="!wallet.showBackupNeededModal && wallet.needsBackup" ng-click="goToBackupFlow()">
|
||||||
<span translate>Next Address</span>
|
<div class="m15t 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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="row qr">
|
||||||
<div class="row border-top">
|
<div class="m15t text-center col center-block" copy-to-clipboard="addr">
|
||||||
<div class="col col-90 center-block bit-address text-center">
|
<qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}"></qrcode>
|
||||||
<div class="item item-icon-left">
|
<div ng-if="!addr" style="height:220px; width:220px; margin:auto; background: white; padding-top: 20%;">
|
||||||
<i class="icon ion-social-bitcoin-outline"></i>
|
...
|
||||||
<span ng-if="generatingAddress">...</span>
|
</div>
|
||||||
<span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="row">
|
||||||
</article>
|
<div class="col" ng-show="isCordova && addr">
|
||||||
|
<div class="item item-icon-left" ng-click="shareAddress(addr)">
|
||||||
|
<i class="icon ion-ios-upload-outline"></i>
|
||||||
|
<span translate>Share</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col" ng-class="{'center-block col-50': !isCordova || !addr}">
|
||||||
|
<div class="item item-icon-left" ng-click="setAddress(true)">
|
||||||
|
<i class="icon ion-ios-loop"></i>
|
||||||
|
<span translate>Next Address</span>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
|
<span ng-if="generatingAddress">...</span>
|
||||||
|
<span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
<article id="wallets">
|
<article id="wallets">
|
||||||
<div class="list card padding text-center" ng-if="!wallets[0]">
|
<div class="list card padding text-center" ng-if="!wallets[0]">
|
||||||
<span translate>No Wallet</span>
|
<span translate>No Wallet</span>
|
||||||
|
|
|
@ -4,42 +4,47 @@
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<div>
|
<div class="item item-heading" translate>Recipient</div>
|
||||||
<div class="item item-heading" translate>Recipient</div>
|
<label class="item item-input bitcoin-address">
|
||||||
<label class="item item-input bitcoin-address">
|
<i class="icon ion-social-bitcoin placeholder-icon"></i>
|
||||||
<i class="icon ion-search placeholder-icon"></i>
|
<div class="qr-scan-icon" ng-style="{'width': '100%'}">
|
||||||
|
<qr-scanner class="qr-icon size-24" ng-style="{'top': '3px'}" on-scan="onQrCodeScanned(data)"></qr-scanner>
|
||||||
<input type="text"
|
<input type="text"
|
||||||
placeholder="Search or enter bitcoin address"
|
placeholder="{{'Search or enter bitcoin address' | translate}}"
|
||||||
ng-model="formData.search"
|
ng-model="formData.search"
|
||||||
ng-change="findContact(formData.search)"
|
ng-change="findContact(formData.search)"
|
||||||
ng-model-onblur>
|
ng-model-onblur>
|
||||||
</label>
|
</div>
|
||||||
</div>
|
</label>
|
||||||
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="item item-icon-right item-heading">
|
<div class="item item-icon-right item-heading">
|
||||||
<span translate>Contacts</span>
|
<span translate>Contacts</span>
|
||||||
<a ui-sref="tabs.send.addressbook"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
<a ng-show="hasContacts" ui-sref="tabs.send.addressbook"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||||
</div>
|
</div>
|
||||||
<a class="item item-icon-left ng-hide" ng-show="!hasContacts" ui-sref="tabs.send.addressbook">
|
<a class="item item-icon-left item-icon-right ng-hide" ng-show="!hasContacts" ui-sref="tabs.send.addressbook">
|
||||||
<gravatar class="send-gravatar" name="" width="30" email=""></gravatar>
|
<gravatar class="send-gravatar" name="" width="30" email=""></gravatar>
|
||||||
<span translate>Add a Contact</span>
|
<span translate>Add a Contact</span>
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<a class="item item-icon-left ng-hide" ng-repeat="item in list" ng-show="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
|
<a class="item item-icon-left item-icon-right ng-hide" ng-repeat="item in list" ng-show="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
|
||||||
<gravatar class="send-gravatar" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
|
<gravatar class="send-gravatar" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
|
||||||
{{item.name}}
|
{{item.name}}
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
<div class="show-more" ng-show="contactsShowMore" ng-click="showMore()" translate>
|
||||||
|
Show more
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card">
|
<div class="card" ng-show="hasWallets && !oneWallet">
|
||||||
<div class="item item-heading">
|
<div class="item item-heading">
|
||||||
<span translate>Transfer to Wallet</span>
|
<span translate>Transfer to Wallet</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item text-center ng-hide" ng-show="!hasWallets" translate>No Wallet</div>
|
<a class="item item-icon-left item-icon-right ng-hide" ng-repeat="item in list" ng-show="hasWallets && item.isWallet" ng-click="goToAmount(item)">
|
||||||
<a class="item item-icon-left ng-hide" ng-repeat="item in list" ng-show="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 ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
|
||||||
<gravatar class="send-gravatar" ng-show="!item.isWallet" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
|
|
||||||
{{item.name}}
|
{{item.name}}
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|
|
@ -14,6 +14,12 @@
|
||||||
|
|
||||||
<div class="item item-divider" translate>Preferences</div>
|
<div class="item item-divider" translate>Preferences</div>
|
||||||
|
|
||||||
|
<a class="item item-icon-left item-icon-right" ui-sref="tabs.notifications" ng-show="usePushNotifications">
|
||||||
|
<i class="icon ion-ios-bell-outline"></i>
|
||||||
|
<span translate>Notifications</span>
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
</a>
|
||||||
|
|
||||||
<a class="item item-icon-left item-icon-right" ui-sref="tabs.language">
|
<a class="item item-icon-left item-icon-right" ui-sref="tabs.language">
|
||||||
<i class="icon ion-ios-chatbubble-outline"></i>
|
<i class="icon ion-ios-chatbubble-outline"></i>
|
||||||
<span translate>Language</span>
|
<span translate>Language</span>
|
||||||
|
@ -50,43 +56,6 @@
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<div class="item item-divider" translate>Exchanges</div>
|
|
||||||
|
|
||||||
<ion-toggle ng-show="!isWP" ng-model="glideraEnabled.value" toggle-class="toggle-balanced" ng-change="glideraChange()">
|
|
||||||
<span class="toggle-label" translate>Enable Glidera Service</span>
|
|
||||||
</ion-toggle>
|
|
||||||
|
|
||||||
<!-- disable coinbase for this release -->
|
|
||||||
<!--
|
|
||||||
<ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()">
|
|
||||||
<span class="toggle-label" translate>Enable Coinbase Service</span>
|
|
||||||
</ion-toggle>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div class="item item-divider" translate>Others</div>
|
|
||||||
|
|
||||||
<ion-toggle ng-model="spendUnconfirmed.value" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
|
|
||||||
<span class="toggle-label" translate>Use Unconfirmed Funds</span>
|
|
||||||
</ion-toggle>
|
|
||||||
|
|
||||||
<div ng-show="usePushNotifications && PNEnabledByUser">
|
|
||||||
<div class="item item-divider" translate>Notifications</div>
|
|
||||||
|
|
||||||
<ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
|
|
||||||
<span class="toggle-label" translate>Enable push notifications</span>
|
|
||||||
</ion-toggle>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
|
|
||||||
<div class="item item-divider" translate>Notifications</div>
|
|
||||||
<div class="padding text-light" translate>
|
|
||||||
Push notifications for Copay are currently disabled. Enable them in the Settings app.
|
|
||||||
</div>
|
|
||||||
<a class="item" ng-click="openSettings()">
|
|
||||||
<span translate>Open Settings app</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="item item-divider" translate>Wallets Preferences</div>
|
<div class="item item-divider" translate>Wallets Preferences</div>
|
||||||
<a class="item item-icon-left item-icon-right" href
|
<a class="item item-icon-left item-icon-right" href
|
||||||
ui-sref="tabs.preferences({'walletId': item.id})"
|
ui-sref="tabs.preferences({'walletId': item.id})"
|
||||||
|
@ -102,6 +71,12 @@
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
<div class="item item-divider"></div>
|
||||||
|
<a class="item item-icon-right" href ui-sref="tabs.advanced">
|
||||||
|
<span translate>Advanced</span>
|
||||||
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
</a>
|
||||||
|
|
||||||
<div class="item item-divider"></div>
|
<div class="item item-divider"></div>
|
||||||
<a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
|
<a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
|
||||||
<i class="icon ion-ios-information-outline"></i>
|
<i class="icon ion-ios-information-outline"></i>
|
||||||
|
|
|
@ -3,13 +3,13 @@ Create tabs with an icon and label, using the tabs-positive style.
|
||||||
Each tab's child <ion-nav-view> directive will have its own
|
Each tab's child <ion-nav-view> directive will have its own
|
||||||
navigation history that also transitions its views in and out.
|
navigation history that also transitions its views in and out.
|
||||||
-->
|
-->
|
||||||
<ion-tabs class="tabs-icon-top tabs-color-active-positive" ng-controller="tabsController">
|
<ion-tabs class="tabs-icon-top tabs-color-active-positive" ng-class="{'tabs-item-hide': hideTabs}">
|
||||||
|
|
||||||
<ion-tab title="Home" icon-off="ico-home" icon-on="ico-home-selected" href="#/tabs/home">
|
<ion-tab title="Home" icon-off="ico-home" icon-on="ico-home-selected" ui-sref="tabs.home">
|
||||||
<ion-nav-view name="tab-home"></ion-nav-view>
|
<ion-nav-view name="tab-home"></ion-nav-view>
|
||||||
</ion-tab>
|
</ion-tab>
|
||||||
|
|
||||||
<ion-tab title="Receive" icon-off="ico-receive" icon-on="ico-receive-selected" href="#/tabs/receive">
|
<ion-tab title="Receive" icon-off="ico-receive" icon-on="ico-receive-selected" ui-sref="tabs.receive">
|
||||||
<ion-nav-view name="tab-receive"></ion-nav-view>
|
<ion-nav-view name="tab-receive"></ion-nav-view>
|
||||||
</ion-tab>
|
</ion-tab>
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ navigation history that also transitions its views in and out.
|
||||||
<ion-tab title="Scan" icon-off="ico-scan" ng-click="scan()" >
|
<ion-tab title="Scan" icon-off="ico-scan" ng-click="scan()" >
|
||||||
</ion-tab>
|
</ion-tab>
|
||||||
|
|
||||||
<ion-tab title="Send" icon-off="ico-send" icon-on="ico-send-selected" href="#/tabs/send">
|
<ion-tab title="Send" icon-off="ico-send" icon-on="ico-send-selected" ui-sref="tabs.send">
|
||||||
<ion-nav-view name="tab-send"></ion-nav-view>
|
<ion-nav-view name="tab-send"></ion-nav-view>
|
||||||
</ion-tab>
|
</ion-tab>
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
translate>No transactions yet {{status.totalBalanceStr}}
|
translate>No transactions yet {{status.totalBalanceStr}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="updatingTxHistory" class="updatingHistory">
|
<div ng-show="updatingTxHistory && updatingTxHistoryProgress>5" class="updatingHistory">
|
||||||
<div class="row" >
|
<div class="row" >
|
||||||
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
|
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -0,0 +1,113 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService) {
|
||||||
|
|
||||||
|
var updateConfig = function() {
|
||||||
|
|
||||||
|
var config = configService.getSync();
|
||||||
|
|
||||||
|
$scope.spendUnconfirmed = {
|
||||||
|
value: config.wallet.spendUnconfirmed
|
||||||
|
};
|
||||||
|
$scope.bitpayCardEnabled = {
|
||||||
|
value: config.bitpayCard.enabled
|
||||||
|
};
|
||||||
|
$scope.amazonEnabled = {
|
||||||
|
value: config.amazon.enabled
|
||||||
|
};
|
||||||
|
$scope.glideraEnabled = {
|
||||||
|
value: config.glidera.enabled
|
||||||
|
};
|
||||||
|
$scope.coinbaseEnabled = {
|
||||||
|
value: config.coinbase.enabled
|
||||||
|
};
|
||||||
|
$scope.recentTransactionsEnabled = {
|
||||||
|
value: config.recentTransactions.enabled
|
||||||
|
};
|
||||||
|
$scope.frequentlyUsedEnabled = {
|
||||||
|
value: config.frequentlyUsed.enabled
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.spendUnconfirmedChange = function() {
|
||||||
|
var opts = {
|
||||||
|
wallet: {
|
||||||
|
spendUnconfirmed: $scope.spendUnconfirmed.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.bitpayCardChange = function() {
|
||||||
|
var opts = {
|
||||||
|
bitpayCard: {
|
||||||
|
enabled: $scope.bitpayCardEnabled.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.amazonChange = function() {
|
||||||
|
var opts = {
|
||||||
|
amazon: {
|
||||||
|
enabled: $scope.amazonEnabled.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.glideraChange = function() {
|
||||||
|
var opts = {
|
||||||
|
glidera: {
|
||||||
|
enabled: $scope.glideraEnabled.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.coinbaseChange = function() {
|
||||||
|
var opts = {
|
||||||
|
coinbase: {
|
||||||
|
enabled: $scope.coinbaseEnabled.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.recentTransactionsChange = function() {
|
||||||
|
var opts = {
|
||||||
|
recentTransactions: {
|
||||||
|
enabled: $scope.recentTransactionsEnabled.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.frequentlyUsedChange = function() {
|
||||||
|
var opts = {
|
||||||
|
frequentlyUsed: {
|
||||||
|
enabled: $scope.frequentlyUsedEnabled.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
|
updateConfig();
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) {
|
angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, bitpayCardService, popupService) {
|
||||||
|
|
||||||
var unitToSatoshi;
|
var unitToSatoshi;
|
||||||
var satToUnit;
|
var satToUnit;
|
||||||
|
@ -10,18 +10,20 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
var SMALL_FONT_SIZE_LIMIT = 13;
|
var SMALL_FONT_SIZE_LIMIT = 13;
|
||||||
var LENGTH_EXPRESSION_LIMIT = 19;
|
var LENGTH_EXPRESSION_LIMIT = 19;
|
||||||
|
|
||||||
$scope.isWallet = $stateParams.isWallet;
|
$scope.$on('$ionicView.leave', function() {
|
||||||
$scope.toAddress = $stateParams.toAddress;
|
|
||||||
$scope.toName = $stateParams.toName;
|
|
||||||
$scope.toEmail = $stateParams.toEmail;
|
|
||||||
|
|
||||||
$scope.$on('$ionicView.beforeLeave', function() {
|
|
||||||
angular.element($window).off('keydown');
|
angular.element($window).off('keydown');
|
||||||
});
|
});
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
|
|
||||||
if (!$stateParams.toAddress) {
|
$scope.isWallet = data.stateParams.isWallet;
|
||||||
|
$scope.isCard = data.stateParams.isCard;
|
||||||
|
$scope.toAddress = data.stateParams.toAddress;
|
||||||
|
$scope.toName = data.stateParams.toName;
|
||||||
|
$scope.toEmail = data.stateParams.toEmail;
|
||||||
|
$scope.showAlternativeAmount = !!$scope.isCard;
|
||||||
|
|
||||||
|
if (!$scope.isCard && !$stateParams.toAddress) {
|
||||||
$log.error('Bad params at amount')
|
$log.error('Bad params at amount')
|
||||||
throw ('bad params');
|
throw ('bad params');
|
||||||
}
|
}
|
||||||
|
@ -60,6 +62,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
satToBtc = 1 / 100000000;
|
satToBtc = 1 / 100000000;
|
||||||
unitDecimals = config.unitDecimals;
|
unitDecimals = config.unitDecimals;
|
||||||
|
|
||||||
|
$scope.resetAmount();
|
||||||
|
|
||||||
// in SAT ALWAYS
|
// in SAT ALWAYS
|
||||||
if ($stateParams.toAmount) {
|
if ($stateParams.toAmount) {
|
||||||
$scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals);
|
$scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals);
|
||||||
|
@ -69,7 +73,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$ionicScrollDelegate.resize();
|
$ionicScrollDelegate.resize();
|
||||||
}, 100);
|
}, 10);
|
||||||
});
|
});
|
||||||
|
|
||||||
$scope.toggleAlternative = function() {
|
$scope.toggleAlternative = function() {
|
||||||
|
@ -95,7 +99,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.pushOperator = function(operator) {
|
$scope.pushOperator = function(operator) {
|
||||||
console.log('[amount.js.90:operator:]', operator); //TODO
|
|
||||||
if (!$scope.amount || $scope.amount.length == 0) return;
|
if (!$scope.amount || $scope.amount.length == 0) return;
|
||||||
$scope.amount = _pushOperator($scope.amount);
|
$scope.amount = _pushOperator($scope.amount);
|
||||||
|
|
||||||
|
@ -183,14 +186,50 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
|
|
||||||
$scope.finish = function() {
|
$scope.finish = function() {
|
||||||
var _amount = evaluate(format($scope.amount));
|
var _amount = evaluate(format($scope.amount));
|
||||||
var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
|
|
||||||
|
|
||||||
$state.transitionTo('tabs.send.confirm', {
|
if ($scope.isCard) {
|
||||||
isWallet: $scope.isWallet,
|
var amountUSD = $scope.showAlternativeAmount ? _amount : $filter('formatFiatAmount')(toFiat(_amount));
|
||||||
toAmount: amount * unitToSatoshi,
|
|
||||||
toAddress: $scope.toAddress,
|
var dataSrc = {
|
||||||
toName: $scope.toName,
|
amount: amountUSD,
|
||||||
toEmail: $scope.toEmail
|
currency: 'USD'
|
||||||
});
|
};
|
||||||
|
ongoingProcess.set('Processing Transaction...', true);
|
||||||
|
$timeout(function() {
|
||||||
|
|
||||||
|
bitpayCardService.topUp(dataSrc, function(err, invoiceId) {
|
||||||
|
if (err) {
|
||||||
|
ongoingProcess.set('Processing Transaction...', false);
|
||||||
|
popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
bitpayCardService.getInvoice(invoiceId, function(err, data) {
|
||||||
|
ongoingProcess.set('Processing Transaction...', false);
|
||||||
|
if (err) {
|
||||||
|
popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var payProUrl = data.paymentUrls.BIP73;
|
||||||
|
|
||||||
|
$state.transitionTo('tabs.bitpayCard.confirm', {
|
||||||
|
isCard: $scope.isCard,
|
||||||
|
toName: $scope.toName,
|
||||||
|
paypro: payProUrl
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
} else {
|
||||||
|
var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
|
||||||
|
$state.transitionTo('tabs.send.confirm', {
|
||||||
|
isWallet: $scope.isWallet,
|
||||||
|
toAmount: amount * unitToSatoshi,
|
||||||
|
toAddress: $scope.toAddress,
|
||||||
|
toName: $scope.toName,
|
||||||
|
toEmail: $scope.toEmail
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
@ -3,15 +3,14 @@
|
||||||
angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, popupService, gettextCatalog, bwcError) {
|
angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, popupService, gettextCatalog, bwcError) {
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
var wallet;
|
$scope.dateRange = 'last30Days';
|
||||||
|
$scope.network = bitpayCardService.getEnvironment();
|
||||||
|
|
||||||
$scope.$on('Wallet/Changed', function(event, w) {
|
bitpayCardService.getCacheData(function(err, data) {
|
||||||
if (lodash.isEmpty(w)) {
|
if (err || lodash.isEmpty(data)) return;
|
||||||
$log.debug('No wallet provided');
|
$scope.bitpayCardCached = true;
|
||||||
return;
|
self.bitpayCardTransactionHistory = data.transactions;
|
||||||
}
|
self.bitpayCardCurrentBalance = data.balance;
|
||||||
wallet = w;
|
|
||||||
$log.debug('Wallet changed: ' + w.name);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
var processTransactions = function(invoices, history) {
|
var processTransactions = function(invoices, history) {
|
||||||
|
@ -89,6 +88,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
|
||||||
|
|
||||||
self.bitpayCardTransactionHistory = processTransactions(invoices, history.transactionList);
|
self.bitpayCardTransactionHistory = processTransactions(invoices, history.transactionList);
|
||||||
self.bitpayCardCurrentBalance = history.currentCardBalance;
|
self.bitpayCardCurrentBalance = history.currentCardBalance;
|
||||||
|
|
||||||
|
var cacheData = {
|
||||||
|
balance: self.bitpayCardCurrentBalance,
|
||||||
|
transactions: self.bitpayCardTransactionHistory
|
||||||
|
};
|
||||||
|
bitpayCardService.setCacheData(cacheData, function(err) {
|
||||||
|
if (err) $log.error(err);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -98,103 +105,11 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.init = function() {
|
this.authenticate = function(email, password) {
|
||||||
$scope.dateRange = 'last30Days';
|
|
||||||
|
|
||||||
$scope.network = bitpayCardService.getEnvironment();
|
|
||||||
$scope.wallets = profileService.getWallets({
|
|
||||||
network: $scope.network,
|
|
||||||
onlyComplete: true
|
|
||||||
});
|
|
||||||
|
|
||||||
self.update();
|
|
||||||
|
|
||||||
wallet = $scope.wallets[0];
|
|
||||||
|
|
||||||
if (wallet && wallet.credentials.n > 1)
|
|
||||||
self.isMultisigWallet = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.sendFunds = function() {
|
|
||||||
if (lodash.isEmpty(wallet)) return;
|
|
||||||
|
|
||||||
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
|
|
||||||
$log.info('No signing proposal: No private key');
|
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg('MISSING_PRIVATE_KEY'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var dataSrc = {
|
|
||||||
amount: $scope.fiat,
|
|
||||||
currency: 'USD'
|
|
||||||
};
|
|
||||||
var outputs = [];
|
|
||||||
var config = configService.getSync();
|
|
||||||
var configWallet = config.wallet;
|
|
||||||
var walletSettings = configWallet.settings;
|
|
||||||
|
|
||||||
|
|
||||||
ongoingProcess.set('Processing Transaction...', true);
|
|
||||||
$timeout(function() {
|
|
||||||
|
|
||||||
bitpayCardService.topUp(dataSrc, function(err, invoiceId) {
|
|
||||||
if (err) {
|
|
||||||
ongoingProcess.set('Processing Transaction...', false);
|
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
bitpayCardService.getInvoice(invoiceId, function(err, data) {
|
|
||||||
var address, comment, amount;
|
|
||||||
|
|
||||||
address = data.bitcoinAddress;
|
|
||||||
amount = parseInt((data.btcPrice * 100000000).toFixed(0));
|
|
||||||
comment = data.itemDesc;
|
|
||||||
|
|
||||||
outputs.push({
|
|
||||||
'toAddress': address,
|
|
||||||
'amount': amount,
|
|
||||||
'message': comment
|
|
||||||
});
|
|
||||||
|
|
||||||
var txp = {
|
|
||||||
toAddress: address,
|
|
||||||
amount: amount,
|
|
||||||
outputs: outputs,
|
|
||||||
message: comment,
|
|
||||||
payProUrl: null,
|
|
||||||
excludeUnconfirmedUtxos: configWallet.spendUnconfirmed ? false : true,
|
|
||||||
feeLevel: walletSettings.feeLevel || 'normal'
|
|
||||||
};
|
|
||||||
|
|
||||||
walletService.createTx(wallet, txp, function(err, createdTxp) {
|
|
||||||
ongoingProcess.set('Processing Transaction...', false);
|
|
||||||
if (err) {
|
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
walletService.publishAndSign(wallet, createdTxp, function(err, tx) {
|
|
||||||
if (err) {
|
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
self.update();
|
|
||||||
$scope.addFunds = false;
|
|
||||||
$timeout(function() {
|
|
||||||
$scope.$digest();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}, 100);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.authenticate = function() {
|
|
||||||
|
|
||||||
var data = {
|
var data = {
|
||||||
emailAddress : $scope.email,
|
emailAddress : email,
|
||||||
hashedPassword : pbkdf2Service.pbkdf2Sync($scope.password, '..............', 200, 64).toString('hex')
|
hashedPassword : pbkdf2Service.pbkdf2Sync(password, '..............', 200, 64).toString('hex')
|
||||||
};
|
};
|
||||||
|
|
||||||
// POST /authenticate
|
// POST /authenticate
|
||||||
|
@ -215,10 +130,10 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.authenticate2FA = function() {
|
this.authenticate2FA = function(twoFactorCode) {
|
||||||
|
|
||||||
var data = {
|
var data = {
|
||||||
twoFactorCode : $scope.twoFactorCode
|
twoFactorCode : twoFactorCode
|
||||||
};
|
};
|
||||||
|
|
||||||
self.authenticating = true;
|
self.authenticating = true;
|
||||||
|
@ -258,5 +173,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
|
||||||
return tx.description;
|
return tx.description;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.$on("$ionicView.beforeEnter", function(event, data){
|
||||||
|
self.update();
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, gettext, txFormatService, ongoingProcess, $ionicModal, $ionicHistory, popupService) {
|
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) {
|
||||||
var cachedTxp = {};
|
var cachedTxp = {};
|
||||||
var isChromeApp = platformInfo.isChromeApp;
|
var isChromeApp = platformInfo.isChromeApp;
|
||||||
|
|
||||||
$scope.isWallet = $stateParams.isWallet;
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
$scope.toAmount = $stateParams.toAmount;
|
$scope.isWallet = data.stateParams.isWallet;
|
||||||
$scope.toAddress = $stateParams.toAddress;
|
$scope.isCard = data.stateParams.isCard;
|
||||||
$scope.toName = $stateParams.toName;
|
$scope.toAmount = data.stateParams.toAmount;
|
||||||
$scope.toEmail = $stateParams.toEmail;
|
$scope.toAddress = data.stateParams.toAddress;
|
||||||
$scope.description = $stateParams.description;
|
$scope.toName = data.stateParams.toName;
|
||||||
$scope.paypro = $stateParams.paypro;
|
$scope.toEmail = data.stateParams.toEmail;
|
||||||
|
$scope.description = data.stateParams.description;
|
||||||
$scope.$on("$ionicView.enter", function(event, data) {
|
$scope.paypro = data.stateParams.paypro;
|
||||||
initConfirm();
|
initConfirm();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -243,7 +243,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
|
|
||||||
walletService.createTx(wallet, txp, function(err, ctxp) {
|
walletService.createTx(wallet, txp, function(err, ctxp) {
|
||||||
if (err) {
|
if (err) {
|
||||||
return setSendError(err);
|
setSendError(err);
|
||||||
|
return cb(err);
|
||||||
}
|
}
|
||||||
return cb(null, ctxp);
|
return cb(null, ctxp);
|
||||||
});
|
});
|
||||||
|
@ -312,8 +313,4 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
if (err) return setSendError(err);
|
if (err) return setSendError(err);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.cancel = function() {
|
|
||||||
$state.go('tabs.send');
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('copayersController',
|
angular.module('copayApp.controllers').controller('copayersController',
|
||||||
function($scope, $log, $ionicNavBarDelegate, $timeout, $stateParams, $state, $rootScope, $ionicHistory, lodash, profileService, walletService, popupService, platformInfo, gettextCatalog, ongoingProcess) {
|
function($scope, $log, $timeout, $stateParams, $state, $rootScope, $ionicHistory, lodash, profileService, walletService, popupService, platformInfo, gettextCatalog, ongoingProcess) {
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
init();
|
init();
|
||||||
|
|
|
@ -37,7 +37,9 @@ angular.module('copayApp.controllers').controller('createController',
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showAdvChange = function() {
|
$scope.showAdvChange = function() {
|
||||||
$ionicScrollDelegate.resize();
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
|
}, 10);
|
||||||
};
|
};
|
||||||
|
|
||||||
function updateRCSelect(n) {
|
function updateRCSelect(n) {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('importController',
|
angular.module('copayApp.controllers').controller('importController',
|
||||||
function($scope, $timeout, $log, $state, $stateParams, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) {
|
function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) {
|
||||||
|
|
||||||
var isChromeApp = platformInfo.isChromeApp;
|
var isChromeApp = platformInfo.isChromeApp;
|
||||||
var isDevel = platformInfo.isDevel;
|
var isDevel = platformInfo.isDevel;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('joinController',
|
angular.module('copayApp.controllers').controller('joinController',
|
||||||
function($scope, $rootScope, $timeout, $state, profileService, configService, storageService, applicationService, gettext, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService) {
|
function($scope, $rootScope, $timeout, $state, $ionicHistory, profileService, configService, storageService, applicationService, gettext, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService) {
|
||||||
|
|
||||||
var isChromeApp = platformInfo.isChromeApp;
|
var isChromeApp = platformInfo.isChromeApp;
|
||||||
var isDevel = platformInfo.isDevel;
|
var isDevel = platformInfo.isDevel;
|
||||||
|
@ -146,7 +146,19 @@ angular.module('copayApp.controllers').controller('joinController',
|
||||||
$log.debug('Remote preferences saved for:' + client.credentials.walletId)
|
$log.debug('Remote preferences saved for:' + client.credentials.walletId)
|
||||||
});
|
});
|
||||||
$ionicHistory.removeBackView();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
|
||||||
|
if (!client.isComplete()) {
|
||||||
|
$ionicHistory.nextViewOptions({
|
||||||
|
disableAnimate: true
|
||||||
|
});
|
||||||
|
$state.go('tabs.home');
|
||||||
|
$timeout(function() {
|
||||||
|
$state.transitionTo('tabs.copayers', {
|
||||||
|
walletId: client.credentials.walletId
|
||||||
|
});
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
else $state.go('tabs.home')
|
||||||
});
|
});
|
||||||
}, 100);
|
}, 100);
|
||||||
};
|
};
|
||||||
|
|
|
@ -14,7 +14,9 @@ angular.module('copayApp.controllers').controller('searchController', function($
|
||||||
window.plugins.toast.hide();
|
window.plugins.toast.hide();
|
||||||
currentTxHistoryPage = 0;
|
currentTxHistoryPage = 0;
|
||||||
throttleSearch(search);
|
throttleSearch(search);
|
||||||
$ionicScrollDelegate.resize();
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
|
}, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
var throttleSearch = lodash.throttle(function(search) {
|
var throttleSearch = lodash.throttle(function(search) {
|
||||||
|
|
|
@ -73,6 +73,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
time: $scope.btx.time,
|
time: $scope.btx.time,
|
||||||
description: actionDescriptions['broadcasted'],
|
description: actionDescriptions['broadcasted'],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$scope.actionList.reverse();
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showCommentPopup = function() {
|
$scope.showCommentPopup = function() {
|
||||||
|
@ -126,6 +128,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
$scope.rateDate = res.fetchedOn;
|
$scope.rateDate = res.fetchedOn;
|
||||||
$scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode;
|
$scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode;
|
||||||
$scope.alternativeAmountStr = $filter('formatFiatAmount')(alternativeAmountBtc * res.rate) + ' ' + $scope.alternativeIsoCode;
|
$scope.alternativeAmountStr = $filter('formatFiatAmount')(alternativeAmountBtc * res.rate) + ' ' + $scope.alternativeIsoCode;
|
||||||
|
$timeout(function() {
|
||||||
|
$scope.$apply();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,15 +1,27 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) {
|
angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $stateParams, $ionicHistory, $log, addressbookService) {
|
||||||
|
|
||||||
if ($scope.cb) $timeout($scope.cb, 100);
|
if ($scope.cb) $timeout($scope.cb, 100);
|
||||||
$scope.fromSendTab = $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount" || "tabs.send";
|
|
||||||
|
var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName;
|
||||||
|
$scope.fromSendTab = previousView.match(/tabs.send/) ? true : false;
|
||||||
|
$scope.fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false;
|
||||||
|
$scope.fromPayPro = $stateParams.paypro ? true : false;
|
||||||
|
|
||||||
$scope.cancel = function() {
|
$scope.cancel = function() {
|
||||||
$scope.txStatusModal.hide();
|
$scope.txStatusModal.hide();
|
||||||
if ($scope.fromSendTab) {
|
if ($scope.fromSendTab) {
|
||||||
$ionicHistory.removeBackView();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.send');
|
||||||
|
$timeout(function() {
|
||||||
|
$state.transitionTo('tabs.home');
|
||||||
|
}, 100);
|
||||||
|
} else if ($scope.fromBitPayCard) {
|
||||||
|
$ionicHistory.removeBackView();
|
||||||
|
$timeout(function() {
|
||||||
|
$state.transitionTo('tabs.bitpayCard');
|
||||||
|
}, 100);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -21,7 +33,7 @@ angular.module('copayApp.controllers').controller('txStatusController', function
|
||||||
});
|
});
|
||||||
$ionicHistory.removeBackView();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.send.addressbook', {
|
$state.go('tabs.send.addressbook', {
|
||||||
fromSendTab: true,
|
fromSendTab: $scope.fromSendTab,
|
||||||
addressbookEntry: addressbookEntry
|
addressbookEntry: addressbookEntry
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
var isGlidera = $scope.isGlidera;
|
var isGlidera = $scope.isGlidera;
|
||||||
var GLIDERA_LOCK_TIME = 6 * 60 * 60;
|
var GLIDERA_LOCK_TIME = 6 * 60 * 60;
|
||||||
var now = Math.floor(Date.now() / 1000);
|
var now = Math.floor(Date.now() / 1000);
|
||||||
|
var countDown;
|
||||||
|
|
||||||
$scope.init = function() {
|
$scope.init = function() {
|
||||||
$scope.loading = null;
|
$scope.loading = null;
|
||||||
|
@ -18,6 +19,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
$scope.data = {};
|
$scope.data = {};
|
||||||
|
|
||||||
initActionList();
|
initActionList();
|
||||||
|
checkPaypro();
|
||||||
}
|
}
|
||||||
|
|
||||||
function initActionList() {
|
function initActionList() {
|
||||||
|
@ -47,14 +49,14 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
by: action.copayerName
|
by: action.copayerName
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$scope.actionList.reverse();
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on('accepted', function(event) {
|
$scope.$on('accepted', function(event) {
|
||||||
$scope.sign();
|
$scope.sign();
|
||||||
});
|
});
|
||||||
|
|
||||||
checkPaypro();
|
|
||||||
|
|
||||||
// ToDo: use tx.customData instead of tx.message
|
// ToDo: use tx.customData instead of tx.message
|
||||||
if (tx.message === 'Glidera transaction' && isGlidera) {
|
if (tx.message === 'Glidera transaction' && isGlidera) {
|
||||||
tx.isGlidera = true;
|
tx.isGlidera = true;
|
||||||
|
@ -145,7 +147,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
paymentTimeControl(tx.paypro.expires);
|
paymentTimeControl(tx.paypro.expires);
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$ionicScrollDelegate.resize();
|
$ionicScrollDelegate.resize();
|
||||||
}, 100);
|
}, 10);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -154,7 +156,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
$scope.paymentExpired = false;
|
$scope.paymentExpired = false;
|
||||||
setExpirationTime();
|
setExpirationTime();
|
||||||
|
|
||||||
self.countDown = $interval(function() {
|
countDown = $interval(function() {
|
||||||
setExpirationTime();
|
setExpirationTime();
|
||||||
}, 1000);
|
}, 1000);
|
||||||
|
|
||||||
|
@ -162,7 +164,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
var now = Math.floor(Date.now() / 1000);
|
var now = Math.floor(Date.now() / 1000);
|
||||||
if (now > expirationTime) {
|
if (now > expirationTime) {
|
||||||
$scope.paymentExpired = true;
|
$scope.paymentExpired = true;
|
||||||
if (self.countDown) $interval.cancel(self.countDown);
|
if (countDown) $interval.cancel(countDown);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var totalSecs = expirationTime - now;
|
var totalSecs = expirationTime - now;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicPopup, popupService, gettextCatalog) {
|
angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, popupService, gettextCatalog) {
|
||||||
|
|
||||||
$scope.walletId = $stateParams.walletId;
|
$scope.walletId = $stateParams.walletId;
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,35 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService, $ionicModal) {
|
angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, profileService, $ionicModal) {
|
||||||
|
|
||||||
$scope.walletId = $stateParams.walletId;
|
$scope.walletId = $stateParams.walletId;
|
||||||
$scope.openPopup = function() {
|
$scope.openPopup = function() {
|
||||||
$ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', {
|
$ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', {
|
||||||
scope: $scope,
|
scope: $scope,
|
||||||
backdropClickToClose: false,
|
backdropClickToClose: false,
|
||||||
hardwareBackButtonClose: false
|
hardwareBackButtonClose: false
|
||||||
}).then(function(modal) {
|
}).then(function(modal) {
|
||||||
$scope.warningModal = modal;
|
$scope.warningModal = modal;
|
||||||
$scope.warningModal.show();
|
$scope.warningModal.show();
|
||||||
});
|
});
|
||||||
|
|
||||||
$scope.close = function() {
|
$scope.close = function() {
|
||||||
$scope.warningModal.hide();
|
$scope.warningModal.hide();
|
||||||
$state.go('onboarding.backup', {
|
if ($stateParams.from == 'onboarding.backupRequest')
|
||||||
walletId: $stateParams.walletId,
|
$state.go('onboarding.backup', {
|
||||||
fromOnboarding: true
|
walletId: $stateParams.walletId
|
||||||
});
|
});
|
||||||
|
else
|
||||||
|
$state.go($stateParams.from + '.backup', {
|
||||||
|
walletId: $stateParams.walletId
|
||||||
|
});
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$scope.goBack = function() {
|
||||||
|
$state.go($stateParams.from, {
|
||||||
|
walletId: $stateParams.walletId
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
|
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, profileService) {
|
||||||
|
|
||||||
$scope.goImport = function(code) {
|
$scope.goImport = function(code) {
|
||||||
$state.go('onboarding.import', {
|
$state.go('onboarding.import', {
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('preferencesAbout',
|
angular.module('copayApp.controllers').controller('preferencesAbout',
|
||||||
function($scope, $window, $ionicNavBarDelegate, gettextCatalog, externalLinkService) {
|
function($scope, $window, gettextCatalog, externalLinkService) {
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data){
|
|
||||||
$ionicNavBarDelegate.title(gettextCatalog.getString('About') + ' ' + $window.appConfig.nameCase);
|
|
||||||
});
|
|
||||||
|
|
||||||
|
$scope.title = gettextCatalog.getString('About') + ' ' + $window.appConfig.nameCase;
|
||||||
$scope.version = $window.version;
|
$scope.version = $window.version;
|
||||||
$scope.commitHash = $window.commitHash;
|
$scope.commitHash = $window.commitHash;
|
||||||
$scope.name = $window.appConfig.gitHubRepoName;
|
$scope.name = $window.appConfig.gitHubRepoName;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('preferencesBitpayCardController',
|
angular.module('copayApp.controllers').controller('preferencesBitpayCardController',
|
||||||
function($scope, $state, $timeout, bitpayCardService, popupService) {
|
function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) {
|
||||||
|
|
||||||
$scope.logout = function() {
|
$scope.logout = function() {
|
||||||
var title = 'Are you sure you would like to log out of your Bitpay Card account?';
|
var title = 'Are you sure you would like to log out of your Bitpay Card account?';
|
||||||
|
@ -12,8 +12,9 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll
|
||||||
|
|
||||||
var logout = function() {
|
var logout = function() {
|
||||||
bitpayCardService.logout(function() {
|
bitpayCardService.logout(function() {
|
||||||
|
$ionicHistory.removeBackView();
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$state.go('bitpayCard.main');
|
$state.go('tabs.home');
|
||||||
}, 100);
|
}, 100);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
|
||||||
function($scope, $stateParams, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) {
|
function($scope, $stateParams, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) {
|
||||||
var wallet = profileService.getWallet($stateParams.walletId);
|
var wallet = profileService.getWallet($stateParams.walletId);
|
||||||
$scope.alias = lodash.isEqual(wallet.name, wallet.credentials.walletName) ? null : wallet.name + ' ';
|
$scope.alias = lodash.isEqual(wallet.name, wallet.credentials.walletName) ? null : wallet.name + ' ';
|
||||||
$scope.walletName = '[' + wallet.credentials.walletName + ']';
|
$scope.walletName = wallet.credentials.walletName;
|
||||||
|
|
||||||
$scope.showDeletePopup = function() {
|
$scope.showDeletePopup = function() {
|
||||||
var title = gettextCatalog.getString('Warning!');
|
var title = gettextCatalog.getString('Warning!');
|
||||||
|
|
|
@ -114,9 +114,9 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
|
||||||
}
|
}
|
||||||
$scope.addrs = last10;
|
$scope.addrs = last10;
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
});
|
}, 10);
|
||||||
$ionicScrollDelegate.resize();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
angular.module('copayApp.controllers').controller('preferencesNotificationsController',
|
||||||
|
function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService) {
|
||||||
|
|
||||||
|
var updateConfig = function() {
|
||||||
|
|
||||||
|
var config = configService.getSync();
|
||||||
|
var isCordova = platformInfo.isCordova;
|
||||||
|
var isIOS = platformInfo.isIOS;
|
||||||
|
|
||||||
|
$scope.PNEnabledByUser = true;
|
||||||
|
$scope.isIOSApp = isIOS && isCordova;
|
||||||
|
if ($scope.isIOSApp) {
|
||||||
|
cordova.plugins.diagnostic.isRemoteNotificationsEnabled(function(isEnabled) {
|
||||||
|
$scope.PNEnabledByUser = isEnabled;
|
||||||
|
$scope.$digest();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$scope.pushNotifications = {
|
||||||
|
value: config.pushNotifications.enabled
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.openSettings = function() {
|
||||||
|
cordova.plugins.diagnostic.switchToSettings(function() {
|
||||||
|
$log.debug('switched to settings');
|
||||||
|
}, function(err) {
|
||||||
|
$log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.pushNotificationsChange = function() {
|
||||||
|
var opts = {
|
||||||
|
pushNotifications: {
|
||||||
|
enabled: $scope.pushNotifications.value
|
||||||
|
}
|
||||||
|
};
|
||||||
|
configService.set(opts, function(err) {
|
||||||
|
if (opts.pushNotifications.enabled)
|
||||||
|
pushNotificationsService.enableNotifications(profileService.walletClients);
|
||||||
|
else
|
||||||
|
pushNotificationsService.disableNotifications(profileService.walletClients);
|
||||||
|
if (err) $log.debug(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
|
updateConfig();
|
||||||
|
});
|
||||||
|
});
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('tabHomeController',
|
angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window) {
|
function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService) {
|
||||||
var wallet;
|
var wallet;
|
||||||
$scope.externalServices = {};
|
$scope.externalServices = {};
|
||||||
$scope.bitpayCardEnabled = true; // TODO
|
$scope.bitpayCardEnabled = true; // TODO
|
||||||
|
@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
$state.go('tabs.details', {
|
$state.go('tabs.wallet', {
|
||||||
walletId: wallet.credentials.walletId
|
walletId: wallet.credentials.walletId
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -88,11 +88,10 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
if (err) $log.error(err);
|
if (err) $log.error(err);
|
||||||
$scope.txps = txps;
|
$scope.txps = txps;
|
||||||
$scope.txpsN = n;
|
$scope.txpsN = n;
|
||||||
$ionicScrollDelegate.resize();
|
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}, 1);
|
}, 10);
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -118,6 +117,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (!$scope.recentTransactionsEnabled) return;
|
||||||
$scope.fetchingNotifications = true;
|
$scope.fetchingNotifications = true;
|
||||||
profileService.getNotifications({
|
profileService.getNotifications({
|
||||||
limit: 3
|
limit: 3
|
||||||
|
@ -128,11 +128,11 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
}
|
}
|
||||||
$scope.fetchingNotifications = false;
|
$scope.fetchingNotifications = false;
|
||||||
$scope.notifications = n;
|
$scope.notifications = n;
|
||||||
$ionicScrollDelegate.resize();
|
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}, 1);
|
}, 10);
|
||||||
|
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
@ -145,6 +145,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
wallet.status = status;
|
wallet.status = status;
|
||||||
|
updateTxps();
|
||||||
|
|
||||||
|
if (!$scope.recentTransactionsEnabled) return;
|
||||||
|
|
||||||
$scope.fetchingNotifications = true;
|
$scope.fetchingNotifications = true;
|
||||||
profileService.getNotifications({
|
profileService.getNotifications({
|
||||||
|
@ -156,8 +159,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$scope.notifications = notifications;
|
$scope.notifications = notifications;
|
||||||
|
|
||||||
updateTxps();
|
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -175,11 +176,20 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
lodash.each(['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'], function(service) {
|
lodash.each(['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'], function(service) {
|
||||||
storageService.getNextStep(service, function(err, value) {
|
storageService.getNextStep(service, function(err, value) {
|
||||||
$scope.externalServices[service] = value ? true : false;
|
$scope.externalServices[service] = value ? true : false;
|
||||||
$ionicScrollDelegate.resize();
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
|
}, 10);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.shouldHideNextSteps = function() {
|
||||||
|
$scope.hideNextSteps = !$scope.hideNextSteps;
|
||||||
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
|
}, 10);
|
||||||
|
};
|
||||||
|
|
||||||
var listeners = [
|
var listeners = [
|
||||||
$rootScope.$on('bwsEvent', function(e, walletId, type, n) {
|
$rootScope.$on('bwsEvent', function(e, walletId, type, n) {
|
||||||
var wallet = profileService.getWallet(walletId);
|
var wallet = profileService.getWallet(walletId);
|
||||||
|
@ -198,12 +208,27 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var bitpayCardCache = function() {
|
||||||
|
bitpayCardService.getCacheData(function(err, data) {
|
||||||
|
if (err || lodash.isEmpty(data)) return;
|
||||||
|
$scope.bitpayCard = data;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data) {
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
|
$scope.bitpayCard = null;
|
||||||
configService.whenAvailable(function() {
|
configService.whenAvailable(function() {
|
||||||
var config = configService.getSync();
|
var config = configService.getSync();
|
||||||
var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
|
var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova;
|
||||||
|
$scope.hideNextSteps = false;
|
||||||
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
|
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
|
||||||
$scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
|
$scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
|
||||||
|
$scope.amazonEnabled = config.amazon.enabled;
|
||||||
|
$scope.bitpayCardEnabled = config.bitpayCard.enabled;
|
||||||
|
$scope.nextStepEnabled = $scope.glideraEnabled || $scope.coinbaseEnabled || $scope.amazonEnabled || $scope.bitpayCardEnabled;
|
||||||
|
$scope.recentTransactionsEnabled = config.recentTransactions.enabled;
|
||||||
|
|
||||||
|
if ($scope.bitpayCardEnabled) bitpayCardCache();
|
||||||
});
|
});
|
||||||
$scope.nextStep();
|
$scope.nextStep();
|
||||||
$scope.updateAllWallets();
|
$scope.updateAllWallets();
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, $ionicModal, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService) {
|
angular.module('copayApp.controllers').controller('tabReceiveController', function($scope, $timeout, $log, $ionicModal, $state, $ionicHistory, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService) {
|
||||||
|
|
||||||
$scope.isCordova = platformInfo.isCordova;
|
$scope.isCordova = platformInfo.isCordova;
|
||||||
$scope.isNW = platformInfo.isNW;
|
$scope.isNW = platformInfo.isNW;
|
||||||
|
@ -29,29 +29,25 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.setAddress = function(forceNew) {
|
$scope.setAddress = function(forceNew) {
|
||||||
if ($scope.generatingAddress) return;
|
if ($scope.generatingAddress || !$scope.wallet.isComplete()) return;
|
||||||
|
|
||||||
$scope.addr = null;
|
$scope.addr = null;
|
||||||
$scope.generatingAddress = true;
|
$scope.generatingAddress = true;
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
|
walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
|
||||||
$scope.generatingAddress = false;
|
$scope.generatingAddress = false;
|
||||||
if (err || lodash.isEmpty(addr)) {
|
if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), err || gettextCatalog.getString('Address is empty'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$scope.addr = addr;
|
$scope.addr = addr;
|
||||||
|
if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
});
|
});
|
||||||
}, 1);
|
}, 100);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
if (!$scope.isCordova) $scope.checkTips();
|
if (!$scope.isCordova) $scope.checkTips();
|
||||||
$scope.wallets = profileService.getWallets({
|
$scope.wallets = profileService.getWallets();
|
||||||
onlyComplete: true
|
|
||||||
});
|
|
||||||
$scope.$on('Wallet/Changed', function(event, wallet) {
|
$scope.$on('Wallet/Changed', function(event, wallet) {
|
||||||
if (!wallet) {
|
if (!wallet) {
|
||||||
$log.debug('No wallet provided');
|
$log.debug('No wallet provided');
|
||||||
|
@ -62,4 +58,46 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
||||||
$scope.setAddress();
|
$scope.setAddress();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$scope.goCopayers = function() {
|
||||||
|
$ionicHistory.removeBackView();
|
||||||
|
$ionicHistory.nextViewOptions({
|
||||||
|
disableAnimate: true
|
||||||
|
});
|
||||||
|
$state.go('tabs.home');
|
||||||
|
$timeout(function() {
|
||||||
|
$state.transitionTo('tabs.copayers', {
|
||||||
|
walletId: $scope.wallet.credentials.walletId
|
||||||
|
});
|
||||||
|
}, 100);
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.openBackupNeededModal = function() {
|
||||||
|
$ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
|
||||||
|
scope: $scope,
|
||||||
|
backdropClickToClose: false,
|
||||||
|
hardwareBackButtonClose: false
|
||||||
|
}).then(function(modal) {
|
||||||
|
$scope.BackupNeededModal = modal;
|
||||||
|
$scope.BackupNeededModal.show();
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.close = function() {
|
||||||
|
$scope.BackupNeededModal.hide();
|
||||||
|
$scope.BackupNeededModal.remove();
|
||||||
|
profileService.setBackupNeededModalFlag($scope.wallet.credentials.walletId);
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.doBackup = function() {
|
||||||
|
$scope.close();
|
||||||
|
$scope.goToBackupFlow();
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.goToBackupFlow = function() {
|
||||||
|
$state.go('tabs.receive.backupWarning', {
|
||||||
|
from: 'tabs.receive',
|
||||||
|
walletId: $scope.wallet.credentials.walletId
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, addressbookService, profileService, lodash, $state, walletService, incomingData) {
|
angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService) {
|
||||||
|
|
||||||
var originalList;
|
var originalList;
|
||||||
|
var CONTACTS_SHOW_LIMIT = 10;
|
||||||
|
var currentContactsPage = 0;
|
||||||
|
|
||||||
var updateList = function() {
|
var updateList = function() {
|
||||||
originalList = [];
|
originalList = [];
|
||||||
|
@ -11,6 +13,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
|
||||||
onlyComplete: true
|
onlyComplete: true
|
||||||
});
|
});
|
||||||
$scope.hasWallets = lodash.isEmpty(wallets) ? false : true;
|
$scope.hasWallets = lodash.isEmpty(wallets) ? false : true;
|
||||||
|
$scope.oneWallet = wallets.length == 1;
|
||||||
|
|
||||||
lodash.each(wallets, function(v) {
|
lodash.each(wallets, function(v) {
|
||||||
originalList.push({
|
originalList.push({
|
||||||
|
@ -27,9 +30,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
|
||||||
if (err) $log.error(err);
|
if (err) $log.error(err);
|
||||||
|
|
||||||
$scope.hasContacts = lodash.isEmpty(ab) ? false : true;
|
$scope.hasContacts = lodash.isEmpty(ab) ? false : true;
|
||||||
var contacts = [];
|
var completeContacts = [];
|
||||||
lodash.each(ab, function(v, k) {
|
lodash.each(ab, function(v, k) {
|
||||||
contacts.push({
|
completeContacts.push({
|
||||||
name: lodash.isObject(v) ? v.name : v,
|
name: lodash.isObject(v) ? v.name : v,
|
||||||
address: k,
|
address: k,
|
||||||
email: lodash.isObject(v) ? v.email : null,
|
email: lodash.isObject(v) ? v.email : null,
|
||||||
|
@ -39,15 +42,23 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var contacts = completeContacts.slice(0, (currentContactsPage + 1) * CONTACTS_SHOW_LIMIT);
|
||||||
|
$scope.contactsShowMore = completeContacts.length > contacts.length;
|
||||||
originalList = originalList.concat(contacts);
|
originalList = originalList.concat(contacts);
|
||||||
$scope.list = lodash.clone(originalList);
|
$scope.list = lodash.clone(originalList);
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}, 1);
|
}, 10);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.showMore = function() {
|
||||||
|
currentContactsPage++;
|
||||||
|
updateList();
|
||||||
|
};
|
||||||
|
|
||||||
$scope.findContact = function(search) {
|
$scope.findContact = function(search) {
|
||||||
|
|
||||||
if (incomingData.redir(search)) {
|
if (incomingData.redir(search)) {
|
||||||
|
@ -86,8 +97,16 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data){
|
$scope.onQrCodeScanned = function(data) {
|
||||||
$scope.formData = { search: null };
|
if (!incomingData.redir(data)) {
|
||||||
|
popupService.showAlert(null, gettextCatalog.getString('Invalid data'));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
|
$scope.formData = {
|
||||||
|
search: null
|
||||||
|
};
|
||||||
updateList();
|
updateList();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
|
||||||
var isWP = platformInfo.isWP;
|
var isWP = platformInfo.isWP;
|
||||||
var isIOS = platformInfo.isIOS;
|
var isIOS = platformInfo.isIOS;
|
||||||
|
|
||||||
|
$scope.usePushNotifications = isCordova && !isWP;
|
||||||
|
|
||||||
$scope.appName = $window.appConfig.nameCase;
|
$scope.appName = $window.appConfig.nameCase;
|
||||||
|
|
||||||
$scope.unitName = config.wallet.settings.unitName;
|
$scope.unitName = config.wallet.settings.unitName;
|
||||||
|
@ -19,87 +21,13 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
|
||||||
};
|
};
|
||||||
$scope.feeOpts = feeService.feeOpts;
|
$scope.feeOpts = feeService.feeOpts;
|
||||||
$scope.currentFeeLevel = feeService.getCurrentFeeLevel();
|
$scope.currentFeeLevel = feeService.getCurrentFeeLevel();
|
||||||
$scope.usePushNotifications = isCordova && !isWP;
|
|
||||||
$scope.PNEnabledByUser = true;
|
|
||||||
$scope.isIOSApp = isIOS && isCordova;
|
|
||||||
if ($scope.isIOSApp) {
|
|
||||||
cordova.plugins.diagnostic.isRemoteNotificationsEnabled(function(isEnabled) {
|
|
||||||
$scope.PNEnabledByUser = isEnabled;
|
|
||||||
$scope.$digest();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
$scope.spendUnconfirmed = {
|
|
||||||
value: config.wallet.spendUnconfirmed
|
|
||||||
};
|
|
||||||
$scope.glideraEnabled = {
|
|
||||||
value: config.glidera.enabled
|
|
||||||
};
|
|
||||||
$scope.coinbaseEnabled = config.coinbase.enabled;
|
|
||||||
$scope.pushNotifications = {
|
|
||||||
value: config.pushNotifications.enabled
|
|
||||||
};
|
|
||||||
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
|
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
|
||||||
return w.id != self.walletId;
|
return w.id != self.walletId;
|
||||||
});
|
});
|
||||||
$scope.wallets = profileService.getWallets();
|
$scope.wallets = profileService.getWallets();
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.openSettings = function() {
|
|
||||||
cordova.plugins.diagnostic.switchToSettings(function() {
|
|
||||||
$log.debug('switched to settings');
|
|
||||||
}, function(err) {
|
|
||||||
$log.debug(err);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.spendUnconfirmedChange = function() {
|
|
||||||
var opts = {
|
|
||||||
wallet: {
|
|
||||||
spendUnconfirmed: $scope.spendUnconfirmed.value
|
|
||||||
}
|
|
||||||
};
|
|
||||||
configService.set(opts, function(err) {
|
|
||||||
if (err) $log.debug(err);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.pushNotificationsChange = function() {
|
|
||||||
var opts = {
|
|
||||||
pushNotifications: {
|
|
||||||
enabled: $scope.pushNotifications.value
|
|
||||||
}
|
|
||||||
};
|
|
||||||
configService.set(opts, function(err) {
|
|
||||||
if (opts.pushNotifications.enabled)
|
|
||||||
pushNotificationsService.enableNotifications(profileService.walletClients);
|
|
||||||
else
|
|
||||||
pushNotificationsService.disableNotifications(profileService.walletClients);
|
|
||||||
if (err) $log.debug(err);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.glideraChange = function() {
|
|
||||||
var opts = {
|
|
||||||
glidera: {
|
|
||||||
enabled: $scope.glideraEnabled.value
|
|
||||||
}
|
|
||||||
};
|
|
||||||
configService.set(opts, function(err) {
|
|
||||||
if (err) $log.debug(err);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.coinbaseChange = function() {
|
|
||||||
var opts = {
|
|
||||||
coinbase: {
|
|
||||||
enabled: $scope.coinbaseEnabled
|
|
||||||
}
|
|
||||||
};
|
|
||||||
configService.set(opts, function(err) {
|
|
||||||
if (err) $log.debug(err);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data) {
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
updateConfig();
|
updateConfig();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $stateParams, $ionicModal, $timeout, incomingData) {
|
angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash, popupService) {
|
||||||
|
|
||||||
$scope.onScan = function(data) {
|
$scope.onScan = function(data) {
|
||||||
if (!incomingData.redir(data)) {
|
if (!incomingData.redir(data)) {
|
||||||
$ionicPopup.alert({
|
popupService.showAlert(null, gettextCatalog.getString('Invalid data'));
|
||||||
title: 'Invalid data',
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,6 +20,34 @@ angular.module('copayApp.controllers').controller('tabsController', function($lo
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}, 1);
|
}, 1);
|
||||||
}
|
};
|
||||||
|
|
||||||
|
var hideTabsViews = [
|
||||||
|
'tabs.send.amount',
|
||||||
|
'tabs.send.confirm',
|
||||||
|
'tabs.send.addressbook',
|
||||||
|
'tabs.addressbook',
|
||||||
|
'tabs.addressbook.add',
|
||||||
|
'tabs.addressbook.view',
|
||||||
|
'tabs.preferences.backupWarning',
|
||||||
|
'tabs.preferences.backup',
|
||||||
|
'tabs.receive.backupWarning',
|
||||||
|
'tabs.receive.backup',
|
||||||
|
'tabs.bitpayCard.amount',
|
||||||
|
'tabs.bitpayCard.confirm',
|
||||||
|
];
|
||||||
|
|
||||||
|
$rootScope.$on('$ionicView.beforeEnter', function() {
|
||||||
|
|
||||||
|
$rootScope.hideTabs = false;
|
||||||
|
|
||||||
|
var currentState = $state.current.name;
|
||||||
|
|
||||||
|
lodash.each(hideTabsViews, function(view) {
|
||||||
|
if (currentState === view) {
|
||||||
|
$rootScope.hideTabs = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, $ionicPopup, txpModalService, externalLinkService) {
|
angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService) {
|
||||||
var isCordova = platformInfo.isCordova;
|
var isCordova = platformInfo.isCordova;
|
||||||
var isWP = platformInfo.isWP;
|
var isWP = platformInfo.isWP;
|
||||||
var isAndroid = platformInfo.isAndroid;
|
var isAndroid = platformInfo.isAndroid;
|
||||||
|
@ -204,15 +204,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
|
||||||
wallet = profileService.getWallet($stateParams.walletId);
|
wallet = profileService.getWallet($stateParams.walletId);
|
||||||
|
|
||||||
/* Set color for header bar */
|
/* Set color for header bar */
|
||||||
$rootScope.walletDetailsColor = wallet.color;
|
$scope.walletDetailsColor = wallet.color;
|
||||||
$rootScope.walletDetailsName = wallet.name;
|
$scope.walletDetailsName = wallet.name;
|
||||||
$scope.wallet = wallet;
|
$scope.wallet = wallet;
|
||||||
|
|
||||||
$scope.requiresMultipleSignatures = wallet.credentials.m > 1;
|
$scope.requiresMultipleSignatures = wallet.credentials.m > 1;
|
||||||
$scope.newTx = false;
|
$scope.newTx = false;
|
||||||
|
|
||||||
$ionicNavBarDelegate.title(wallet.name);
|
|
||||||
|
|
||||||
$scope.updateAll(function() {
|
$scope.updateAll(function() {
|
||||||
if ($stateParams.txid) {
|
if ($stateParams.txid) {
|
||||||
var tx = lodash.find($scope.completeTxHistory, {
|
var tx = lodash.find($scope.completeTxHistory, {
|
||||||
|
@ -221,9 +219,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
|
||||||
if (tx) {
|
if (tx) {
|
||||||
$scope.openTxModal(tx);
|
$scope.openTxModal(tx);
|
||||||
} else {
|
} else {
|
||||||
$ionicPopup.alert({
|
popupService.showAlert(null, gettextCatalog.getString('TX not available'));
|
||||||
title: gettext('TX not available'),
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
} else if ($stateParams.txpId) {
|
} else if ($stateParams.txpId) {
|
||||||
var txp = lodash.find($scope.txps, {
|
var txp = lodash.find($scope.txps, {
|
||||||
|
@ -232,9 +228,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
|
||||||
if (txp) {
|
if (txp) {
|
||||||
$scope.openTxpModal(txp);
|
$scope.openTxpModal(txp);
|
||||||
} else {
|
} else {
|
||||||
$ionicPopup.alert({
|
popupService.showAlert(null, gettextCatalog.getString('Proposal not longer available'));
|
||||||
title: gettext('Proposal not longer available'),
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
120
src/js/routes.js
120
src/js/routes.js
|
@ -150,10 +150,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.state('tabs.details', {
|
.state('tabs.wallet', {
|
||||||
url: '/details/{walletId}/{fromOnboarding}',
|
url: '/wallet/{walletId}/{fromOnboarding}',
|
||||||
views: {
|
views: {
|
||||||
'tab-home': {
|
'tab-home@tabs': {
|
||||||
controller: 'walletDetailsController',
|
controller: 'walletDetailsController',
|
||||||
templateUrl: 'views/walletDetails.html'
|
templateUrl: 'views/walletDetails.html'
|
||||||
}
|
}
|
||||||
|
@ -166,7 +166,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
.state('tabs.activity', {
|
.state('tabs.activity', {
|
||||||
url: '/activity',
|
url: '/activity',
|
||||||
views: {
|
views: {
|
||||||
'tab-home': {
|
'tab-home@tabs': {
|
||||||
controller: 'activityController',
|
controller: 'activityController',
|
||||||
templateUrl: 'views/activity.html',
|
templateUrl: 'views/activity.html',
|
||||||
}
|
}
|
||||||
|
@ -175,7 +175,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
.state('tabs.proposals', {
|
.state('tabs.proposals', {
|
||||||
url: '/proposals',
|
url: '/proposals',
|
||||||
views: {
|
views: {
|
||||||
'tab-home': {
|
'tab-home@tabs': {
|
||||||
controller: 'proposalsController',
|
controller: 'proposalsController',
|
||||||
templateUrl: 'views/proposals.html',
|
templateUrl: 'views/proposals.html',
|
||||||
}
|
}
|
||||||
|
@ -191,6 +191,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
.state('tabs', {
|
.state('tabs', {
|
||||||
url: '/tabs',
|
url: '/tabs',
|
||||||
abstract: true,
|
abstract: true,
|
||||||
|
controller: 'tabsController',
|
||||||
templateUrl: 'views/tabs.html'
|
templateUrl: 'views/tabs.html'
|
||||||
})
|
})
|
||||||
.state('tabs.home', {
|
.state('tabs.home', {
|
||||||
|
@ -236,7 +237,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.state('tabs.send.amount', {
|
.state('tabs.send.amount', {
|
||||||
url: '/amount/:isWallet/:toAddress/:toName/:toEmail',
|
url: '/amount/:isWallet/:toAddress/:toName/:toEmail',
|
||||||
views: {
|
views: {
|
||||||
'tab-send@tabs': {
|
'tab-send@tabs': {
|
||||||
|
@ -317,7 +318,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.state('tabs.language', {
|
.state('tabs.notifications', {
|
||||||
|
url: '/notifications',
|
||||||
|
views: {
|
||||||
|
'tab-settings@tabs': {
|
||||||
|
controller: 'preferencesNotificationsController',
|
||||||
|
templateUrl: 'views/preferencesNotifications.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.state('tabs.language', {
|
||||||
url: '/language',
|
url: '/language',
|
||||||
views: {
|
views: {
|
||||||
'tab-settings@tabs': {
|
'tab-settings@tabs': {
|
||||||
|
@ -389,6 +399,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.state('tabs.advanced', {
|
||||||
|
url: '/advanced',
|
||||||
|
views: {
|
||||||
|
'tab-settings@tabs': {
|
||||||
|
controller: 'advancedSettingsController',
|
||||||
|
templateUrl: 'views/advancedSettings.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
|
@ -432,6 +451,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.state('tabs.preferences.backupWarning', {
|
||||||
|
url: '/backupWarning/:from',
|
||||||
|
views: {
|
||||||
|
'tab-settings@tabs': {
|
||||||
|
templateUrl: 'views/backupWarning.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
.state('tabs.preferences.backup', {
|
.state('tabs.preferences.backup', {
|
||||||
url: '/backup',
|
url: '/backup',
|
||||||
views: {
|
views: {
|
||||||
|
@ -551,7 +578,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
*TO DO
|
* Copayers
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -565,6 +592,30 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* Back flow from receive
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
.state('tabs.receive.backupWarning', {
|
||||||
|
url: '/backupWarning/:from/:walletId',
|
||||||
|
views: {
|
||||||
|
'tab-receive@tabs': {
|
||||||
|
templateUrl: 'views/backupWarning.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.state('tabs.receive.backup', {
|
||||||
|
url: '/backup/:walletId',
|
||||||
|
views: {
|
||||||
|
'tab-receive@tabs': {
|
||||||
|
controller: 'backupController',
|
||||||
|
templateUrl: 'views/backup.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* Onboarding
|
* Onboarding
|
||||||
|
@ -617,15 +668,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.state('onboarding.backupWarning', {
|
.state('onboarding.backupWarning', {
|
||||||
url: '/backupWarning/:walletId',
|
url: '/backupWarning/:from/:walletId',
|
||||||
views: {
|
views: {
|
||||||
'onboarding': {
|
'onboarding': {
|
||||||
templateUrl: 'views/onboarding/backupWarning.html'
|
templateUrl: 'views/backupWarning.html'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.state('onboarding.backup', {
|
.state('onboarding.backup', {
|
||||||
url: '/backup/:walletId/:fromOnboarding',
|
url: '/backup/:walletId',
|
||||||
views: {
|
views: {
|
||||||
'onboarding': {
|
'onboarding': {
|
||||||
templateUrl: 'views/backup.html',
|
templateUrl: 'views/backup.html',
|
||||||
|
@ -785,29 +836,44 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* BitPay Card
|
* BitPay Card
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.state('bitpayCard', {
|
.state('tabs.bitpayCard', {
|
||||||
url: '/bitpayCard',
|
url: '/bitpay-card',
|
||||||
abstract: true,
|
|
||||||
template: '<ion-nav-view name="bitpayCard"></ion-nav-view>'
|
|
||||||
})
|
|
||||||
.state('bitpayCard.main', {
|
|
||||||
url: '/main',
|
|
||||||
views: {
|
views: {
|
||||||
'bitpayCard': {
|
'tab-home@tabs': {
|
||||||
|
controller: 'bitpayCardController',
|
||||||
|
controllerAs: 'bitpayCard',
|
||||||
templateUrl: 'views/bitpayCard.html'
|
templateUrl: 'views/bitpayCard.html'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.state('bitpayCard.preferences', {
|
.state('tabs.bitpayCard.amount', {
|
||||||
|
url: '/amount/:isCard/:toName',
|
||||||
|
views: {
|
||||||
|
'tab-home@tabs': {
|
||||||
|
controller: 'amountController',
|
||||||
|
templateUrl: 'views/amount.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.state('tabs.bitpayCard.confirm', {
|
||||||
|
url: '/confirm/:isCard/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro',
|
||||||
|
views: {
|
||||||
|
'tab-home@tabs': {
|
||||||
|
controller: 'confirmController',
|
||||||
|
templateUrl: 'views/confirm.html'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.state('tabs.bitpayCard.preferences', {
|
||||||
url: '/preferences',
|
url: '/preferences',
|
||||||
views: {
|
views: {
|
||||||
'bitpayCard': {
|
'tab-home@tabs': {
|
||||||
templateUrl: 'views/preferencesBitpayCard.html'
|
templateUrl: 'views/preferencesBitpayCard.html'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -944,6 +1010,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
$log.debug('Route change from:', fromState.name || '-', ' to:', toState.name);
|
$log.debug('Route change from:', fromState.name || '-', ' to:', toState.name);
|
||||||
$log.debug(' toParams:' + JSON.stringify(toParams || {}));
|
$log.debug(' toParams:' + JSON.stringify(toParams || {}));
|
||||||
$log.debug(' fromParams:' + JSON.stringify(fromParams || {}));
|
$log.debug(' fromParams:' + JSON.stringify(fromParams || {}));
|
||||||
|
|
||||||
|
if (!toState.name.match(/onboarding/)) return;
|
||||||
var state = {};
|
var state = {};
|
||||||
state.name = toState.name;
|
state.name = toState.name;
|
||||||
state.toParams = toParams;
|
state.toParams = toParams;
|
||||||
|
|
|
@ -187,8 +187,38 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
root.getCacheData = function(cb) {
|
||||||
|
_setCredentials();
|
||||||
|
storageService.getBitpayCardCache(credentials.NETWORK, function(err, data) {
|
||||||
|
if (err) return cb(err);
|
||||||
|
if (lodash.isString(data)) {
|
||||||
|
data = JSON.parse(data);
|
||||||
|
}
|
||||||
|
data = data || {};
|
||||||
|
return cb(null, data);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
root.setCacheData = function(data, cb) {
|
||||||
|
_setCredentials();
|
||||||
|
data = JSON.stringify(data);
|
||||||
|
storageService.setBitpayCardCache(credentials.NETWORK, data, function(err) {
|
||||||
|
if (err) return cb(err);
|
||||||
|
return cb();
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
root.removeCacheData = function(cb) {
|
||||||
|
_setCredentials();
|
||||||
|
storageService.removeBitpayCardCache(credentials.NETWORK, function(err) {
|
||||||
|
if (err) return cb(err);
|
||||||
|
return cb();
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
root.logout = function(cb) {
|
root.logout = function(cb) {
|
||||||
_setCredentials();
|
_setCredentials();
|
||||||
|
root.removeCacheData(function() {});
|
||||||
storageService.removeBitpayCard(credentials.NETWORK, function(err) {
|
storageService.removeBitpayCard(credentials.NETWORK, function(err) {
|
||||||
$http(_getBitPay('/visa-api/logout')).then(function(data) {
|
$http(_getBitPay('/visa-api/logout')).then(function(data) {
|
||||||
$log.info('BitPay Logout: SUCCESS');
|
$log.info('BitPay Logout: SUCCESS');
|
||||||
|
|
|
@ -39,10 +39,28 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
||||||
},
|
},
|
||||||
|
|
||||||
coinbase: {
|
coinbase: {
|
||||||
enabled: true,
|
enabled: false, //disable coinbase for this release
|
||||||
testnet: false
|
testnet: false
|
||||||
},
|
},
|
||||||
|
|
||||||
|
bitpayCard: {
|
||||||
|
enabled: true
|
||||||
|
},
|
||||||
|
|
||||||
|
amazon: {
|
||||||
|
enabled: true
|
||||||
|
},
|
||||||
|
|
||||||
|
//Experimental Features
|
||||||
|
|
||||||
|
recentTransactions: {
|
||||||
|
enabled: false //disabled by default
|
||||||
|
},
|
||||||
|
|
||||||
|
frequentlyUsed: {
|
||||||
|
enabled: true
|
||||||
|
},
|
||||||
|
|
||||||
rates: {
|
rates: {
|
||||||
url: 'https://insight.bitpay.com:443/api/rates',
|
url: 'https://insight.bitpay.com:443/api/rates',
|
||||||
},
|
},
|
||||||
|
@ -111,6 +129,18 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
||||||
if (!configCache.coinbase) {
|
if (!configCache.coinbase) {
|
||||||
configCache.coinbase = defaultConfig.coinbase;
|
configCache.coinbase = defaultConfig.coinbase;
|
||||||
}
|
}
|
||||||
|
if (!configCache.amazon) {
|
||||||
|
configCache.amazon = defaultConfig.amazon;
|
||||||
|
}
|
||||||
|
if (!configCache.bitpayCard) {
|
||||||
|
configCache.bitpayCard = defaultConfig.bitpayCard;
|
||||||
|
}
|
||||||
|
if (!configCache.recentTransactions) {
|
||||||
|
configCache.recentTransactions = defaultConfig.recentTransactions;
|
||||||
|
}
|
||||||
|
if (!configCache.frequentlyUsed) {
|
||||||
|
configCache.frequentlyUsed = defaultConfig.frequentlyUsed;
|
||||||
|
}
|
||||||
if (!configCache.pushNotifications) {
|
if (!configCache.pushNotifications) {
|
||||||
configCache.pushNotifications = defaultConfig.pushNotifications;
|
configCache.pushNotifications = defaultConfig.pushNotifications;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
angular.module('copayApp.services')
|
angular.module('copayApp.services')
|
||||||
.factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, pushNotificationsService, gettext, gettextCatalog, bwcError, uxLanguage, platformInfo, $ionicHistory, txFormatService, $state) {
|
.factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, pushNotificationsService, gettext, gettextCatalog, bwcError, uxLanguage, platformInfo, txFormatService, $state) {
|
||||||
|
|
||||||
|
|
||||||
var isChromeApp = platformInfo.isChromeApp;
|
var isChromeApp = platformInfo.isChromeApp;
|
||||||
|
@ -38,6 +38,22 @@ angular.module('copayApp.services')
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
root.setBackupNeededModalFlag = function(walletId) {
|
||||||
|
storageService.setBackupNeededModalFlag(walletId, true, function(err) {
|
||||||
|
if (err) $log.error(err);
|
||||||
|
$log.debug('Backup warning modal flag stored');
|
||||||
|
root.wallet[walletId].showBackupNeededModal = false;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
function _showBackupNeededModal(wallet, cb) {
|
||||||
|
storageService.getBackupNeededModalFlag(wallet.credentials.walletId, function(err, val) {
|
||||||
|
if (err) $log.error(err);
|
||||||
|
if (val) return cb(false);
|
||||||
|
return cb(true);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
root.setBackupFlag = function(walletId) {
|
root.setBackupFlag = function(walletId) {
|
||||||
storageService.setBackupFlag(walletId, function(err) {
|
storageService.setBackupFlag(walletId, function(err) {
|
||||||
if (err) $log.error(err);
|
if (err) $log.error(err);
|
||||||
|
@ -101,6 +117,11 @@ angular.module('copayApp.services')
|
||||||
wallet.balanceHidden = val;
|
wallet.balanceHidden = val;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
_showBackupNeededModal(wallet, function(val) {
|
||||||
|
if (wallet.needsBackup) wallet.showBackupNeededModal = val;
|
||||||
|
else wallet.showBackupNeededModal = false;
|
||||||
|
});
|
||||||
|
|
||||||
wallet.removeAllListeners();
|
wallet.removeAllListeners();
|
||||||
|
|
||||||
wallet.on('report', function(n) {
|
wallet.on('report', function(n) {
|
||||||
|
@ -759,21 +780,11 @@ angular.module('copayApp.services')
|
||||||
var TIME_STAMP = 60 * 60 * 24 * 7;
|
var TIME_STAMP = 60 * 60 * 24 * 7;
|
||||||
var MAX = 100;
|
var MAX = 100;
|
||||||
|
|
||||||
var typeFilter1 = {
|
var typeFilter = {
|
||||||
'NewBlock': 1,
|
'NewOutgoingTx': 1,
|
||||||
'BalanceUpdated': 1,
|
'NewIncomingTx': 1
|
||||||
'NewOutgoingTxByThirdParty': 1,
|
|
||||||
'NewAddress': 1,
|
|
||||||
'TxProposalFinallyAccepted': 1,
|
|
||||||
'TxProposalFinallyRejected': 1,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var typeFilter2 = {
|
|
||||||
'TxProposalAcceptedBy': 1,
|
|
||||||
'TxProposalRejectedBy': 1,
|
|
||||||
'NewTxProposal': 1,
|
|
||||||
}
|
|
||||||
|
|
||||||
var w = root.getWallets();
|
var w = root.getWallets();
|
||||||
if (lodash.isEmpty(w)) return cb();
|
if (lodash.isEmpty(w)) return cb();
|
||||||
|
|
||||||
|
@ -822,7 +833,7 @@ angular.module('copayApp.services')
|
||||||
|
|
||||||
x.action = function() {
|
x.action = function() {
|
||||||
// TODO?
|
// TODO?
|
||||||
// $state.go('tabs.details', {
|
// $state.go('tabs.wallet', {
|
||||||
// walletId: x.walletId,
|
// walletId: x.walletId,
|
||||||
// txpId: x.txpId,
|
// txpId: x.txpId,
|
||||||
// txid: x.txid,
|
// txid: x.txid,
|
||||||
|
@ -874,15 +885,9 @@ angular.module('copayApp.services')
|
||||||
var n;
|
var n;
|
||||||
|
|
||||||
n = lodash.filter(wallet.cachedActivity.n, function(x) {
|
n = lodash.filter(wallet.cachedActivity.n, function(x) {
|
||||||
return !typeFilter1[x.type];
|
return typeFilter[x.type];
|
||||||
});
|
});
|
||||||
|
|
||||||
if (wallet.m == 1) {
|
|
||||||
n = lodash.filter(n, function(x) {
|
|
||||||
return !typeFilter2[x.type];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
var idToName = {};
|
var idToName = {};
|
||||||
if (wallet.cachedStatus) {
|
if (wallet.cachedStatus) {
|
||||||
lodash.each(wallet.cachedStatus.wallet.copayers, function(c) {
|
lodash.each(wallet.cachedStatus.wallet.copayers, function(c) {
|
||||||
|
|
|
@ -337,6 +337,18 @@ angular.module('copayApp.services')
|
||||||
storage.remove('bitpayCard-' + network, cb);
|
storage.remove('bitpayCard-' + network, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
root.setBitpayCardCache = function(network, data, cb) {
|
||||||
|
storage.set('bitpayCardCache-' + network, data, cb);
|
||||||
|
};
|
||||||
|
|
||||||
|
root.getBitpayCardCache = function(network, cb) {
|
||||||
|
storage.get('bitpayCardCache-' + network, cb);
|
||||||
|
};
|
||||||
|
|
||||||
|
root.removeBitpayCardCache = function(network, cb) {
|
||||||
|
storage.remove('bitpayCardCache-' + network, cb);
|
||||||
|
};
|
||||||
|
|
||||||
root.removeAllWalletData = function(walletId, cb) {
|
root.removeAllWalletData = function(walletId, cb) {
|
||||||
root.clearLastAddress(walletId, function(err) {
|
root.clearLastAddress(walletId, function(err) {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
|
@ -365,6 +377,14 @@ angular.module('copayApp.services')
|
||||||
storage.get('receiveTips', cb);
|
storage.get('receiveTips', cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
root.setBackupNeededModalFlag = function(walletId, val, cb) {
|
||||||
|
storage.set('showBackupNeededModal-' + walletId, val, cb);
|
||||||
|
};
|
||||||
|
|
||||||
|
root.getBackupNeededModalFlag = function(walletId, cb) {
|
||||||
|
storage.get('showBackupNeededModal-' + walletId, cb);
|
||||||
|
};
|
||||||
|
|
||||||
root.setAmazonGiftCards = function(network, gcs, cb) {
|
root.setAmazonGiftCards = function(network, gcs, cb) {
|
||||||
storage.set('amazonGiftCards-' + network, gcs, cb);
|
storage.set('amazonGiftCards-' + network, gcs, cb);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,150 +0,0 @@
|
||||||
'use strict';
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is a modification from https://github.com/angular/angular.js/blob/master/src/ngTouch/swipe.js
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
angular.module('copayApp.services')
|
|
||||||
.factory('$swipe', [
|
|
||||||
function() {
|
|
||||||
// The total distance in any direction before we make the call on swipe vs. scroll.
|
|
||||||
var MOVE_BUFFER_RADIUS = 10;
|
|
||||||
|
|
||||||
var POINTER_EVENTS = {
|
|
||||||
'touch': {
|
|
||||||
start: 'touchstart',
|
|
||||||
move: 'touchmove',
|
|
||||||
end: 'touchend',
|
|
||||||
cancel: 'touchcancel'
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
function getCoordinates(event) {
|
|
||||||
var originalEvent = event.originalEvent || event;
|
|
||||||
var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent];
|
|
||||||
var e = (originalEvent.changedTouches && originalEvent.changedTouches[0]) || touches[0];
|
|
||||||
|
|
||||||
return {
|
|
||||||
x: e.clientX,
|
|
||||||
y: e.clientY
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function getEvents(pointerTypes, eventType) {
|
|
||||||
var res = [];
|
|
||||||
angular.forEach(pointerTypes, function(pointerType) {
|
|
||||||
var eventName = POINTER_EVENTS[pointerType][eventType];
|
|
||||||
if (eventName) {
|
|
||||||
res.push(eventName);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return res.join(' ');
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
/**
|
|
||||||
* @ngdoc method
|
|
||||||
* @name $swipe#bind
|
|
||||||
*
|
|
||||||
* @description
|
|
||||||
* The main method of `$swipe`. It takes an element to be watched for swipe motions, and an
|
|
||||||
* object containing event handlers.
|
|
||||||
* The pointer types that should be used can be specified via the optional
|
|
||||||
* third argument, which is an array of strings `'mouse'` and `'touch'`. By default,
|
|
||||||
* `$swipe` will listen for `mouse` and `touch` events.
|
|
||||||
*
|
|
||||||
* The four events are `start`, `move`, `end`, and `cancel`. `start`, `move`, and `end`
|
|
||||||
* receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }`.
|
|
||||||
*
|
|
||||||
* `start` is called on either `mousedown` or `touchstart`. After this event, `$swipe` is
|
|
||||||
* watching for `touchmove` or `mousemove` events. These events are ignored until the total
|
|
||||||
* distance moved in either dimension exceeds a small threshold.
|
|
||||||
*
|
|
||||||
* Once this threshold is exceeded, either the horizontal or vertical delta is greater.
|
|
||||||
* - If the horizontal distance is greater, this is a swipe and `move` and `end` events follow.
|
|
||||||
* - If the vertical distance is greater, this is a scroll, and we let the browser take over.
|
|
||||||
* A `cancel` event is sent.
|
|
||||||
*
|
|
||||||
* `move` is called on `mousemove` and `touchmove` after the above logic has determined that
|
|
||||||
* a swipe is in progress.
|
|
||||||
*
|
|
||||||
* `end` is called when a swipe is successfully completed with a `touchend` or `mouseup`.
|
|
||||||
*
|
|
||||||
* `cancel` is called either on a `touchcancel` from the browser, or when we begin scrolling
|
|
||||||
* as described above.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
bind: function(element, eventHandlers, pointerTypes) {
|
|
||||||
// Absolute total movement, used to control swipe vs. scroll.
|
|
||||||
var totalX, totalY;
|
|
||||||
// Coordinates of the start position.
|
|
||||||
var startCoords;
|
|
||||||
// Last event's position.
|
|
||||||
var lastPos;
|
|
||||||
// Whether a swipe is active.
|
|
||||||
var active = false;
|
|
||||||
|
|
||||||
pointerTypes = pointerTypes || ['touch'];
|
|
||||||
element.on(getEvents(pointerTypes, 'start'), function(event) {
|
|
||||||
startCoords = getCoordinates(event);
|
|
||||||
active = true;
|
|
||||||
totalX = 0;
|
|
||||||
totalY = 0;
|
|
||||||
lastPos = startCoords;
|
|
||||||
eventHandlers['start'] && eventHandlers['start'](startCoords, event);
|
|
||||||
});
|
|
||||||
var events = getEvents(pointerTypes, 'cancel');
|
|
||||||
if (events) {
|
|
||||||
element.on(events, function(event) {
|
|
||||||
active = false;
|
|
||||||
eventHandlers['cancel'] && eventHandlers['cancel'](event);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
element.on(getEvents(pointerTypes, 'move'), function(event) {
|
|
||||||
if (!active) return;
|
|
||||||
|
|
||||||
// Android will send a touchcancel if it thinks we're starting to scroll.
|
|
||||||
// So when the total distance (+ or - or both) exceeds 10px in either direction,
|
|
||||||
// we either:
|
|
||||||
// - On totalX > totalY, we send preventDefault() and treat this as a swipe.
|
|
||||||
// - On totalY > totalX, we let the browser handle it as a scroll.
|
|
||||||
|
|
||||||
if (!startCoords) return;
|
|
||||||
var coords = getCoordinates(event);
|
|
||||||
|
|
||||||
totalX += Math.abs(coords.x - lastPos.x);
|
|
||||||
totalY += Math.abs(coords.y - lastPos.y);
|
|
||||||
|
|
||||||
lastPos = coords;
|
|
||||||
|
|
||||||
if (totalX < MOVE_BUFFER_RADIUS && totalY < MOVE_BUFFER_RADIUS) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// One of totalX or totalY has exceeded the buffer, so decide on swipe vs. scroll.
|
|
||||||
if (totalY > totalX) {
|
|
||||||
// Allow native scrolling to take over.
|
|
||||||
active = false;
|
|
||||||
eventHandlers['cancel'] && eventHandlers['cancel'](event);
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
|
|
||||||
// Prevent the browser from scrolling.
|
|
||||||
event.preventDefault();
|
|
||||||
eventHandlers['move'] && eventHandlers['move'](coords, event);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
element.on(getEvents(pointerTypes, 'end'), function(event) {
|
|
||||||
if (!active) return;
|
|
||||||
active = false;
|
|
||||||
eventHandlers['end'] && eventHandlers['end'](getCoordinates(event), event);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
|
|
||||||
|
|
|
@ -792,29 +792,16 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
|
||||||
|
|
||||||
root.getAddress = function(wallet, forceNew, cb) {
|
root.getAddress = function(wallet, forceNew, cb) {
|
||||||
|
|
||||||
var firstStep;
|
storageService.getLastAddress(wallet.id, function(err, addr) {
|
||||||
if (forceNew) {
|
|
||||||
firstStep = storageService.clearLastAddress;
|
|
||||||
} else {
|
|
||||||
firstStep = function(walletId, cb) {
|
|
||||||
return cb();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
firstStep(wallet.id, function(err) {
|
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
|
|
||||||
storageService.getLastAddress(wallet.id, function(err, addr) {
|
if (!forceNew && addr) return cb(null, addr);
|
||||||
if (err) return cb(err);
|
|
||||||
|
|
||||||
if (addr) return cb(null, addr);
|
createAddress(wallet, function(err, _addr) {
|
||||||
|
if (err) return cb(err, addr);
|
||||||
createAddress(wallet, function(err, addr) {
|
storageService.storeLastAddress(wallet.id, _addr, function() {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
storageService.storeLastAddress(wallet.id, addr, function() {
|
return cb(null, _addr);
|
||||||
if (err) return cb(err);
|
|
||||||
return cb(null, addr);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -833,32 +820,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
|
||||||
|
|
||||||
// An alert dialog
|
// An alert dialog
|
||||||
var askPassword = function(name, title, cb) {
|
var askPassword = function(name, title, cb) {
|
||||||
var scope = $rootScope.$new(true);
|
var opts = {
|
||||||
scope.data = [];
|
inputType: 'password'
|
||||||
var pass = $ionicPopup.show({
|
};
|
||||||
template: '<input type="password" ng-model="data.pass">',
|
popupService.showPrompt(title, name, opts, function(res) {
|
||||||
title: title,
|
if (!res) return cb();
|
||||||
subTitle: name,
|
if (res) return cb(res)
|
||||||
scope: scope,
|
|
||||||
buttons: [{
|
|
||||||
text: 'Cancel'
|
|
||||||
}, {
|
|
||||||
text: '<b>OK</b>',
|
|
||||||
type: 'button-positive',
|
|
||||||
onTap: function(e) {
|
|
||||||
if (!scope.data.pass) {
|
|
||||||
//don't allow the user to close unless he enters wifi password
|
|
||||||
e.preventDefault();
|
|
||||||
return;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return scope.data.pass;
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
});
|
|
||||||
pass.then(function(res) {
|
|
||||||
return cb(res);
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,18 @@
|
||||||
@extend .ion-ios-arrow-right;
|
@extend .ion-ios-arrow-right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.icon.nav-item-arrow-down {
|
||||||
|
color: #666;
|
||||||
|
font-size: 26px;
|
||||||
|
@extend .ion-ios-arrow-down;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon.nav-item-arrow-up {
|
||||||
|
color: #666;
|
||||||
|
font-size: 26px;
|
||||||
|
@extend .ion-ios-arrow-up;
|
||||||
|
}
|
||||||
|
|
||||||
.item.item-heading {
|
.item.item-heading {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
@ -45,6 +57,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.white-bg{
|
||||||
|
background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
.overlay {
|
.overlay {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top:0;
|
top:0;
|
||||||
|
@ -95,3 +112,20 @@ ion-header-bar{
|
||||||
.bold-text{
|
.bold-text{
|
||||||
font-weight: bold !important;
|
font-weight: bold !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.card{
|
||||||
|
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Wrap text from item-note */
|
||||||
|
.item-note{
|
||||||
|
white-space: -moz-pre-wrap !important;
|
||||||
|
white-space: -pre-wrap;
|
||||||
|
white-space: -o-pre-wrap;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-wrap: break-word;
|
||||||
|
white-space: -webkit-pre-wrap;
|
||||||
|
word-break: break-all;
|
||||||
|
white-space: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -594,6 +594,10 @@ ul.wallet-selection.wallets {
|
||||||
margin-right: 40px;
|
margin-right: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.m55r {
|
||||||
|
margin-right: 55px;
|
||||||
|
}
|
||||||
|
|
||||||
.m25r {
|
.m25r {
|
||||||
margin-right: 25px;
|
margin-right: 25px;
|
||||||
}
|
}
|
||||||
|
@ -992,9 +996,11 @@ input[type=number] {
|
||||||
@import "views/tab-send";
|
@import "views/tab-send";
|
||||||
@import "views/tab-settings";
|
@import "views/tab-settings";
|
||||||
@import "views/walletDetails";
|
@import "views/walletDetails";
|
||||||
|
@import "views/advancedSettings";
|
||||||
@import "views/bitpayCard";
|
@import "views/bitpayCard";
|
||||||
@import "views/address-book";
|
@import "views/address-book";
|
||||||
@import "views/wallet-backup-phrase";
|
@import "views/wallet-backup-phrase";
|
||||||
|
@import "views/address-book";
|
||||||
@import 'views/onboarding/onboarding';
|
@import 'views/onboarding/onboarding';
|
||||||
@import "views/includes/walletActivity";
|
@import "views/includes/walletActivity";
|
||||||
@import "views/includes/wallets";
|
@import "views/includes/wallets";
|
||||||
|
|
|
@ -1,10 +1,15 @@
|
||||||
|
#add-address{
|
||||||
|
.list{
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
}
|
||||||
#view-address-book {
|
#view-address-book {
|
||||||
.scroll{
|
.scroll{
|
||||||
height:100%;
|
height:100%;
|
||||||
}
|
}
|
||||||
#add-contact{
|
#add-contact{
|
||||||
img{
|
img{
|
||||||
width: 6rem;
|
width: 10rem;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
a{
|
a{
|
||||||
|
@ -15,8 +20,6 @@
|
||||||
.item {
|
.item {
|
||||||
color: #444;
|
color: #444;
|
||||||
border-top: none;
|
border-top: none;
|
||||||
padding-top: 1.5rem;
|
|
||||||
padding-bottom: 1.5rem;
|
|
||||||
&:before {
|
&:before {
|
||||||
display: block;
|
display: block;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
@ -63,4 +66,4 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,53 @@
|
||||||
|
.settings {
|
||||||
|
.item {
|
||||||
|
color: #444;
|
||||||
|
border-color: rgba(221, 221, 221, 0.3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#advanced-settings {
|
||||||
|
.list {
|
||||||
|
.item {
|
||||||
|
color: #444;
|
||||||
|
border-top: none;
|
||||||
|
padding-top: 1.5rem;
|
||||||
|
padding-bottom: 1.5rem;
|
||||||
|
&:before {
|
||||||
|
display: block;
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
height: 1px;
|
||||||
|
background: rgba(221, 221, 221, 0.3);
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
content: '';
|
||||||
|
}
|
||||||
|
&.item-divider {
|
||||||
|
color: rgba(74, 74, 74, .8);
|
||||||
|
}
|
||||||
|
&.item-heading {
|
||||||
|
&:before {
|
||||||
|
top: 99%
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&:nth-child(2) {
|
||||||
|
&:before {
|
||||||
|
width: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.item-note {
|
||||||
|
color: rgb(58, 58, 58);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.comment {
|
||||||
|
padding: 15px;
|
||||||
|
background-color: #fff;
|
||||||
|
color: rgba(74, 74, 74, 0.8);
|
||||||
|
}
|
||||||
|
.divider-comment {
|
||||||
|
padding: 15px;
|
||||||
|
color: rgba(74, 74, 74, 0.8);
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,4 +1,7 @@
|
||||||
#view-amount {
|
#view-amount {
|
||||||
|
.icon-bitpay-card {
|
||||||
|
background-image: url("../img/icon-bitpay.svg");
|
||||||
|
}
|
||||||
@media(max-width: 480px) {
|
@media(max-width: 480px) {
|
||||||
.bitcoin-address {
|
.bitcoin-address {
|
||||||
.icon {
|
.icon {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#onboarding-backup-warning{
|
#backup-warning{
|
||||||
.warning{
|
.warning{
|
||||||
margin:4rem auto 1rem;
|
margin:4rem auto 1rem;
|
||||||
height: 11rem;
|
height: 11rem;
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 400px){
|
@media (max-width: 400px){
|
||||||
#onboarding-backup-warning{
|
#backup-warning{
|
||||||
.warning{
|
.warning{
|
||||||
margin: 2rem auto 1rem;
|
margin: 2rem auto 1rem;
|
||||||
height: 8rem;
|
height: 8rem;
|
||||||
|
@ -45,10 +45,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (max-height: 540px){
|
@media (max-height: 540px){
|
||||||
#onboarding-backup-warning{
|
#backup-warning{
|
||||||
.cta-buttons{
|
.cta-buttons{
|
||||||
float:left;
|
float:left;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -3,8 +3,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 2rem 1rem 1.5rem 1rem;
|
padding: 2rem 1rem 1.5rem 1rem;
|
||||||
min-height: 115px;
|
min-height: 140px;
|
||||||
margin-bottom: 25px;
|
|
||||||
border-color: #172565;
|
border-color: #172565;
|
||||||
background-color: #1e3186;
|
background-color: #1e3186;
|
||||||
background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
|
background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
|
||||||
|
@ -13,4 +12,13 @@
|
||||||
strong {
|
strong {
|
||||||
line-height: 100%;
|
line-height: 100%;
|
||||||
}
|
}
|
||||||
|
.select-style {
|
||||||
|
border: none;
|
||||||
|
box-shadow: none;
|
||||||
|
background-color: transparent;
|
||||||
|
background-image: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
#view-confirm {
|
#view-confirm {
|
||||||
|
.icon-bitpay-card {
|
||||||
|
background-image: url("../img/icon-bitpay.svg");
|
||||||
|
}
|
||||||
.slide-to-pay{
|
.slide-to-pay{
|
||||||
bottom: 149px;
|
bottom: 149px;
|
||||||
}
|
}
|
||||||
|
@ -9,7 +12,7 @@
|
||||||
}
|
}
|
||||||
.accept-slide {
|
.accept-slide {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 49px;
|
bottom: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100px;
|
height: 100px;
|
||||||
background-color: #647CE8;
|
background-color: #647CE8;
|
||||||
|
|
|
@ -9,7 +9,12 @@
|
||||||
transform: translate(-50%, -50%);
|
transform: translate(-50%, -50%);
|
||||||
border-radius: .25rem;
|
border-radius: .25rem;
|
||||||
&-header {
|
&-header {
|
||||||
background: rgb(1, 209, 162);
|
&-success {
|
||||||
|
background: rgb(1, 209, 162);
|
||||||
|
}
|
||||||
|
&-warning {
|
||||||
|
background: orange;
|
||||||
|
}
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
border-radius: .25rem .25rem 0 0;
|
border-radius: .25rem .25rem 0 0;
|
||||||
min-height: 120px;
|
min-height: 120px;
|
||||||
|
@ -26,6 +31,12 @@
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
margin-top: .3rem;
|
margin-top: .3rem;
|
||||||
}
|
}
|
||||||
|
&-img-warning {
|
||||||
|
background-image: url('../img/onboarding-success.svg');
|
||||||
|
height: 6rem;
|
||||||
|
background-size: contain;
|
||||||
|
margin-top: .3rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
&-content {
|
&-content {
|
||||||
padding: .5rem .8rem;
|
padding: .5rem .8rem;
|
||||||
|
@ -42,11 +53,16 @@
|
||||||
font-weight: 200;
|
font-weight: 200;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&-content-success{
|
&-content-success {
|
||||||
button{
|
button{
|
||||||
color:rgb(23, 174, 140) !important;
|
color:rgb(23, 174, 140) !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
&-content-warning {
|
||||||
|
button{
|
||||||
|
color: orange !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal-backdrop.active {
|
.modal-backdrop.active {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#screenshot-warning-modal{
|
#screenshot-warning-modal{
|
||||||
.popup-modal-header{
|
.popup-modal-header{
|
||||||
&-img{
|
&-img{
|
||||||
background-image: url('../img/onboarding-no-screenshot.svg');
|
background-image: url('../img/no-screenshot.svg');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
bottom: 100px;
|
bottom: 100px;
|
||||||
}
|
}
|
||||||
.head {
|
.head {
|
||||||
padding-bottom: 55px;
|
padding-bottom: 30px;
|
||||||
.sending-label{
|
.sending-label{
|
||||||
line-height: 70px;
|
line-height: 70px;
|
||||||
font-size: 25px;
|
font-size: 25px;
|
||||||
|
|
|
@ -1,33 +1,68 @@
|
||||||
.wallets{
|
.wallets {
|
||||||
.slides{
|
.slides {
|
||||||
.swiper-container{
|
.swiper-container {
|
||||||
width:75% !important;
|
width: 75% !important;
|
||||||
overflow:visible;
|
overflow: visible;
|
||||||
}
|
}
|
||||||
.card{
|
.card {
|
||||||
padding: .7rem;
|
padding: .7rem;
|
||||||
padding-left:.25rem;
|
padding-left: .25rem;
|
||||||
padding-right:.25rem;
|
padding-right: .25rem;
|
||||||
border-radius: .25rem;
|
border-radius: .25rem;
|
||||||
}
|
max-width: 350px;
|
||||||
.swiper-slide{
|
@media (min-width: 500px) {
|
||||||
width:100% !important;
|
& {
|
||||||
max-width: 450px;
|
width: 350px;
|
||||||
&.swiper-slide-prev, &.swiper-slide-next{
|
position: relative;
|
||||||
opacity: .2;
|
margin: 1.5rem auto 0;
|
||||||
&:hover{
|
|
||||||
opacity: 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.swiper-slide-prev{
|
}
|
||||||
left:-5%;
|
.swiper-slide {
|
||||||
|
width: 100% !important;
|
||||||
|
max-width: 450px;
|
||||||
|
@media (min-width: 500px) {
|
||||||
|
& {
|
||||||
|
margin: 0 auto;
|
||||||
|
display: block;
|
||||||
|
float: none;
|
||||||
|
max-width: none;
|
||||||
|
}
|
||||||
|
&.swiper-slide-next .card {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
&.swiper-slide-prev .card {
|
||||||
|
float: right;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
&.swiper-slide-next{
|
&.swiper-slide-prev,
|
||||||
left:4%;
|
&.swiper-slide-next {
|
||||||
|
opacity: .2;
|
||||||
|
}
|
||||||
|
&.swiper-slide-prev {
|
||||||
|
left: -5%;
|
||||||
|
}
|
||||||
|
&.swiper-slide-next {
|
||||||
|
left: 4%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.swiper-pagination{
|
.swiper-pagination {
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.platform-browser {
|
||||||
|
.wallets {
|
||||||
|
.slides {
|
||||||
|
.swiper-slide {
|
||||||
|
&.swiper-slide-prev,
|
||||||
|
&.swiper-slide-next {
|
||||||
|
&:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
.settings {
|
||||||
|
.item {
|
||||||
|
color: #444;
|
||||||
|
border-color: rgba(221, 221, 221, 0.3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#tab-notifications {
|
||||||
|
.list {
|
||||||
|
.item {
|
||||||
|
color: #444;
|
||||||
|
border-top: none;
|
||||||
|
padding-top: 1.5rem;
|
||||||
|
padding-bottom: 1.5rem;
|
||||||
|
&:before {
|
||||||
|
display: block;
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
height: 1px;
|
||||||
|
background: rgba(221, 221, 221, 0.3);
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
content: '';
|
||||||
|
}
|
||||||
|
&.item-divider {
|
||||||
|
color: rgba(74, 74, 74, .8);
|
||||||
|
}
|
||||||
|
&.item-heading {
|
||||||
|
&:before {
|
||||||
|
top: 99%
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&:nth-child(2) {
|
||||||
|
&:before {
|
||||||
|
width: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.item-note {
|
||||||
|
color: rgb(58, 58, 58);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -15,9 +15,14 @@
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
}
|
}
|
||||||
|
@media (min-width: 415px){
|
||||||
|
.warning{
|
||||||
|
height:16rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 400px){
|
@media (max-width: 399px){
|
||||||
#onboarding-backup-request{
|
#onboarding-backup-request{
|
||||||
.warning{
|
.warning{
|
||||||
margin: 2rem auto 1rem;
|
margin: 2rem auto 1rem;
|
||||||
|
@ -52,7 +57,7 @@
|
||||||
@media (min-height: 980px){
|
@media (min-height: 980px){
|
||||||
#onboarding-backup-request{
|
#onboarding-backup-request{
|
||||||
#arrow-down{
|
#arrow-down{
|
||||||
margin-top: 15rem;
|
margin-top: 7rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -80,6 +80,19 @@
|
||||||
font-size:.8rem;
|
font-size:.8rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@media (min-width: 415px){
|
||||||
|
&{
|
||||||
|
max-width: 400px;
|
||||||
|
label{
|
||||||
|
.checkbox{
|
||||||
|
left:1rem;
|
||||||
|
}
|
||||||
|
.item-content{
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
margin-top:1.5rem;
|
margin-top:1.5rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.list{
|
||||||
|
max-width: 600px;
|
||||||
|
@include center-block();
|
||||||
|
}
|
||||||
.item {
|
.item {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
|
@ -55,6 +59,10 @@
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
&-content{
|
||||||
|
max-width: 600px;
|
||||||
|
@include center-block();
|
||||||
|
}
|
||||||
.item{
|
.item{
|
||||||
color:rgb(58,58,58);
|
color:rgb(58,58,58);
|
||||||
padding-bottom: 2.5rem;
|
padding-bottom: 2.5rem;
|
||||||
|
|
|
@ -1,40 +1,49 @@
|
||||||
#onboarding-push-notifications{
|
#onboarding-push-notifications {
|
||||||
h2{
|
h2 {
|
||||||
margin-top:2rem;
|
margin-top: 2rem;
|
||||||
}
|
}
|
||||||
#cta{
|
#cta {
|
||||||
background-image: url('../img/onboarding-push-notifications.svg');
|
background-image: url('../img/onboarding-push-notifications.svg');
|
||||||
height: 15rem;
|
height: 15rem;
|
||||||
margin-top: .75rem;
|
margin-top: .75rem;
|
||||||
}
|
}
|
||||||
.cta-buttons{
|
.cta-buttons {
|
||||||
float:none;
|
float: none;
|
||||||
bottom:0;
|
bottom: 0;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width:100%;
|
width: 100%;
|
||||||
button{
|
button {
|
||||||
max-width: 400px;
|
max-width: 400px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 400px){
|
@media (max-width: 400px) {
|
||||||
#onboarding-push-notifications{
|
#onboarding-push-notifications {
|
||||||
.cta-buttons{
|
.cta-buttons {
|
||||||
float:none;
|
float: none;
|
||||||
bottom:0;
|
bottom: 0;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (max-height: 540px){
|
|
||||||
#onboarding-push-notifications{
|
@media (max-height: 540px) {
|
||||||
#cta{
|
#onboarding-push-notifications {
|
||||||
|
#cta {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
.cta-buttons{
|
.cta-buttons {
|
||||||
float:left;
|
float: left;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (min-width: 450px) {
|
||||||
|
#onboarding-push-notifications {
|
||||||
|
#cta {
|
||||||
|
height: 26rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -87,17 +87,21 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 400px){
|
@media (min-width: 415px){
|
||||||
.onboarding{
|
.onboarding{
|
||||||
ion-content{
|
ion-content{
|
||||||
h2{
|
h2{
|
||||||
font-size: 1.2rem;
|
font-size: 2rem;
|
||||||
|
}
|
||||||
|
p{
|
||||||
|
font-size: 1.4rem;
|
||||||
|
line-height: 1.9rem;
|
||||||
}
|
}
|
||||||
p,h2,h3{
|
p,h2,h3{
|
||||||
max-width: 600px !important;
|
max-width: 600px !important;
|
||||||
}
|
}
|
||||||
button{
|
button{
|
||||||
max-width: 400px !important;
|
max-width: 400px !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -108,6 +112,6 @@
|
||||||
@import "onboard-tour";
|
@import "onboard-tour";
|
||||||
@import "onboard-collect-email";
|
@import "onboard-collect-email";
|
||||||
@import "onboard-backup-request";
|
@import "onboard-backup-request";
|
||||||
@import "onboard-backup-warning";
|
@import "../backup-warning";
|
||||||
@import "onboard-disclaimer";
|
@import "onboard-disclaimer";
|
||||||
@import "onboard-push-notifications";
|
@import "onboard-push-notifications";
|
||||||
|
|
|
@ -26,14 +26,24 @@
|
||||||
top:0;
|
top:0;
|
||||||
right:0;
|
right:0;
|
||||||
content:'';
|
content:'';
|
||||||
|
@media (min-width: 450px){
|
||||||
|
&{
|
||||||
|
width:90%;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
&.item-heading{
|
&.item-heading{
|
||||||
&:before{
|
&:before{
|
||||||
width:100%;
|
width:100% !important;
|
||||||
top:99%
|
top:99%
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&:nth-child(2){
|
&:nth-child(1){
|
||||||
|
&:before{
|
||||||
|
width:0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&:nth-child(2):last-child{
|
||||||
&:before{
|
&:before{
|
||||||
width:0;
|
width:0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,20 @@
|
||||||
}
|
}
|
||||||
#address {
|
#address {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
|
.incomplete {
|
||||||
|
padding: 50px;
|
||||||
|
.title {
|
||||||
|
padding: 20px;
|
||||||
|
font-size: 25px;
|
||||||
|
color: #444;
|
||||||
|
}
|
||||||
|
.subtitle {
|
||||||
|
padding: 20px;
|
||||||
|
color: #444;
|
||||||
|
}
|
||||||
|
.button {
|
||||||
|
}
|
||||||
|
}
|
||||||
.item {
|
.item {
|
||||||
border: none;
|
border: none;
|
||||||
font-size: .8rem;
|
font-size: .8rem;
|
||||||
|
@ -29,6 +43,16 @@
|
||||||
}
|
}
|
||||||
&-gen-address {}
|
&-gen-address {}
|
||||||
}
|
}
|
||||||
|
.qr {
|
||||||
|
padding: 30px;
|
||||||
|
}
|
||||||
|
.backup {
|
||||||
|
background-color: orange;
|
||||||
|
color: #fff;
|
||||||
|
i {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#wallets {
|
#wallets {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
|
@ -16,4 +16,11 @@
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 10px;
|
top: 10px;
|
||||||
}
|
}
|
||||||
|
.show-more {
|
||||||
|
text-align: center;
|
||||||
|
padding: 20px;
|
||||||
|
font-size: 16px;
|
||||||
|
color: #387ef5;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width : 320px) and (max-width : 340px) and (orientation : portrait), (min-width : 650px) and (max-width : 770px) and (orientation : portrait){
|
@media (min-width : 320px) and (max-width : 415px) and (orientation : portrait), (min-width : 650px) and (max-width : 770px) and (orientation : portrait){
|
||||||
#wallet-backup-phrase{
|
#wallet-backup-phrase{
|
||||||
.cta-buttons,#select-phrase{
|
.cta-buttons,#select-phrase{
|
||||||
bottom: 64px;
|
bottom: 64px;
|
||||||
|
|
Loading…
Reference in New Issue