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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps

Browse source 
# Conflicts:
#	public/views/onboarding/terms.html
#	src/sass/views/onboarding/terms-of-use.scss
This commit is contained in:
Jamal Jackson 2016-09-06 10:46:47 -04:00
commit 229e2fd8ec
83 changed files with 860 additions and 999 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -69,7 +69,7 @@ module.exports = function(grunt) {
tasks: ['concat:css'] tasks: ['concat:css']
}, },
sass: { sass: {
files: ['src/sass/**/*.scss'], files: ['src/sass/**/**/*.scss'],
tasks: ['sass', 'concat:css'] tasks: ['sass', 'concat:css']
}, },
main: { main: {

9
app-template/ProjectMakefile
View file

@ -16,7 +16,7 @@ plugins:
cordova plugin add cordova-plugin-console cordova plugin add cordova-plugin-console
cordova plugin add cordova-plugin-uniquedeviceid cordova plugin add cordova-plugin-uniquedeviceid
cordova plugin add cordova-plugin-file cordova plugin add cordova-plugin-file
cordova plugin add cordova-plugin-touch-id cordova plugin add cordova-plugin-touch-id
cordova prepare cordova prepare
cordova plugin add cordova-plugin-transport-security cordova plugin add cordova-plugin-transport-security
cordova plugin add cordova-ios-requires-fullscreen cordova plugin add cordova-ios-requires-fullscreen
@ -26,7 +26,8 @@ plugins:
cordova plugin add cordova-plugin-screen-orientation cordova plugin add cordova-plugin-screen-orientation
cordova plugin add ionic-plugin-keyboard cordova plugin add ionic-plugin-keyboard
cordova plugin add cordova-plugin-whitelist cordova plugin add cordova-plugin-whitelist
cordova plugin add https://github.com/driftyco/cordova-plugin-wkwebview-engine.git --save
ios-platform android-platform wp-platform: ios-platform android-platform wp-platform:
@ -40,12 +41,12 @@ android: android-platform plugins
cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner
cordova plugin add phonegap-plugin-push@1.2.3 cordova plugin add phonegap-plugin-push@1.2.3
wp: wp-platform plugins wp: wp-platform plugins
cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner
build-ios build-android build-wp8: build-ios build-android build-wp8:
cordova build $(subst build-,,$@) cordova build $(subst build-,,$@)
run: run:
cordova run --device cordova run --device

5
app-template/config.xml
View file

@ -21,9 +21,8 @@
<preference name="AutoHideSplashScreen" value="false" /> <preference name="AutoHideSplashScreen" value="false" />
<preference name="FadeSplashScreen" value="true" /> <preference name="FadeSplashScreen" value="true" />
<preference name="FadeSplashScreenDuration" value="1" /> <preference name="FadeSplashScreenDuration" value="1" />
<preference name="BackgroundColor" value="#2C3E50" /> <preference name="StatusBarOverlaysWebView" value="true" />
<preference name="StatusBarOverlaysWebView" value="false" /> <preference name="StatusBarBackgroundColor" value="#1e3186" />
<preference name="StatusBarBackgroundColor" value="#2C3E50" />
<preference name="StatusBarStyle" value="lightcontent" /> <preference name="StatusBarStyle" value="lightcontent" />
<preference name="BackupWebStorage" value="none"/> <preference name="BackupWebStorage" value="none"/>
<preference name="windows-target-version" value="8.1"/> <preference name="windows-target-version" value="8.1"/>

4
app-template/copay/appConfig.json
View file

@ -5,6 +5,8 @@
"nameCase": "Copay", "nameCase": "Copay",
"nameCaseNoSpace": "Copay", "nameCaseNoSpace": "Copay",
"bundleName": "copay", "bundleName": "copay",
"gitHubRepoName": "copay",
"disclaimerUrl": "https://copay.io/disclaimer",
"url": "https://copay.io", "url": "https://copay.io",
"appDescription": "Copay Bitcoin Wallet", "appDescription": "Copay Bitcoin Wallet",
"winAppName": "CopayWallet", "winAppName": "CopayWallet",
@ -18,5 +20,5 @@
"coinbase": true, "coinbase": true,
"glidera": true, "glidera": true,
"amazon": true "amazon": true
} }
} }

2
app-template/package.json
View file

@ -42,7 +42,7 @@
"url": "https://github.com/bitpay/copay/issues" "url": "https://github.com/bitpay/copay/issues"
}, },
"dependencies": { "dependencies": {
"bitcore-wallet-client": "4.1.0", "bitcore-wallet-client": "4.2.0",
"coveralls": "^2.11.9", "coveralls": "^2.11.9",
"express": "^4.11.2", "express": "^4.11.2",
"fs": "0.0.2", "fs": "0.0.2",

2
package.json
View file

@ -45,7 +45,7 @@
"url": "https://github.com/bitpay/copay/issues" "url": "https://github.com/bitpay/copay/issues"
}, },
"dependencies": { "dependencies": {
"bitcore-wallet-client": "4.1.0", "bitcore-wallet-client": "4.2.0",
"coveralls": "^2.11.9", "coveralls": "^2.11.9",
"express": "^4.11.2", "express": "^4.11.2",
"fs": "0.0.2", "fs": "0.0.2",

1
public/index.html
View file

@ -6,7 +6,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
<meta name="msapplication-tap-highlight" content="no"> <meta name="msapplication-tap-highlight" content="no">
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<link rel="stylesheet" type="text/css" href="css/ionic.min.css">
<link rel="stylesheet" type="text/css" href="css/copay.css"> <link rel="stylesheet" type="text/css" href="css/copay.css">
<title>{{appConfig.nameCase}} - {{appConfig.description}}</title> <title>{{appConfig.nameCase}} - {{appConfig.description}}</title>
<link rel="shortcut icon" href="img/favicon.ico"> <link rel="shortcut icon" href="img/favicon.ico">

2
public/views/add.html
View file

@ -10,7 +10,7 @@
<ion-content> <ion-content>
<ion-list> <ion-list>
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create.personal"> <a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create">
<h2 translate>Create new wallet</h2> <h2 translate>Create new wallet</h2>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i> <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a> </a>

2
public/views/confirm.html
View file

@ -49,7 +49,7 @@
</div> </div>
</div> </div>
<button class="item button button-block button-balanced" ng-click="approve()" ng-disabled="!txp"> <button class="item button button-block button-balanced" ng-click="approve()">
<span translate>Send</span> <span translate>Send</span>
</button> </button>
</ion-content> </ion-content>

29
public/views/create.html
View file

@ -1,13 +1,22 @@
<ion-view > <ion-view>
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-tab title="Personal Wallet" ui-sref="tabs.create.personal"> <ion-content ng-controller="createController" ng-init="personal = true; init()">
<ion-nav-view name="tab-create-personal"></ion-nav-view> <div class="row text-center">
</ion-tab> <div class="col" ng-click="personal = true; setTotalCopayers(1)" ng-style="personal && {'border-bottom': '2px solid'}">
<span class="" translate>Personal Wallet</span>
</div>
<div class="col" ng-click="personal = false; setTotalCopayers(3)" ng-style="!personal && {'border-bottom': '2px solid'}">
<span class="" translate>Shared Wallet</span>
</div>
</div>
<ion-tab title="Shared Wallet" ui-sref="tabs.create.shared"> <div ng-include="'views/tab-create-personal.html'" ng-if="personal"></div>
<ion-nav-view name="tab-create-shared"></ion-nav-view> <div ng-include="'views/tab-create-shared.html'" ng-if="!personal"></div>
</ion-tab> </ion-content>
</ion-tabs>
</ion-view> </ion-view>

2
public/views/includes/backupWarningPopup.html
View file

@ -1,7 +1,7 @@
<div> <div>
<h1 translate>Screenshots are not secure</h1> <h1 translate>Screenshots are not secure</h1>
<span translate>if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen.</span> <span translate>if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen.</span>
<button ng-click="close()" class="button button-block button-light" translate> <button ng-click="close()" class="button button-block no-border" translate>
Got it Got it
</button> </button>
</div> </div>

52
public/views/includes/txp.html
View file

@ -1,23 +1,31 @@
<i class="icon ion-ios-circle-filled" ng-show="tx.pendingForUs" ng-style="{'color':tx.wallet.color}"></i>
<span ng-show="!tx.merchant">
<span ng-show="addressbook[tx.toAddress] && !tx.message">
{{addressbook[tx.toAddress]}}
</span>
<span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
{{tx.message}}
</span>
<span ng-show="!addressbook[tx.toAddress] && !tx.message" translate>
Sending
</span>
</span>
<span ng-show="tx.merchant">
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
</span>
<span>
- {{tx.amountStr}}
</span>
<div class="item-note">
{{tx.wallet.name}} &middot; <time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div>
<div class="wallet-activity" ng-class="{'wallet-activity-not-pending':!tx.pendingForUs}">
<span ng-show="!tx.merchant">
<span ng-show="addressbook[tx.toAddress] && !tx.message">
{{addressbook[tx.toAddress]}}
</span>
<span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
{{tx.message}}
</span>
<span ng-show="!addressbook[tx.toAddress] && !tx.message" translate>
Sending
</span>
</span>
<span ng-show="tx.merchant">
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
</span>
<span>
</span>
<div class="wallet-activity-amount">
{{tx.amountStr}}
</div>
<p class="wallet-activity-note">
<i class="icon ion-record wallet-activity-note-child" ng-style="{'color':tx.wallet.color}"></i>
<span class="wallet-activity-note-child">{{tx.wallet.name}}</span>
<time class="wallet-activity-note-child">{{tx.createdOn * 1000 | amTimeAgo}}</time>
</p>
</div>

6
public/views/modals/addressbook.html
View file

@ -1,13 +1,13 @@
<ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()"> <ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()">
<ion-header-bar align-title="center" class="bar-royal"> <ion-header-bar align-title="center" class="bar-royal">
<button class="button back-button" ng-click="closeAddressbookModal()"> <button class="button button-clear" ng-click="closeAddressbookModal()">
<i class="icon ion-ios-arrow-thin-left"></i> Close
</button> </button>
<div class="h1 title"> <div class="h1 title">
<span ng-show="!addAddressbookEntry" translate>Addressbook</span> <span ng-show="!addAddressbookEntry" translate>Addressbook</span>
<span ng-show="addAddressbookEntry" translate>Add entry</span> <span ng-show="addAddressbookEntry" translate>Add entry</span>
</div> </div>
<button class="button button-clear button-positive" <button class="button button-clear"
ng-click="toggleAddAddressbookEntry()"> ng-click="toggleAddAddressbookEntry()">
<i ng-show="!addAddressbookEntry" class="icon ion-ios-plus-empty"></i> <i ng-show="!addAddressbookEntry" class="icon ion-ios-plus-empty"></i>
<span ng-show="addAddressbookEntry" translate>Cancel</span> <span ng-show="addAddressbookEntry" translate>Cancel</span>

5
public/views/onboarding/backupRequest.html
View file

@ -1,7 +1,7 @@
<ion-view id="onboarding-backup-request" class="onboarding"> <ion-view id="onboarding-backup-request" class="onboarding">
<ion-content ng-controller="backupRequestController"> <ion-content ng-controller="backupRequestController">
<div class="row"> <div class="row">
<img src="../../img/onboarding-warning.svg" class="col col-75 warning"> <img src="img/onboarding-warning.svg" class="col col-75 warning">
</div> </div>
<div class="row text-center"> <div class="row text-center">
<h3 translate class="col-75 col"> <h3 translate class="col-75 col">
@ -17,7 +17,8 @@
<i class="ion-ios-arrow-thin-down light-blue col col-60" id="arrow-down"></i> <i class="ion-ios-arrow-thin-down light-blue col col-60" id="arrow-down"></i>
</div> </div>
<div class="row"> <div class="row">
<button class="button button-block button-positive col-75 col" href ui-sref="onboarding.backupWarning" translate>Backup wallet</button> <button class="button button-block button-positive col-75 col" href
ui-sref="onboarding.backupWarning({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>

10
public/views/onboarding/backupWarning.html
View file

@ -1,12 +1,12 @@
<ion-view id="onboarding-backup-warning" class="onboarding"> <ion-view id="onboarding-backup-warning" class="onboarding" ng-controller="backupWarningController">
<ion-nav-bar class="bar-stable"> <ion-nav-bar>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" href ui-sref="onboarding.backupRequest"> <button class="button button-back no-border" href ui-sref="onboarding.backupRequest({walletId: walletId})">
<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>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="backupWarningController"> <ion-content>
<div class="row text-center"> <div class="row text-center">
<h3 translate class="col col-75"> <h3 translate class="col col-75">
Are you being watched? Are you being watched?
@ -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"> <img src="img/onboarding-backup-warning.svg" class="col col-60">
</div> </div>
<div class="row text-center"> <div class="row text-center">
<p class="col col-60"> <p class="col col-60">

38
public/views/onboarding/collectEmail.html
View file

@ -1,29 +1,27 @@
<ion-view ng-controller="collectEmailController" id="onboarding-collect-email" class="onboarding"> <ion-view ng-controller="collectEmailController" id="onboarding-collect-email" class="onboarding">
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="secondary">
<button class="button no-border" ng-click="onboardingMailSkip()">
{{'Skip' | translate}}
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content> <ion-content>
<div class="row"> <div class="row">
<img src="../../img/onboarding-success.svg" class="col col-75" id="success-image" /> <img src="img/onboarding-success.svg" class="col col-75" id="success-image" />
</div> </div>
<div class="row text-center"> <div class="row text-center">
<h3 translate class="col">Wallet Created</h3> <h3 translate class="col">Wallet Created</h3>
</div> </div>
</ion-content> <div id="collect-email">
<div id="collect-email"> <div class="row text-center">
<div class="row text-center"> <p translate class="col col-75">Where would you like to receive email notifications about payments </p>
<p translate class="col col-75">Where would you like to receive email notifications about payments </p> </div>
<form name="emailForm" ng-submit="save(emailForm)" novalidate>
<label class="item item-input col col-75">
<i class="icon ion-arrow-right-c"></i>
<input type="email" id="email" name="email" ng-model="email" required></input>
</label>
</form>
<div class="text-center">
<button class="button button-back no-border" ng-click="onboardingMailSkip()">
{{'Skip' | translate}}
</button>
</div>
</div> </div>
<form name="emailForm" ng-submit="save(emailForm)" novalidate> <div class="overlay"></div>
<label class="item item-input col col-75"> </ion-content>
<i class="icon ion-arrow-right-c"></i>
<input type="email" id="email" name="email" ng-model="email" required></input>
</label>
</form>
</div>
<div class="overlay"></div>
</ion-view> </ion-view>

2
public/views/onboarding/notifications.html
View file

@ -10,7 +10,7 @@
</span> </span>
<button class="button button-block button-positive" ng-click="allowNotif()" translate>Allow notifications</button> <button class="button button-block button-positive" ng-click="allowNotif()" translate>Allow notifications</button>
<button class="button button-block button-light" href ui-sref="onboarding.requestBackup" translate>Not now</button> <button class="button button-block button-light" href ui-sref="onboarding.backupRequest({walletId: walletId})" translate>Not now</button>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

4
public/views/onboarding/tour.html
View file

@ -2,12 +2,12 @@
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable">
<ion-nav-title></ion-nav-title> <ion-nav-title></ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button no-border" ng-click="goBack()"> <button class="button back-button no-border" 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>
<ion-nav-buttons side="secondary"> <ion-nav-buttons side="secondary">
<button class="button no-border" ng-show="data.index == 0" ng-click="createDefaultWallet()"> <button class="button back-button no-border" ng-show="data.index == 0" ng-click="createDefaultWallet()">
{{'Skip' | translate}} {{'Skip' | translate}}
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>

2
public/views/onboarding/welcome.html
View file

@ -3,7 +3,7 @@
<qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner> <qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner>
<div class="text-center"> <div class="text-center">
<div class="row"> <div class="row">
<img src='../../img/bitpay-logo.svg' class="logo col col-50" /> <img src='img/bitpay-logo.svg' class="logo col col-50" />
</div> </div>
<div class="row"> <div class="row">
<p translate class="text-center col col-60"> <p translate class="text-center col col-60">

27
public/views/preferences.html
View file

@ -6,33 +6,24 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesController" ng-init="init()"> <ion-content ng-controller="preferencesController" ng-init="init()">
<div class="list"> <div class="list">
<div class="item item-divider"> <div class="item item-divider"></div>
Preferences
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAlias"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAlias">
<span translate>Wallet Name</span> <span translate>Name</span>
<span class="item-note"> <span class="item-note">
{{alias||wallet.walletName}} {{wallet.name}}
</span> </span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item">
<span translate>Wallet Type</span>
<span class="item-note">
{{wallet.m}}-of-{{wallet.n}}
</span>
</div>
<div class="item" ng-show="wallet.isPrivKeyExternal()"> <div class="item" ng-show="wallet.isPrivKeyExternal()">
<span translate>Hardware wallet</span> <span translate>Hardware Wallet</span>
<span class="item-note"> <span class="item-note">
{{wallet.externalSource}} {{wallet.externalSource}}
</span> </span>
</div> </div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesColor"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesColor">
<span ng-style="{'color': wallet.color}">&block;</span> <span translate>Color</span>
<span translate>Wallet Color</span> <span class="item-note" ng-style="{'color': wallet.color}">
<span class="item-note"> &block;
{{wallet.alias||wallet.walletName}}
</span> </span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
@ -65,9 +56,7 @@
<span translate>Delete recovery phrase</span> <span translate>Delete recovery phrase</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-divider" translate> <div class="item item-divider"></div>
Advanced
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAdvanced"> <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAdvanced">
<span translate>Advanced</span> <span translate>Advanced</span>
<i class="icon ion-ios-arrow-right"></i> <i class="icon ion-ios-arrow-right"></i>

65
public/views/preferencesAbout.html
View file

@ -7,36 +7,41 @@
</ion-nav-buttons> </ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesAbout"> <ion-content ng-controller="preferencesAbout">
<div class="item item-divider" translate> <div class="list">
Release information <div class="item item-divider" translate>
</div> Release information
<div class="item item-icon-left"> </div>
<i class="icon ion-ios-film-outline"></i> <div class="item item-icon-left">
<span translate>Version</span> <i class="icon ion-ios-download-outline"></i>
<span class="item-note"> <span translate>Version</span>
v{{v.version}} <span class="item-note">
</span> v{{version}}
</div> </span>
<div class="item item-icon-left" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/tree/'+v.commitHash)"> </div>
<i class="icon ion-ios-film-outline"></i> <div class="item item-icon-left" ng-click="openExternalLink('https://github.com/bitpay/'+name+'/tree/'+commitHash)">
<span translate>Commit hash</span> <i class="icon ion-social-github-outline"></i>
<span class="item-note"> <span translate>Commit hash</span>
#{{v.commitHash}} <span class="item-note">
</span> #{{commitHash}}
</div> </span>
<div class="item item-divider"> </div>
</div> <div class="item item-divider">
<div class="item item-icon-left" href ui-sref="tabs.termsOfUse"> </div>
<i class="icon ion-ios-bell-outline"></i> <div class="item item-icon-left item-icon-right" href ui-sref="tabs.termsOfUse">
<span translate>Terms of Use</span> <i class="icon ion-ios-list-outline"></i>
</div> <span translate>Terms of Use</span>
<div class="item item-icon-left" href ui-sref="tabs.translators"> <i class="icon ion-ios-arrow-right"></i>
<i class="icon ion-ios-bell-outline"></i> </div>
<span translate>Translators</span> <div class="item item-icon-left item-icon-right" href ui-sref="tabs.translators">
</div> <i class="icon ion-ios-people-outline"></i>
<div class="item item-icon-left" href ui-sref="tabs.logs"> <span translate>Translators</span>
<i class="icon ion-ios-bell-outline"></i> <i class="icon ion-ios-arrow-right"></i>
<span translate>Session log</span> </div>
<div class="item item-icon-left item-icon-right" href ui-sref="tabs.logs">
<i class="icon ion-ios-copy-outline"></i>
<span translate>Session log</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

18
public/views/preferencesAlias.html
View file

@ -6,12 +6,18 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesAliasController" > <ion-content ng-controller="preferencesAliasController" >
<form name="aliasForm" ng-submit="save(aliasForm)" novalidate> <form name="aliasForm" ng-submit="save(aliasForm)" novalidate>
<label class="item item-input item-stacked-label"> <div class="card list">
<span class="input-label" transalate>Alias for {{walletName}}</span> <label class="item item-input item-stacked-label">
<input type="text" id="alias" name="alias" ng-model="alias" placeholder="John" required></input> <span class="input-label" transalate>Alias for {{walletName}}</span>
</label> <input type="text" id="alias" name="alias" ng-model="alias" placeholder="John" required>
<input type="submit" class="button button-block button-stable" value="{{'Save'|translate}}" ng-disabled="aliasForm.$invalid"> </label>
</div>
<button type="submit"
class="button button-block button-positive"
ng-disabled="aliasForm.$invalid" translate>
Save
</button>
</form> </form>
<div translate>Changing wallet alias only affects the local wallet name.</div> <div class="text-center" translate>Changing wallet alias only affects the local wallet name.</div>
</ion-content> </ion-content>
</ion-view> </ion-view>

20
public/views/preferencesBwsUrl.html
View file

@ -6,17 +6,15 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesBwsUrlController"> <ion-content ng-controller="preferencesBwsUrlController">
<div class="row no-border"> <div class="card list">
<div class="col col-90"> <label class="item item-input item-stacked-label no-border">
<label class="item item-input item-stacked-label no-border"> <span class="input-label">Wallet Service URL</span>
<span class="input-label" transalate>Wallet Service URL</span> <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl"> <a class="postfix" on-tap="resetDefaultUrl()">
</label> <i class="icon ion-ios-reload"></i>
</div> </a>
<div class="col"> </label>
<i class="icon ion-ios-reload" ng-click="resetDefaultUrl()"></i>
</div>
</div> </div>
<button class="button button-block button-balanced" ng-click="save()" translate>Save</button> <button class="button button-block button-positive" ng-click="save()" translate>Save</button>
</ion-content> </ion-content>
</ion-view> </ion-view>

14
public/views/preferencesDeleteWallet.html
View file

@ -4,12 +4,14 @@
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button> </ion-nav-back-button>
</ion-nav-bar> </ion-nav-bar>
<ion-content class="has-header" ng-controller="preferencesDeleteWalletController" > <ion-content ng-controller="preferencesDeleteWalletController" >
<div translate>Warning!</div> <div class="card">
<div translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div> <h1 class="text-center" translate>Warning!</h2>
<div class="right" ng-style="{'color':backgroundColor}" ng-show="!isDeletingWallet"> <div class="assertive padding" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
<span ng-show="alias">{{alias}}</span>{{walletName}} <div class="text-center padding">
<span ng-show="alias">{{alias}}</span>{{walletName}}
</div>
</div> </div>
<button class="button button-block button-stable" ng-click="showDeletePopup()"translate>Delete wallet</button> <button class="button button-block button-assertive" ng-click="showDeletePopup()"translate>Delete</button>
</ion-content> </ion-content>
</ion-view> </ion-view>

18
public/views/preferencesEmail.html
View file

@ -6,13 +6,19 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesEmailController" > <ion-content ng-controller="preferencesEmailController" >
<form name="emailForm" ng-submit="save(emailForm)" novalidate> <form name="emailForm" ng-submit="save(emailForm)" novalidate>
<label class="item item-input item-stacked-label"> <div class="card list">
<span class="input-label" transalate>Email for wallet notifications</span> <label class="item item-input item-stacked-label">
<input type="email" id="email" name="email" ng-model="email" required></input> <span class="input-label" transalate>Email for wallet notifications</span>
</label> <input type="email" id="email" name="email" ng-model="email" required></input>
<input type="submit" class="button button-block button-stable" value="{{'Save'|translate}}" ng-disabled="emailForm.$invalid"> </label>
</div>
<button type="submit"
class="button button-block button-positive"
ng-disabled="emailForm.$invalid" translate>
Save
</button>
</form> </form>
<div translate>Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more. <div class="text-center" translate>Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more.
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

22
public/views/preferencesFee.html
View file

@ -6,19 +6,17 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesFeeController" ng-init="init()"> <ion-content ng-controller="preferencesFeeController" ng-init="init()">
<div ng-show="loading"> <ion-radio ng-repeat="fee in feeLevels.livenet" ng-value="fee.level" ng-model="currentFeeLevel" ng-click="save(fee)">
<ion-spinner class="spinner-dark" icon="lines">Loading...</ion-spinner> {{feeOpts[fee.level]|translate}}
</div>
<ion-radio ng-repeat="fee in feeLevels.livenet" ng-value="fee.level" ng-model="currentFeeLevel" ng-click="save(fee)">{{feeOpts[fee.level]|translate}}
</ion-radio> </ion-radio>
<div ng-repeat="fee in feeLevels.livenet" ng-if="fee.level == currentFeeLevel"> <div class="padding text-center positive" ng-repeat="fee in feeLevels.livenet" ng-if="fee.level == currentFeeLevel">
<div ng-show="fee.nbBlocks"> <div ng-show="fee.nbBlocks">
<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>. <span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
</div>
<span translate>Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB</span>
</div>
<div translate>
Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy.
</div> </div>
<span translate>Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB</span>
</div>
<div class="padding" translate>
Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy.
</div>
</ion-content> </ion-content>
</ion-view> </ion-view>

4
public/views/preferencesHistory.html
View file

@ -6,7 +6,7 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesHistory" ng-init="index.updatingTxHistory ? null : csvHistory()"> <ion-content ng-controller="preferencesHistory" ng-init="index.updatingTxHistory ? null : csvHistory()">
<div class="item item-divider"></div> <div class="item item-divider"></div>
<div class="item" ng-show="csvReady && !index.isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{index.alias || index.walletName}}.csv"> <div class="item" ng-show="csvReady && !index.isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{wallet.name}}.csv">
<span translate>Export to file</span> <span translate>Export to file</span>
</div> </div>
<div class="item" ng-show="!csvReady && !index.isCordova"> <div class="item" ng-show="!csvReady && !index.isCordova">
@ -15,7 +15,7 @@
preparing... preparing...
</span> </span>
</div> </div>
<div class="item" ng-click="clearTransactionHistory()"> <div class="item assertive" ng-click="clearTransactionHistory()">
<span translate>Clear cache</span> <span translate>Clear cache</span>
</div> </div>
</ion-content> </ion-content>

44
public/views/preferencesInformation.html
View file

@ -6,9 +6,7 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesInformation" ng-init="init()"> <ion-content ng-controller="preferencesInformation" ng-init="init()">
<div class="list"> <div class="list">
<div class="item item-divider"> <div class="item item-divider"></div>
Wallet Information
</div>
<div class="item" ng-click="saveBlack()"> <div class="item" ng-click="saveBlack()">
<span translate>Wallet Name (at creation)</span> <span translate>Wallet Name (at creation)</span>
<span class="item-note"> <span class="item-note">
@ -64,23 +62,23 @@
</span> </span>
</div> </div>
<div class="item item-divider"> <div ng-show="wallet.cachedStatus.wallet.copayers[0]" class="item item-divider">
Copayers Copayers
</div> </div>
<div class="item item-icon-right" ng-repeat="copayer in wallet.copayers"> <div class="item item-icon-right" ng-repeat="copayer in wallet.cachedStatus.wallet.copayers">
<span ng-show="copayer.id == wallet.copayerId" translate>{{copayer.name}} ({{'Me'|translate}})</span> {{copayer.name}}
<span ng-style="{'color': 'grey';}" ng-show="copayer.id != wallet.copayerId" translate>{{copayer.name}}</span> <span ng-show="copayer.id == wallet.copayerId">
<i class="icon ion-ios-checkmark-outline"></i> ({{'Me'|translate}})
</span>
</div> </div>
<div class="item item-divider"> <div class="item item-divider" translate>
Extended Public Keys Extended Public Keys
</div> </div>
<div class="item" ng-repeat="pk in pubKeys" copy-to-clipboard="pk"> <div class="item" ng-repeat="pk in pubKeys" copy-to-clipboard="pk">
<span translate>Copayer {{$index}}<</span> <span translate>Copayer {{$index}}</span>
<i class="icon ion-ios-checkmark-outline"></i>
<span class="item-note"> <span class="item-note">
<span>Copayer {{$index}}</span> <span>Copayer {{$index}}</span>
<span>{{pk}}</span> <span>{{pk}}</span>
@ -89,27 +87,27 @@
</div> </div>
<div ng-show="addrs"> <div ng-show="addrs">
<div class="item item-divider"> <div class="item item-divider" translate>
Last Wallet Addresses Last Wallet Addresses
</div> </div>
<div class="item" ng-repeat="a in addrs" class="oh" copy-to-clipboard="a.address"> <div class="item" ng-repeat="a in addrs" class="oh" copy-to-clipboard="a.address">
<span>{{a.address}}</span> <span>{{a.address}}</span>
<span>{{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}</span> <span class="item-note">{{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}</span>
<i class="icon ion-ios-checkmark-outline"></i>
</div> </div>
<div translate> <div class="padding text-center" translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time. Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div> </div>
<button class="button button-block button-positive" href ui-sref="walletHome" ng-click="scan()" translate> <button class="button button-block button-positive" ng-click="scan()" translate>
Scan addresses for funds Scan addresses for funds
</button> </button>
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate> <button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate>
Send addresses by email Send addresses by email
</button> </button>
</div>
<div ng-show="wallet.balanceByAddress" ng-if="wallet.balanceByAddress[0]"> <div ng-show="wallet.balanceByAddress[0]">
<div class="item item-divider"> <div class="item item-divider" translate>
Balance By Address Balance By Address
</div> </div>
<div class="item" ng-repeat="a in wallet.balanceByAddress" copy-to-clipboard="a.address"> <div class="item" ng-repeat="a in wallet.balanceByAddress" copy-to-clipboard="a.address">

12
public/views/preferencesLanguage.html
View file

@ -8,10 +8,12 @@
<ion-radio ng-repeat="lang in availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage" <ion-radio ng-repeat="lang in availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage"
ng-click="save(lang.isoCode)">{{lang.name}} ng-click="save(lang.isoCode)">{{lang.name}}
</ion-radio> </ion-radio>
<span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span> <div class="padding">
<a ng-click="$root.openExternalLink('https://crowdin.com/project/copay', '_system')">https://crowdin.com/project/copay</a>. <span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span>
<span translate> <a ng-click="openExternalLink('https://crowdin.com/project/copay', '_system')">https://crowdin.com/project/copay</a>.
Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. <span translate>
</span> Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.
</span>
</div>
</ion-content> </ion-content>
</ion-view> </ion-view>

29
public/views/preferencesLogs.html
View file

@ -4,16 +4,25 @@
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button> </ion-nav-back-button>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="preferencesLogs" ng-init="init()" > <ion-content ng-controller="preferencesLogs" ng-init="init()">
<button ng-show="isCordova" ng-click="logs.sendLogs()"><i class="fi-mail"></i> <div class="card">
<span translate>Send by email</span> <div class="item item-text-wrap">
<ul>
<li ng-repeat="l in logs">
<span ng-class="{'energized': l.level=='warn', 'dark': l.level=='debug', 'positive': l.level=='info', 'assertive': l.level=='error' }">
{{l.msg}}
</span>
</li>
</ul>
</div>
</div>
<button class="button button-block button-positive" copy-to-clipboard="prepare()">
<i class="icon ion-clipboard"></i>
<span translate>Copy to clipboard</span>
</button>
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendLogs()">
<i class="icon ion-ios-email-outline"></i>
<span translate>Send by email</span>
</button> </button>
<ul>
<li ng-repeat="l in logs">
<span ng-class="{'text-warning': l.level=='warn', 'text-secondary': l.level=='debug', 'text-primary': l.level=='info', 'text-alert': l.level=='error' }">
{{l.msg}}
</span>
</li>
</ul>
</ion-content> </ion-content>
</ion-view> </ion-view>

2
public/views/proposals.html
View file

@ -11,7 +11,7 @@
<ion-content class="padding" ng-controller="proposalsController" ng-init="init()"> <ion-content class="padding" ng-controller="proposalsController" ng-init="init()">
<div class="list card"> <div class="list card">
<a ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)"> <a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
<span ng-include="'views/includes/txp.html'"></span> <span ng-include="'views/includes/txp.html'"></span>
</a> </a>

187
public/views/tab-create-personal.html
View file

@ -1,125 +1,88 @@
<ion-view> <form name="setupForm" ng-submit="create(setupForm)" novalidate>
<ion-nav-bar class="bar-royal"> <div class="card list">
<ion-nav-buttons side="primary"> <label class="item item-input item-stacked-label">
<button class="button back-button" ui-sref="tabs.add"> <span class="input-label" translate>Wallet name</span>
<i class="icon ion-ios-arrow-thin-left"></i> <input type="text"
</button> placeholder="{{'Family vacation funds'|translate}}"
</ion-nav-buttons> ng-model="formData.walletName"
<ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title> ng-required="true"
</ion-nav-bar> ng-focus="formFocus('wallet-name')"
ng-blur="formFocus(false)">
</label>
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(1)"> <ion-toggle ng-model="showAdv" toggle-class="toggle-stable" ng-change="showAdvChange()">
<span translate ng-show="!showAdv">Show advanced options</span>
<span translate ng-show="showAdv">Hide advanced options</span>
</ion-toggle>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate> <div ng-show="showAdv">
<label class="item item-input item-stacked-label">
<span class="input-label">Wallet Service URL</span>
<input type="text" ng-model="formData.bwsurl" placeholder="https://bws.bitpay.com/bws/api">
</label>
<div class="card list"> <label class="item item-input item-select">
<label ng-hide="create.hideWalletName" class="item item-input item-stacked-label"> <div class="input-label" translate>
<span class="input-label" translate>Wallet name</span> Wallet Key
<input type="text" </div>
placeholder="{{'Family vacation funds'|translate}}" <select class="m10t" ng-model="seedSource" ng-options="seed as seed.label for seed in seedOptions"></select>
name="walletName" </label>
ng-model="walletName"
ng-required="true"
ng-focus="create.formFocus('wallet-name')"
ng-blur="create.formFocus(false)">
</label>
<ion-toggle ng-model="showAdv" toggle-class="toggle-stable" ng-change="showAdvChange()"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'trezor' || seedSource.id == 'ledger'">
<span translate ng-show="!showAdv">Show advanced options</span> <span class="input-label" translate>Account Number</span>
<span translate ng-show="showAdv">Hide advanced options</span> <input type="number" ng-model="formData.account" ignore-mouse-wheel>
</ion-toggle> </label>
<div ng-show="showAdv"> <div class="card" ng-show="seedSource.id == 'new' && createPassphrase">
<div class="item item-text-wrap" translate>
WARNING: The password cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the password.
</div>
</div>
<label class="item item-input item-stacked-label"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'new'">
<span class="input-label">Wallet Service URL</span> <span class="input-label" translate>Add a Password</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl"> <input type="text"
</label> placeholder="{{'Add an optional password to secure the recovery phrase'|translate}}"
autocapitalize="off"
ng-model="formData.createPassphrase">
</label>
<label class="item item-input item-select"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
<div class="input-label" translate> <span class="input-label" translate>Wallet Recovery Phrase</span>
Wallet Key <input placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}"
</div> autocapitalize="off"
<select class="m10t" type="text"
ng-model="seedSource" ng-model="formData.privateKey">
ng-options="seed as seed.label for seed in create.seedOptions" </label>
ng-change="create.setSeedSource()">
</select>
</label>
<label class="item item-input item-stacked-label" <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
ng-show="create.seedSourceId == 'trezor' || create.seedSourceId == 'ledger'"> <span class="input-label" translate>Password</span>
<span class="input-label" translate>Account Number</span> <input type="text"
<input type="number" id="account" ng-model="account" ignore-mouse-wheel> placeholder="{{'The recovery phrase could require a password to be imported'|translate}}"
</label> autocapitalize="off"
ng-model="formData.passphrase">
</label>
<div class="card" ng-show="create.seedSourceId=='new' && createPassphrase"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
<div class="item item-text-wrap" translate> <span class="input-label" translate>Derivation Path</span>
WARNING: The password cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the password. <input type="text"
</div> placeholder="{{'BIP32 path for address derivation'|translate}}"
</div> ng-model="formData.derivationPath">
</label>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId=='new'"> <ion-toggle ng-show="seedSource.id == 'new'" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
<span class="input-label" translate>Add a Password</span> <span translate>Testnet</span>
<input type="text" </ion-toggle>
placeholder="{{'Add an optional password to secure the recovery phrase'|translate}}"
autocapitalize="off"
name="createPassphrase"
ng-model="createPassphrase">
</label>
<ion-toggle ng-model="formData.singleAddressEnabled" toggle-class="toggle-positive">
<span translate>Single Address Wallet</span>
<small translate>For audit purposes</small>
</ion-toggle>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId=='set'"> </div> <!-- advanced -->
<span class="input-label" translate>Wallet Recovery Phrase</span> </div> <!-- list -->
<input id="ext-master"
placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}"
autocapitalize="off"
type="text"
name="privateKey"
ng-model="privateKey">
</label>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId=='set'"> <button type="submit" class="button button-block button-positive" ng-disabled="setupForm.$invalid">
<span class="input-label" translate>Password</span> <span translate>Create new wallet</span>
<input type="text" </button>
placeholder="{{'The recovery phrase could require a password to be imported'|translate}}" </form>
autocapitalize="off"
name="passphrase"
ng-model="passphrase">
</label>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId == 'set'">
<span class="input-label" translate>Derivation Path</span>
<input type="text"
placeholder="{{'BIP32 path for address derivation'|translate}}"
name="derivationPath"
ng-model="derivationPath">
</label>
<ion-toggle ng-show="create.seedSourceId == 'new'" ng-model="testnetEnabled" toggle-class="toggle-positive">
Testnet
</ion-toggle>
<ion-toggle ng-model="singleAddressEnabled" toggle-class="toggle-positive">
<span translate>Single Address Wallet</span>
<small translate>For audit purposes</small>
</ion-toggle>
</div> <!-- advanced -->
</div> <!-- list -->
<button type="submit"
class="button button-block button-positive"
ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid">
<span translate>Create {{requiredCopayers}}-of-{{totalCopayers}} wallet</span>
</button>
<button type="submit"
class="button button-block button-positive"
ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid">
<span translate>Create new wallet</span>
</button>
</form>
</ion-content>
</ion-view>

244
public/views/tab-create-shared.html
View file

@ -1,159 +1,119 @@
<ion-view> <form name="setupForm" ng-submit="create(setupForm)" novalidate>
<ion-nav-bar class="bar-royal"> <div class="card list">
<ion-nav-buttons side="primary"> <label class="item item-input item-stacked-label">
<button class="button back-button" ui-sref="tabs.add"> <span class="input-label" translate>Wallet name</span>
<i class="icon ion-ios-arrow-thin-left"></i> <input type="text"
</button> placeholder="{{'Family vacation funds'|translate}}"
</ion-nav-buttons> ng-model="formData.walletName"
<ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title> ng-required="true"
</ion-nav-bar> ng-focus="formFocus('wallet-name')"
ng-blur="formFocus(false)">
</label>
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(3)"> <label class="item item-input item-stacked-label">
<span class="input-label" translate>Your nickname</span>
<input type="text"
placeholder="{{'John'|translate}}"
ng-model="formData.myName"
ng-required="formData.totalCopayers != 1"
ng-disabled="formData.totalCopayers == 1"
ng-focus="formFocus('my-name')"
ng-blur="formFocus(false)">
</label>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate> <label class="item item-input item-select">
<div class="input-label" translate>
Total number of copayers
</div>
<select class="m10t" ng-model="formData.totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues"
ng-change="setTotalCopayers(formData.totalCopayers)">
</select>
</label>
<div class="card list"> <label class="item item-input item-select">
<label ng-hide="create.hideWalletName" class="item item-input item-stacked-label"> <div class="input-label" translate>
<span class="input-label" translate>Wallet name</span> Required number of signatures
<input type="text" </div>
placeholder="{{'Family vacation funds'|translate}}" <select class="m10t"
name="walletName" ng-model="formData.requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues"
ng-model="walletName" ng-disabled="formData.totalCopayers == 1">
ng-required="true" </select>
ng-focus="create.formFocus('wallet-name')" </label>
ng-blur="create.formFocus(false)">
</label>
<label ng-show="totalCopayers != 1" class="item item-input item-stacked-label"> <ion-toggle ng-model="showAdv" toggle-class="toggle-stable" ng-change="showAdvChange()">
<span class="input-label" translate>Your nickname</span> <span translate ng-show="!showAdv">Show advanced options</span>
<input type="text" <span translate ng-show="showAdv">Hide advanced options</span>
placeholder="{{'John'|translate}}" </ion-toggle>
name="myName"
ng-model="myName"
ng-required="totalCopayers != 1"
ng-disabled="totalCopayers == 1"
ng-focus="create.formFocus('my-name')"
ng-blur="create.formFocus(false)">
</label>
<label ng-show="totalCopayers != 1" class="item item-input item-select"> <div ng-show="showAdv">
<div class="input-label" translate> <label class="item item-input item-stacked-label">
Total number of copayers <span class="input-label">Wallet Service URL</span>
</div> <input type="text" ng-model="formData.bwsurl">
<select class="m10t" </label>
ng-model="totalCopayers"
ng-options="totalCopayers as totalCopayers for totalCopayers in create.TCValues"
ng-change="create.setTotalCopayers(totalCopayers)">
</select>
</label>
<label ng-show="totalCopayers != 1" class="item item-input item-select"> <label class="item item-input item-select">
<div class="input-label" translate> <div class="input-label" translate>
Required number of signatures Wallet Key
</div> </div>
<select class="m10t" <select class="m10t" ng-model="seedSource" ng-options="seed as seed.label for seed in seedOptions"></select>
ng-model="requiredCopayers" </label>
ng-options="requiredCopayers as requiredCopayers for requiredCopayers in create.RCValues"
ng-disabled="totalCopayers == 1">
</select>
</label>
<ion-toggle ng-model="showAdv" toggle-class="toggle-stable" ng-change="showAdvChange()"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'trezor' || seedSource.id == 'ledger'">
<span translate ng-show="!showAdv">Show advanced options</span> <span class="input-label" translate>Account Number</span>
<span translate ng-show="showAdv">Hide advanced options</span> <input type="number" ng-model="formData.account" ignore-mouse-wheel>
</ion-toggle> </label>
<div ng-show="showAdv"> <div class="card" ng-show="seedSource.id =='new' && formData.createPassphrase">
<div class="item item-text-wrap" translate>
WARNING: The password cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the password.
</div>
</div>
<label class="item item-input item-stacked-label"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'new'">
<span class="input-label">Wallet Service URL</span> <span class="input-label" translate>Add a Password</span>
<input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl"> <input type="text"
</label> placeholder="{{'Add an optional password to secure the recovery phrase'|translate}}"
autocapitalize="off"
<label class="item item-input item-select"> ng-model="formData.createPassphrase">
<div class="input-label" translate> </label>
Wallet Key
</div>
<select class="m10t"
ng-model="seedSource"
ng-options="seed as seed.label for seed in create.seedOptions"
ng-change="create.setSeedSource()">
</select>
</label>
<label class="item item-input item-stacked-label"
ng-show="create.seedSourceId == 'trezor' || create.seedSourceId == 'ledger'">
<span class="input-label" translate>Account Number</span>
<input type="number" id="account" ng-model="account" ignore-mouse-wheel>
</label>
<div class="card" ng-show="create.seedSourceId=='new' && createPassphrase">
<div class="item item-text-wrap" translate>
WARNING: The password cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the password.
</div>
</div>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId=='new'">
<span class="input-label" translate>Add a Password</span>
<input type="text"
placeholder="{{'Add an optional password to secure the recovery phrase'|translate}}"
autocapitalize="off"
name="createPassphrase"
ng-model="createPassphrase">
</label>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId=='set'"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
<span class="input-label" translate>Wallet Recovery Phrase</span> <span class="input-label" translate>Wallet Recovery Phrase</span>
<input id="ext-master" <input placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}"
placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}" autocapitalize="off"
autocapitalize="off" type="text"
type="text" ng-model="formData.privateKey">
name="privateKey" </label>
ng-model="privateKey">
</label>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId=='set'"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
<span class="input-label" translate>Password</span> <span class="input-label" translate>Password</span>
<input type="text" <input type="text"
placeholder="{{'The recovery phrase could require a password to be imported'|translate}}" placeholder="{{'The recovery phrase could require a password to be imported'|translate}}"
autocapitalize="off" autocapitalize="off"
name="passphrase" ng-model="formData.passphrase">
ng-model="passphrase"> </label>
</label>
<label class="item item-input item-stacked-label" ng-show="create.seedSourceId == 'set'"> <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set'">
<span class="input-label" translate>Derivation Path</span> <span class="input-label" translate>Derivation Path</span>
<input type="text" <input type="text"
placeholder="{{'BIP32 path for address derivation'|translate}}" placeholder="{{'BIP32 path for address derivation'|translate}}"
name="derivationPath" ng-model="formData.derivationPath">
ng-model="derivationPath"> </label>
</label>
<ion-toggle ng-show="create.seedSourceId == 'new'" ng-model="testnetEnabled" toggle-class="toggle-positive"> <ion-toggle ng-show="seedSource.id == 'new'" ng-model="formData.testnetEnabled" toggle-class="toggle-positive">
Testnet Testnet
</ion-toggle> </ion-toggle>
<ion-toggle ng-model="singleAddressEnabled" toggle-class="toggle-positive"> <ion-toggle ng-model="formData.singleAddressEnabled" toggle-class="toggle-positive">
<span translate>Single Address Wallet</span> <span translate>Single Address Wallet</span>
<small translate>For audit purposes</small> <small translate>For audit purposes</small>
</ion-toggle> </ion-toggle>
</div> <!-- advanced --> </div> <!-- advanced -->
</div> <!-- list --> </div> <!-- list -->
<button type="submit" <button type="submit" class="button button-block button-positive" ng-disabled="setupForm.$invalid">
class="button button-block button-positive" <span translate>Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet</span>
ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid"> </button>
<span translate>Create {{requiredCopayers}}-of-{{totalCopayers}} wallet</span> </form>
</button>
<button type="submit"
class="button button-block button-positive"
ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid">
<span translate>Create new wallet</span>
</button>
</form>
</ion-content>
</ion-view>

12
public/views/tab-home.html
View file

@ -7,20 +7,20 @@
<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="proposals" translate> <a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
Payment Proposals Payment Proposals
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i> <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span> <span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
</a> </a>
<a ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)"> <a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
<span ng-include="'views/includes/txp.html'"></span> <span ng-include="'views/includes/txp.html'"></span>
</a> </a>
</div> </div>
<div class="list card"> <div class="list card">
<a class="item item-icon-right item-heading" ui-sref="activity" translate> <a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
Recent Activity Recent Activity
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i> <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a> </a>
@ -28,7 +28,7 @@
<ion-spinner icon="lines"></ion-spinner> <ion-spinner icon="lines"></ion-spinner>
<div translate>Updating activity. Please stand by</div> <div translate>Updating activity. Please stand by</div>
</span> </span>
<a ng-if="!fetchingNotifications" class="item" ng-repeat="x in notifications" ng-click="x.action()"> <a ng-if="notifications[0]" class="item" ng-repeat="x in notifications" ng-click="x.action()">
<span ng-include="'views/includes/walletActivity.html'"></span> <span ng-include="'views/includes/walletActivity.html'"></span>
</a> </a>
</div> </div>
@ -118,5 +118,9 @@
</a> </a>
</div> </div>
<p class="padding" style="text-align:center; color:#999">
{{name}} v{{version}}
</p>
</ion-content> </ion-content>
</ion-view> </ion-view>

28
public/views/tab-settings.html
View file

@ -6,7 +6,6 @@
<ion-content ng-controller="tabSettingsController" ng-init="init()"> <ion-content ng-controller="tabSettingsController" ng-init="init()">
<div class="list"> <div class="list">
<div class="item item-divider"></div> <div class="item item-divider"></div>
<div class="item item-icon-left" ng-click="openAddressbookModal()"> <div class="item item-icon-left" ng-click="openAddressbookModal()">
<i class="icon ion-ios-book-outline"></i> <i class="icon ion-ios-book-outline"></i>
<span translate>Address Book</span> <span translate>Address Book</span>
@ -14,36 +13,40 @@
<div class="item item-divider" translate>Preferences</div> <div class="item item-divider" translate>Preferences</div>
<div class="item item-icon-left" href ui-sref="tabs.language"> <div 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>
<span class="item-note"> <span class="item-note">
{{currentLanguageName|translate}} {{currentLanguageName|translate}}
</span> </span>
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-left" href ui-sref="tabs.unit"> <div class="item item-icon-left item-icon-right" ui-sref="tabs.unit">
<i class="icon ion-ios-calculator-outline"></i> <i class="icon ion-ios-calculator-outline"></i>
<span translate>Unit</span> <span translate>Unit</span>
<span class="item-note"> <span class="item-note">
{{unitName}} {{unitName}}
</span> </span>
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-left" href ui-sref="tabs.altCurrency"> <div class="item item-icon-left item-icon-right" ui-sref="tabs.altCurrency">
<i class="icon ion-social-usd-outline"></i> <i class="icon ion-social-usd-outline"></i>
<span translate>Alternative Currency</span> <span translate>Alternative Currency</span>
<span class="item-note"> <span class="item-note">
{{selectedAlternative.name}} {{selectedAlternative.name}}
</span> </span>
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-icon-left" href ui-sref="tabs.fee"> <div class="item item-icon-left item-icon-right" ui-sref="tabs.fee">
<i class="icon ion-ios-film-outline"></i> <i class="icon ion-social-bitcoin-outline"></i>
<span translate>Bitcoin Network Fee Policy</span> <span translate>Bitcoin Network Fee Policy</span>
<span class="item-note"> <span class="item-note">
{{feeOpts[currentFeeLevel]|translate}} {{feeOpts[currentFeeLevel]|translate}}
</span> </span>
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div ng-show="usePushNotifications && PNEnabledByUser"> <div ng-show="usePushNotifications && PNEnabledByUser">
@ -80,8 +83,8 @@
<span class="toggle-label" translate>Use Unconfirmed Funds</span> <span class="toggle-label" translate>Use Unconfirmed Funds</span>
</ion-toggle> </ion-toggle>
<div class="item item-divider" translate>Wallets Settings</div> <div class="item item-divider" translate>Wallets Preferences</div>
<div class="item item-icon-left" href <div class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences.main({'walletId': item.id})" ui-sref="tabs.preferences.main({'walletId': item.id})"
ng-repeat="item in wallets track by $index"> ng-repeat="item in wallets track by $index">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> <i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
@ -92,14 +95,15 @@
<span class="badge badge-assertive" ng-show="!item.isComplete()" translate> <span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
Incomplete Incomplete
</span> </span>
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-divider"></div> <div class="item item-divider"></div>
<div class="item item-icon-left" href ui-sref="tabs.about"> <div class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
<i class="icon ion-ios-film-outline"></i> <i class="icon ion-ios-information-outline"></i>
<span translate>About Bitpay Wallet</span> <span translate>About</span> {{appName}}
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div class="item item-divider"></div>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

18
public/views/termsOfUse.html
View file

@ -5,14 +5,14 @@
</ion-nav-back-button> </ion-nav-back-button>
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="termOfUseController" cache-view="false"> <ion-content class="padding" ng-controller="termOfUseController">
<p> <div class="card">
<div ng-include="'views/includes/terms.html'"></div> <div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div>
</p> </div>
<div class="row"> <button class="button button-block button-positive"
<p ng-show="lang != 'en'"> ng-show="lang != 'en'"
<a ng-click="$root.openExternalLink('https://copay.io/disclaimer')" translate>Official English Disclaimer</a> ng-click="openExternalLink(disclaimerUrl)" translate>
</p> Official English Disclaimer
</div> </button>
</ion-content> </ion-content>
</ion-view> </ion-view>

46
public/views/translators.html
View file

@ -5,29 +5,29 @@
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button> </ion-nav-back-button>
</ion-nav-bar> </ion-nav-bar>
<ion-content> <ion-content ng-controller="translatorsController">
<h4 translate>Translation Credits</h4> <div class="list">
<ul> <div class="item item-divider" translate>
<li >kinoshitajona<span translate>Japanese</span></li> Translation Credits
<li >Kirvx<span translate>French</span></li>
<li >saschad<span translate>German</span></li>
<li >cmgustavo83<span translate>Spanish</span></li>
<li >RussianNeuroMancer<span translate>Russian</span></li>
<li >HostFat<span translate>Italian</span></li>
<li >xm2hi<span translate>Chinese</span></li>
<li >Pirx1618<span translate>Polish</span></li>
<li >mareksip<span translate>Czech</span></li>
</ul>
<div class="row">
<div class="columns">
<p>
<span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span>
<a ng-click="$root.openExternalLink('https://crowdin.com/project/copay', '_system')">https://crowdin.com/project/copay</a>.
</p>
<spantranslate>
Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.
</span>
</div>
</div> </div>
<div class="item">kinoshitajona<span class="item-note" translate>Japanese</span></div>
<div class="item">Kirvx<span class="item-note" translate>French</span></div>
<div class="item">saschad<span class="item-note" translate>German</span></div>
<div class="item">cmgustavo83<span class="item-note" translate>Spanish</span></div>
<div class="item">RussianNeuroMancer<span class="item-note" translate>Russian</span></div>
<div class="item">HostFat<span class="item-note" translate>Italian</span></div>
<div class="item">xm2hi<span class="item-note" translate>Chinese</span></div>
<div class="item">Pirx1618<span class="item-note" translate>Polish</span></div>
<div class="item">mareksip<span class="item-note" translate>Czech</span></div>
</div>
<div class="padding">
<p>
<span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span>
<a ng-click="openExternalLink('https://crowdin.com/project/copay', '_system')">https://crowdin.com/project/copay</a>.
</p>
<span translate>
Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.
</span>
</div>
</ion-content> </ion-content>
</ion-view> </ion-view>

2
public/views/walletDetails.html
View file

@ -94,7 +94,7 @@
</div> </div>
</div> </div>
<div class="release size-12" ng-show="newRelease" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/latest')"> <div class="release size-12" ng-show="newRelease" ng-click="openExternalLink('https://github.com/bitpay/copay/releases/latest')">
<span>{{newRelease}}</span><i class="icon-arrow-right3 right size-18"></i> <span>{{newRelease}}</span><i class="icon-arrow-right3 right size-18"></i>
</div> </div>

9
src/js/controllers/amazon.js
View file

@ -1,15 +1,10 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('amazonController', angular.module('copayApp.controllers').controller('amazonController',
function($scope, $timeout, $ionicModal, $log, lodash, bwcError, amazonService, platformInfo, nodeWebkit, popupService) { function($scope, $timeout, $ionicModal, $log, lodash, bwcError, amazonService, platformInfo, externalLinkService, popupService) {
$scope.openExternalLink = function(url, target) { $scope.openExternalLink = function(url, target) {
if (platformInfo.isNW) { externalLinkService.open(url, target);
nodeWebkit.openExternalLink(url);
} else {
target = target || '_blank';
var ref = window.open(url, target, 'location=no');
}
}; };
this.init = function() { this.init = function() {

9
src/js/controllers/buyAmazon.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('buyAmazonController', angular.module('copayApp.controllers').controller('buyAmazonController',
function($scope, $log, $timeout, $state, lodash, profileService, bwcError, gettextCatalog, configService, walletService, amazonService, ongoingProcess, platformInfo, nodeWebkit, popupService) { function($scope, $log, $timeout, $state, lodash, profileService, bwcError, gettextCatalog, configService, walletService, amazonService, ongoingProcess, platformInfo, externalLinkService, popupService) {
var self = this; var self = this;
var wallet; var wallet;
@ -16,12 +16,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
}); });
$scope.openExternalLink = function(url, target) { $scope.openExternalLink = function(url, target) {
if (platformInfo.isNW) { externalLinkService.open(url, target);
nodeWebkit.openExternalLink(url);
} else {
target = target || '_blank';
var ref = window.open(url, target, 'location=no');
}
}; };
this.init = function() { this.init = function() {

47
src/js/controllers/confirm.js
View file

@ -5,6 +5,17 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var cachedTxp = {}; var cachedTxp = {};
var isChromeApp = platformInfo.isChromeApp; var isChromeApp = platformInfo.isChromeApp;
$scope.$on('Wallet/Changed', function(event, wallet) {
if (lodash.isEmpty(wallet)) {
$log.debug('No wallet provided');
return;
}
$log.debug('Wallet changed: ' + wallet.name);
setWallet(wallet, true);
});
$scope.showDescriptionPopup = function() { $scope.showDescriptionPopup = function() {
var commentPopup = $ionicPopup.show({ var commentPopup = $ionicPopup.show({
templateUrl: "views/includes/note.html", templateUrl: "views/includes/note.html",
@ -17,13 +28,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.commentPopupSave = function(description) { $scope.commentPopupSave = function(description) {
$log.debug('Saving description: ' + description); $log.debug('Saving description: ' + description);
$scope.description = description; $scope.description = description;
$scope.txp = null;
createTx($scope.wallet, function(err, txp) {
if (err) return;
cachedTxp[$scope.wallet.id] = txp;
apply(txp);
});
commentPopup.close(); commentPopup.close();
}; };
}; };
@ -137,15 +141,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}); });
}; };
$scope.$on('Wallet/Changed', function(event, wallet) {
if (lodash.isEmpty(wallet)) {
$log.debug('No wallet provided');
return;
}
$log.debug('Wallet changed: ' + wallet.name);
setWallet(wallet, true);
});
function setWallet(wallet, delayed) { function setWallet(wallet, delayed) {
var stop; var stop;
$scope.wallet = wallet; $scope.wallet = wallet;
@ -165,7 +160,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
apply(cachedTxp[wallet.id]); apply(cachedTxp[wallet.id]);
} else { } else {
stop = $timeout(function() { stop = $timeout(function() {
createTx(wallet, function(err, txp) { createTx(wallet, true, function(err, txp) {
if (err) return; if (err) return;
cachedTxp[wallet.id] = txp; cachedTxp[wallet.id] = txp;
apply(txp); apply(txp);
@ -184,7 +179,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.$apply(); $scope.$apply();
}; };
var createTx = function(wallet, cb) { var createTx = function(wallet, dryRun, cb) {
var config = configService.getSync().wallet; var config = configService.getSync().wallet;
var currentSpendUnconfirmed = config.spendUnconfirmed; var currentSpendUnconfirmed = config.spendUnconfirmed;
var outputs = []; var outputs = [];
@ -227,6 +222,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txp.payProUrl = paypro; txp.payProUrl = paypro;
txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true; txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
txp.feeLevel = config.settings.feeLevel || 'normal'; txp.feeLevel = config.settings.feeLevel || 'normal';
txp.dryRun = dryRun;
walletService.createTx(wallet, txp, function(err, ctxp) { walletService.createTx(wallet, txp, function(err, ctxp) {
if (err) { if (err) {
@ -247,14 +243,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.approve = function() { $scope.approve = function() {
var wallet = $scope.wallet; var wallet = $scope.wallet;
var txp = $scope.txp;
if (!wallet) { if (!wallet) {
return setSendError(gettextCatalog.getString('No wallet selected')); return setSendError(gettextCatalog.getString('No wallet selected'));
}; };
if (!txp) {
return setSendError(gettextCatalog.getString('No transaction'));
};
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
$log.info('No signing proposal: No private key'); $log.info('No signing proposal: No private key');
@ -265,9 +257,14 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}); });
} }
walletService.publishAndSign(wallet, txp, function(err, txp) { ongoingProcess.set('creatingTx', true);
if (err) return setSendError(err); createTx(wallet, false, function(err, txp) {
$state.transitionTo('tabs.home'); ongoingProcess.set('creatingTx', false);
if (err) return;
walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
$state.transitionTo('tabs.home');
});
}); });
}; };

134
src/js/controllers/create.js
View file

@ -7,11 +7,6 @@ angular.module('copayApp.controllers').controller('createController',
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
var isDevel = platformInfo.isDevel; var isDevel = platformInfo.isDevel;
var self = this;
var defaults = configService.getDefaults();
this.isWindowsPhoneApp = platformInfo.isWP && isCordova;
$scope.account = 1;
/* For compressed keys, m*73 + n*34 <= 496 */ /* For compressed keys, m*73 + n*34 <= 496 */
var COPAYER_PAIR_LIMITS = { var COPAYER_PAIR_LIMITS = {
1: 1, 1: 1,
@ -28,96 +23,91 @@ angular.module('copayApp.controllers').controller('createController',
12: 1, 12: 1,
}; };
var defaults = configService.getDefaults(); $scope.init = function() {
$scope.bwsurl = defaults.bws.url; $scope.formData = {};
$scope.derivationPath = derivationPathHelper.default; var defaults = configService.getDefaults();
$scope.formData.account = 1;
// ng-repeat defined number of times instead of repeating over array? $scope.formData.bwsurl = defaults.bws.url;
this.getNumber = function(num) { $scope.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
return new Array(num); $scope.formData.totalCopayers = defaults.wallet.totalCopayers;
} $scope.formData.derivationPath = derivationPathHelper.default;
$scope.setTotalCopayers(1);
updateRCSelect(1);
updateSeedSourceSelect(1);
};
$scope.showAdvChange = function() { $scope.showAdvChange = function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}; };
var updateRCSelect = function(n) { function updateRCSelect(n) {
$scope.totalCopayers = n; $scope.formData.totalCopayers = n;
var maxReq = COPAYER_PAIR_LIMITS[n]; var maxReq = COPAYER_PAIR_LIMITS[n];
self.RCValues = lodash.range(1, maxReq + 1); $scope.RCValues = lodash.range(1, maxReq + 1);
$scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq); $scope.formData.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
}; };
var updateSeedSourceSelect = function(n) { function updateSeedSourceSelect(n) {
var seedOptions = [{
self.seedOptions = [{
id: 'new', id: 'new',
label: gettext('Random'), label: gettext('Random'),
}, { }, {
id: 'set', id: 'set',
label: gettext('Specify Recovery Phrase...'), label: gettext('Specify Recovery Phrase...'),
}]; }];
$scope.seedSource = self.seedOptions[0];
$scope.seedSource = seedOptions[0];
if (n > 1 && isChromeApp) if (n > 1 && isChromeApp)
self.seedOptions.push({ seedOptions.push({
id: 'ledger', id: 'ledger',
label: 'Ledger Hardware Wallet', label: 'Ledger Hardware Wallet',
}); });
if (isChromeApp || isDevel) { if (isChromeApp || isDevel) {
self.seedOptions.push({ seedOptions.push({
id: 'trezor', id: 'trezor',
label: 'Trezor Hardware Wallet', label: 'Trezor Hardware Wallet',
}); });
} }
$scope.seedOptions = seedOptions;
}; };
this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1); $scope.setTotalCopayers = function(tc) {
$scope.totalCopayers = defaults.wallet.totalCopayers; $scope.formData.totalCopayers = tc;
this.setTotalCopayers = function(tc) {
updateRCSelect(tc); updateRCSelect(tc);
updateSeedSourceSelect(tc); updateSeedSourceSelect(tc);
self.seedSourceId = $scope.seedSource.id;
}; };
this.setSeedSource = function(src) { $scope.create = function(form) {
self.seedSourceId = $scope.seedSource.id;
$timeout(function() {
$rootScope.$apply();
});
};
this.create = function(form) {
if (form && form.$invalid) { if (form && form.$invalid) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the required fields')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the required fields'));
return; return;
} }
var opts = { var opts = {
m: $scope.requiredCopayers, name: $scope.formData.walletName,
n: $scope.totalCopayers, m: $scope.formData.requiredCopayers,
name: $scope.walletName, n: $scope.formData.totalCopayers,
myName: $scope.totalCopayers > 1 ? $scope.myName : null, myName: $scope.formData.totalCopayers > 1 ? $scope.formData.myName : null,
networkName: $scope.testnetEnabled ? 'testnet' : 'livenet', networkName: $scope.formData.testnetEnabled ? 'testnet' : 'livenet',
bwsurl: $scope.bwsurl, bwsurl: $scope.formData.bwsurl,
singleAddress: $scope.singleAddressEnabled, singleAddress: $scope.formData.singleAddressEnabled,
walletPrivKey: $scope._walletPrivKey, // Only for testing walletPrivKey: $scope.formData._walletPrivKey, // Only for testing
}; };
var setSeed = self.seedSourceId == 'set';
var setSeed = $scope.seedSource.id == 'set';
if (setSeed) { if (setSeed) {
var words = $scope.privateKey || ''; var words = $scope.formData.privateKey || '';
if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) { if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
opts.extendedPrivateKey = words; opts.extendedPrivateKey = words;
} else { } else {
opts.mnemonic = words; opts.mnemonic = words;
} }
opts.passphrase = $scope.passphrase; opts.passphrase = $scope.formData.passphrase;
var pathData = derivationPathHelper.parse($scope.derivationPath); var pathData = derivationPathHelper.parse($scope.formData.derivationPath);
if (!pathData) { if (!pathData) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid derivation path')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid derivation path'));
return; return;
@ -128,7 +118,7 @@ angular.module('copayApp.controllers').controller('createController',
opts.derivationStrategy = pathData.derivationStrategy; opts.derivationStrategy = pathData.derivationStrategy;
} else { } else {
opts.passphrase = $scope.createPassphrase; opts.passphrase = $scope.formData.createPassphrase;
} }
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) { if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
@ -136,36 +126,36 @@ angular.module('copayApp.controllers').controller('createController',
return; return;
} }
if (self.seedSourceId == 'ledger' || self.seedSourceId == 'trezor') { if ($scope.seedSource.id == 'ledger' || $scope.seedSource.id == 'trezor') {
var account = $scope.account; var account = $scope.formData.account;
if (!account || account < 1) { if (!account || account < 1) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
return; return;
} }
if (self.seedSourceId == 'trezor') if ($scope.seedSource.id == 'trezor')
account = account - 1; account = account - 1;
opts.account = account; opts.account = account;
ongoingProcess.set('connecting' + self.seedSourceId, true); ongoingProcess.set('connecting' + $scope.seedSource.id, true);
var src = self.seedSourceId == 'ledger' ? ledger : trezor; var src = $scope.seedSource.id == 'ledger' ? ledger : trezor;
src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) { src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) {
ongoingProcess.set('connecting' + self.seedSourceId, false); ongoingProcess.set('connecting' + $scope.seedSource.id, false);
if (err) { if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err); popupService.showAlert(gettextCatalog.getString('Error'), err);
return; return;
} }
opts = lodash.assign(lopts, opts); opts = lodash.assign(lopts, opts);
self._create(opts); _create(opts);
}); });
} else { } else {
self._create(opts); _create(opts);
} }
}; };
this._create = function(opts) { function _create(opts) {
ongoingProcess.set('creatingWallet', true); ongoingProcess.set('creatingWallet', true);
$timeout(function() { $timeout(function() {
@ -182,35 +172,11 @@ angular.module('copayApp.controllers').controller('createController',
}); });
if (self.seedSourceId == 'set') { if ($scope.seedSource.id == 'set') {
profileService.setBackupFlag(client.credentials.walletId); profileService.setBackupFlag(client.credentials.walletId);
} }
$state.go('tabs.home') $state.go('tabs.home')
}); });
}, 100); }, 100);
} }
this.formFocus = function(what) {
if (!this.isWindowsPhoneApp) return
if (what && what == 'my-name') {
this.hideWalletName = true;
this.hideTabs = true;
} else if (what && what == 'wallet-name') {
this.hideTabs = true;
} else {
this.hideWalletName = false;
this.hideTabs = false;
}
$timeout(function() {
$rootScope.$digest();
}, 1);
};
$scope.$on("$destroy", function() {
$rootScope.hideWalletNavigation = false;
});
updateSeedSourceSelect(1);
self.setSeedSource();
}); });

3
src/js/controllers/export.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('exportController', angular.module('copayApp.controllers').controller('exportController',
function($rootScope, $scope, $timeout, $log, lodash, backupService, walletService, storageService, profileService, platformInfo, gettext, gettextCatalog, $state, $stateParams, popupService) { function($rootScope, $scope, $timeout, $log, $ionicHistory, lodash, backupService, walletService, storageService, profileService, platformInfo, gettext, gettextCatalog, $state, $stateParams, popupService) {
var prevState; var prevState;
var isWP = platformInfo.isWP; var isWP = platformInfo.isWP;
var isAndroid = platformInfo.isAndroid; var isAndroid = platformInfo.isAndroid;
@ -63,6 +63,7 @@ angular.module('copayApp.controllers').controller('exportController',
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
return; return;
} }
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
}); });
}); });

9
src/js/controllers/glidera.js
View file

@ -1,15 +1,10 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('glideraController', angular.module('copayApp.controllers').controller('glideraController',
function($scope, $timeout, $ionicModal, $log, storageService, glideraService, ongoingProcess, platformInfo, nodeWebkit, popupService, gettextCatalog) { function($scope, $timeout, $ionicModal, $log, storageService, glideraService, ongoingProcess, platformInfo, externalLinkService, popupService, gettextCatalog) {
$scope.openExternalLink = function(url, target) { $scope.openExternalLink = function(url, target) {
if (platformInfo.isNW) { externalLinkService.open(url, target);
nodeWebkit.openExternalLink(url);
} else {
target = target || '_blank';
var ref = window.open(url, target, 'location=no');
}
}; };
$scope.init = function(accessToken) { $scope.init = function(accessToken) {

9
src/js/controllers/modals/txDetails.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $log, $scope, $filter, $stateParams, $ionicPopup, gettextCatalog, profileService, configService, lodash, txFormatService, platformInfo) { angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $log, $scope, $filter, $stateParams, $ionicPopup, gettextCatalog, profileService, configService, lodash, txFormatService, platformInfo, externalLinkService) {
var self = $scope.self; var self = $scope.self;
var wallet = profileService.getWallet($stateParams.walletId); var wallet = profileService.getWallet($stateParams.walletId);
@ -81,12 +81,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
}; };
$scope.openExternalLink = function(url, target) { $scope.openExternalLink = function(url, target) {
if (platformInfo.isNW) { externalLinkService.open(url, target);
nodeWebkit.openExternalLink(url);
} else {
target = target || '_blank';
var ref = window.open(url, target, 'location=no');
}
}; };
$scope.getShortNetworkName = function() { $scope.getShortNetworkName = function() {

11
src/js/controllers/modals/txpDetails.js
View file

@ -32,12 +32,9 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.sign = function() { $scope.sign = function() {
$scope.loading = true; $scope.loading = true;
walletService.publishAndSign($scope.wallet, $scope.tx, function(err, txp) { walletService.publishAndSign($scope.wallet, $scope.tx, function(err, txp) {
console.log('[txpDetails.js.35] AFTER publush'); //TODO
$scope.$emit('UpdateTx'); $scope.$emit('UpdateTx');
if (err) return setSendError(err); if (err) return setSendError(err);
$scope.close(txp); $scope.close();
}); });
}; };
@ -53,7 +50,7 @@ console.log('[txpDetails.js.35] AFTER publush'); //TODO
if (err) if (err)
return setError(err, gettextCatalog.getString('Could not reject payment')); return setError(err, gettextCatalog.getString('Could not reject payment'));
$scope.close(txpr); $scope.close();
}); });
@ -90,7 +87,7 @@ console.log('[txpDetails.js.35] AFTER publush'); //TODO
return setError(err, gettextCatalog.getString('Could not broadcast payment')); return setError(err, gettextCatalog.getString('Could not broadcast payment'));
} }
$scope.close(txpb); $scope.close();
}); });
}, 10); }, 10);
}; };
@ -175,7 +172,7 @@ console.log('[txpDetails.js.35] AFTER publush'); //TODO
}); });
}; };
$scope.close = function(txp) { $scope.close = function() {
$scope.loading = null; $scope.loading = null;
$scope.txpDetailsModal.hide(); $scope.txpDetailsModal.hide();
}; };

3
src/js/controllers/onboarding/backupRequest.js
View file

@ -1,7 +1,8 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $ionicPopup) { angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicPopup) {
$scope.walletId = $stateParams.walletId;
$scope.openPopup = function() { $scope.openPopup = function() {
var backupLaterPopup = $ionicPopup.show({ var backupLaterPopup = $ionicPopup.show({
templateUrl: "views/includes/backupLaterPopup.html", templateUrl: "views/includes/backupLaterPopup.html",

5
src/js/controllers/onboarding/backupWarning.js
View file

@ -1,7 +1,8 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $ionicPopup, $stateParams, profileService) { angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $stateParams, $ionicPopup, profileService) {
$scope.walletId = $stateParams.walletId;
$scope.openPopup = function() { $scope.openPopup = function() {
var backupWarningPopup = $ionicPopup.show({ var backupWarningPopup = $ionicPopup.show({
templateUrl: "views/includes/backupWarningPopup.html", templateUrl: "views/includes/backupWarningPopup.html",
@ -10,7 +11,7 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
$scope.close = function() { $scope.close = function() {
backupWarningPopup.close(); backupWarningPopup.close();
$state.go('onboarding.backup'); $state.go('onboarding.backup', {walletId: $stateParams.walletId, fromOnboarding: true});
}; };
} }
}); });

8
src/js/controllers/onboarding/collectEmail.js
View file

@ -25,9 +25,13 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
if (err) $log.warn(err); if (err) $log.warn(err);
configService.set(opts, function(err) { configService.set(opts, function(err) {
if (err) $log.warn(err); if (err) $log.warn(err);
if (!usePushNotifications) $state.go('onboarding.backupRequest'); if (!usePushNotifications) $state.go('onboarding.backupRequest', {walletId: walletId});
else $state.go('onboarding.notifications'); else $state.go('onboarding.notifications', {walletId: walletId});
}); });
}); });
}; };
$scope.onboardingMailSkip = function() {
$state.go('onboarding.backupRequest', {walletId: walletId});
};
}); });

3
src/js/controllers/onboarding/notifications.js
View file

@ -1,7 +1,8 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, profileService) { angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, $stateParams, profileService) {
$scope.walletId = $stateParams.walletId;
$scope.allowNotif = function() { $scope.allowNotif = function() {
profileService.pushNotificationsInit(); profileService.pushNotificationsInit();
$state.go('onboarding.backupRequest'); $state.go('onboarding.backupRequest');

6
src/js/controllers/onboarding/terms.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('termsController', function($scope, $log, $state, uxLanguage, profileService) { angular.module('copayApp.controllers').controller('termsController', function($scope, $log, $state, uxLanguage, profileService, externalLinkService) {
$scope.lang = uxLanguage.currentLanguage; $scope.lang = uxLanguage.currentLanguage;
$scope.confirm = function() { $scope.confirm = function() {
@ -12,4 +12,8 @@ angular.module('copayApp.controllers').controller('termsController', function($s
}); });
}; };
$scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target);
};
}); });

3
src/js/controllers/paperWallet.js
View file

@ -1,5 +1,5 @@
angular.module('copayApp.controllers').controller('paperWalletController', angular.module('copayApp.controllers').controller('paperWalletController',
function($scope, $timeout, $log, $ionicModal, configService, profileService, $state, addressService, bitcore, ongoingProcess, txFormatService, $stateParams, walletService) { function($scope, $timeout, $log, $ionicModal, $ionicHistory, configService, profileService, $state, addressService, bitcore, ongoingProcess, txFormatService, $stateParams, walletService) {
var wallet = profileService.getWallet($stateParams.walletId); var wallet = profileService.getWallet($stateParams.walletId);
var rawTx; var rawTx;
@ -102,6 +102,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
} else { } else {
var type = walletService.getViewStatus(wallet, txp); var type = walletService.getViewStatus(wallet, txp);
$scope.openStatusModal(type, txp, function() { $scope.openStatusModal(type, txp, function() {
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
}); });
} }

3
src/js/controllers/paymentUri.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('paymentUriController', angular.module('copayApp.controllers').controller('paymentUriController',
function($rootScope, $scope, $stateParams, $location, $timeout, profileService, configService, lodash, bitcore, $state) { function($rootScope, $scope, $stateParams, $location, $timeout, $ionicHistory, profileService, configService, lodash, bitcore, $state) {
function strip(number) { function strip(number) {
return (parseFloat(number.toPrecision(12))); return (parseFloat(number.toPrecision(12)));
}; };
@ -47,6 +47,7 @@ angular.module('copayApp.controllers').controller('paymentUriController',
this.selectWallet = function(wid) { this.selectWallet = function(wid) {
var self = this; var self = this;
profileService.setAndStoreFocus(wid, function() {}); profileService.setAndStoreFocus(wid, function() {});
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
$timeout(function() { $timeout(function() {
$rootScope.$emit('paymentUri', self.bitcoinURI); $rootScope.$emit('paymentUri', self.bitcoinURI);

5
src/js/controllers/preferences.js
View file

@ -2,7 +2,7 @@
angular.module('copayApp.controllers').controller('preferencesController', angular.module('copayApp.controllers').controller('preferencesController',
function($scope, $rootScope, $timeout, $log, $stateParams, $ionicHistory, $ionicNavBarDelegate, gettextCatalog, configService, profileService, fingerprintService, walletService) { function($scope, $rootScope, $timeout, $log, $stateParams, $ionicHistory, $ionicNavBarDelegate, gettextCatalog, configService, profileService, fingerprintService, walletService) {
$ionicNavBarDelegate.title(gettextCatalog.getString('Preferences')); $ionicNavBarDelegate.title(gettextCatalog.getString('Wallet Preferences'));
var wallet = profileService.getWallet($stateParams.walletId); var wallet = profileService.getWallet($stateParams.walletId);
var walletId = wallet.credentials.walletId; var walletId = wallet.credentials.walletId;
$scope.wallet = wallet; $scope.wallet = wallet;
@ -14,9 +14,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
return $ionicHistory.goBack(); return $ionicHistory.goBack();
var config = configService.getSync(); var config = configService.getSync();
config.aliasFor = config.aliasFor || {};
$scope.alias = config.aliasFor[walletId] || wallet.credentials.walletName;
$scope.color = config.colorFor[walletId] || '#4A90E2';
$scope.encryptEnabled = walletService.isEncrypted(wallet); $scope.encryptEnabled = walletService.isEncrypted(wallet);
if (wallet.isPrivKeyExternal) if (wallet.isPrivKeyExternal)

12
src/js/controllers/preferencesAbout.js
View file

@ -1,6 +1,14 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesAbout', angular.module('copayApp.controllers').controller('preferencesAbout',
function($ionicNavBarDelegate, gettextCatalog) { function($scope, $window, $ionicNavBarDelegate, gettextCatalog, externalLinkService) {
$ionicNavBarDelegate.title(gettextCatalog.getString('About Copay')); $ionicNavBarDelegate.title(gettextCatalog.getString('About') + ' ' + $window.appConfig.nameCase);
$scope.version = $window.version;
$scope.commitHash = $window.commitHash;
$scope.name = $window.appConfig.gitHubRepoName;
$scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target);
};
}); });

3
src/js/controllers/preferencesAlias.js
View file

@ -8,9 +8,8 @@ angular.module('copayApp.controllers').controller('preferencesAliasController',
var walletId = wallet.credentials.walletId; var walletId = wallet.credentials.walletId;
var config = configService.getSync(); var config = configService.getSync();
config.aliasFor = config.aliasFor || {};
$scope.walletName = wallet.credentials.walletName; $scope.walletName = wallet.credentials.walletName;
$scope.alias = config.aliasFor[walletId] || wallet.walletName; $scope.alias = (config.aliasFor && config.aliasFor[walletId]) || wallet.walletName;
$scope.save = function() { $scope.save = function() {
var opts = { var opts = {

28
src/js/controllers/preferencesDelete.js
View file

@ -1,32 +1,17 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesDeleteWalletController', angular.module('copayApp.controllers').controller('preferencesDeleteWalletController',
function($scope, $ionicPopup, $stateParams, $ionicNavBarDelegate, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) { function($scope, $stateParams, $ionicNavBarDelegate, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) {
$ionicNavBarDelegate.title(gettextCatalog.getString('Delete Wallet')); $ionicNavBarDelegate.title(gettextCatalog.getString('Delete'));
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 popup = $ionicPopup.show({ var title = gettextCatalog.getString('Warning!');
template: '<span>' + gettextCatalog.getString('Are you sure you want to delete this wallet?') + '</span>', var message = gettextCatalog.getString('Are you sure you want to delete this wallet?');
title: gettextCatalog.getString('Confirm'), popupService.showConfirm(title, message, function(res) {
buttons: [ if (res) deleteWallet();
{
text: gettextCatalog.getString('Cancel'),
onTap: function(e) {
popup.close();
}
},
{
text: gettextCatalog.getString('Accept'),
type: 'button-positive',
onTap: function(e) {
deleteWallet();
popup.close();
}
}
]
}); });
}; };
@ -37,6 +22,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
if (err) { if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err.message || err); popupService.showAlert(gettextCatalog.getString('Error'), err.message || err);
} else { } else {
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
} }
}); });

10
src/js/controllers/preferencesFee.js
View file

@ -1,12 +1,12 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, $timeout, $ionicHistory, $ionicNavBarDelegate, gettextCatalog, configService, feeService) { angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, $timeout, $ionicHistory, $ionicNavBarDelegate, gettextCatalog, configService, feeService, ongoingProcess) {
$ionicNavBarDelegate.title(gettextCatalog.getString('Preferences fee')); $ionicNavBarDelegate.title(gettextCatalog.getString('Bitcoin Network Fee Policy'));
$scope.init = function() { $scope.init = function() {
$scope.loading = true; ongoingProcess.set('gettingFeeLevels', true);
feeService.getFeeLevels(function(levels) { feeService.getFeeLevels(function(levels) {
$scope.loading = false; ongoingProcess.set('gettingFeeLevels', false);
$scope.feeOpts = feeService.feeOpts; $scope.feeOpts = feeService.feeOpts;
$scope.currentFeeLevel = feeService.getCurrentFeeLevel(); $scope.currentFeeLevel = feeService.getCurrentFeeLevel();
$scope.feeLevels = levels; $scope.feeLevels = levels;
@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu
$ionicHistory.goBack(); $ionicHistory.goBack();
$timeout(function() { $timeout(function() {
$scope.$apply(); $scope.$apply();
}, 10); }, 100);
}); });
}; };
}); });

14
src/js/controllers/preferencesHistory.js
View file

@ -1,17 +1,16 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesHistory', angular.module('copayApp.controllers').controller('preferencesHistory',
function($scope, $log, $stateParams, $timeout, $ionicNavBarDelegate, gettextCatalog, storageService, $state, profileService, lodash) { function($scope, $log, $stateParams, $timeout, $ionicNavBarDelegate, gettextCatalog, storageService, $state, $ionicHistory, profileService, lodash) {
$ionicNavBarDelegate.title(gettextCatalog.getString('Transaction History')); $ionicNavBarDelegate.title(gettextCatalog.getString('Transaction History'));
var wallet = profileService.getWallet($stateParams.walletId); $scope.wallet = profileService.getWallet($stateParams.walletId);
var c = wallet.credentials;
$scope.csvReady = false; $scope.csvReady = false;
$scope.csvHistory = function(cb) { $scope.csvHistory = function(cb) {
var allTxs = []; var allTxs = [];
function getHistory(cb) { function getHistory(cb) {
storageService.getTxHistory(c.walletId, function(err, txs) { storageService.getTxHistory($scope.wallet.id, function(err, txs) {
if (err) return cb(err); if (err) return cb(err);
var txsFromLocal = []; var txsFromLocal = [];
@ -22,7 +21,7 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
} }
allTxs.push(txsFromLocal); allTxs.push(txsFromLocal);
return cb(null, lodash.flatten(allTxs)); return cb(null, lodash.compact(lodash.flatten(allTxs)));
}); });
}; };
@ -40,7 +39,7 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
var data = txs; var data = txs;
var satToBtc = 1 / 100000000; var satToBtc = 1 / 100000000;
$scope.csvContent = []; $scope.csvContent = [];
$scope.csvFilename = 'Copay-' + ($scope.alias || $scope.walletName) + '.csv'; $scope.csvFilename = 'Copay-' + $scope.wallet.name + '.csv';
$scope.csvHeader = ['Date', 'Destination', 'Description', 'Amount', 'Currency', 'Txid', 'Creator', 'Copayers', 'Comment']; $scope.csvHeader = ['Date', 'Destination', 'Description', 'Amount', 'Currency', 'Txid', 'Creator', 'Copayers', 'Comment'];
var _amount, _note, _copayers, _creator, _comment; var _amount, _note, _copayers, _creator, _comment;
@ -118,7 +117,7 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
}; };
$scope.clearTransactionHistory = function() { $scope.clearTransactionHistory = function() {
storageService.removeTxHistory(c.walletId, function(err) { storageService.removeTxHistory($scope.wallet.id, function(err) {
if (err) { if (err) {
$log.error(err); $log.error(err);
return; return;
@ -126,6 +125,7 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
$scope.$emit('Local/ClearHistory'); $scope.$emit('Local/ClearHistory');
$timeout(function() { $timeout(function() {
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
}, 100); }, 100);
}); });

4
src/js/controllers/preferencesInformation.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesInformation', angular.module('copayApp.controllers').controller('preferencesInformation',
function($scope, $log, $timeout, $ionicNavBarDelegate, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) { function($scope, $log, $timeout, $ionicNavBarDelegate, $ionicHistory, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) {
$ionicNavBarDelegate.title(gettextCatalog.getString('Wallet Information')); $ionicNavBarDelegate.title(gettextCatalog.getString('Wallet Information'));
var base = 'xpub'; var base = 'xpub';
var wallet = profileService.getWallet($stateParams.walletId); var wallet = profileService.getWallet($stateParams.walletId);
@ -105,6 +105,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
opts.colorFor[walletId] = color; opts.colorFor[walletId] = color;
configService.set(opts, function(err) { configService.set(opts, function(err) {
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
if (err) $log.warn(err); if (err) $log.warn(err);
}); });
@ -116,6 +117,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
$scope.scan = function() { $scope.scan = function() {
walletService.startScan(wallet); walletService.startScan(wallet);
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
}; };

8
src/js/controllers/preferencesLanguage.js
View file

@ -1,9 +1,13 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesLanguageController', angular.module('copayApp.controllers').controller('preferencesLanguageController',
function($scope, $log, $ionicNavBarDelegate, $ionicHistory, gettextCatalog, configService, profileService, uxLanguage, walletService) { function($scope, $log, $ionicNavBarDelegate, $ionicHistory, gettextCatalog, configService, profileService, uxLanguage, walletService, externalLinkService) {
$ionicNavBarDelegate.title(gettextCatalog.getString('Language')); $ionicNavBarDelegate.title(gettextCatalog.getString('Language'));
$scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target);
};
$scope.init = function() { $scope.init = function() {
$scope.availableLanguages = uxLanguage.getLanguages(); $scope.availableLanguages = uxLanguage.getLanguages();
$scope.currentLanguage = uxLanguage.getCurrentLanguage(); $scope.currentLanguage = uxLanguage.getCurrentLanguage();
@ -22,7 +26,7 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController
if (err) $log.warn(err); if (err) $log.warn(err);
$ionicHistory.goBack(); $ionicHistory.goBack();
uxLanguage.update(function() { uxLanguage.init(function() {
walletService.updateRemotePreferences(profileService.getWallets(), {}, function() { walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
$log.debug('Remote preferences saved'); $log.debug('Remote preferences saved');
}); });

14
src/js/controllers/preferencesLogs.js
View file

@ -8,13 +8,19 @@ angular.module('copayApp.controllers').controller('preferencesLogs',
$scope.logs = historicLog.get(); $scope.logs = historicLog.get();
} }
$scope.sendLogs = function() { $scope.prepare = function() {
var body = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n'; var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
body += '\n\n'; log += '\n\n';
body += $scope.logs.map(function(v) { log += $scope.logs.map(function(v) {
return v.msg; return v.msg;
}).join('\n'); }).join('\n');
return log;
};
$scope.sendLogs = function() {
var body = $scope.prepare();
window.plugins.socialsharing.shareViaEmail( window.plugins.socialsharing.shareViaEmail(
body, body,
'Copay Logs', 'Copay Logs',

60
src/js/controllers/tab-home.js
View file

@ -1,23 +1,30 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('tabHomeController', angular.module('copayApp.controllers').controller('tabHomeController',
function($rootScope, $timeout, $scope, $state, $ionicScrollDelegate, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo, storageService, txpModalService) { function($rootScope, $timeout, $scope, $state, $ionicScrollDelegate, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo, storageService, txpModalService, $window) {
$scope.externalServices = {}; $scope.externalServices = {};
$scope.bitpayCardEnabled = true; // TODO $scope.bitpayCardEnabled = true; // TODO
function updateTxps() {
profileService.getTxps({
limit: 3
}, function(err, txps, n) {
if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
}
$scope.txps = txps;
$scope.txpsN = n;
$ionicScrollDelegate.resize();
var setPendingTxps = function(txps) { $timeout(function() {
if (!txps) { $scope.$apply();
$scope.txps = []; }, 1);
return; })
}
$scope.txps = lodash.sortBy(txps, 'createdOn').reverse();
}; };
$scope.updateAllWallets = function() { $scope.updateAllWallets = function() {
$scope.wallets = profileService.getWallets(); $scope.wallets = profileService.getWallets();
if (lodash.isEmpty($scope.wallets)) return; if (lodash.isEmpty($scope.wallets)) return;
@ -35,20 +42,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
wallet.status = status; wallet.status = status;
} }
if (++j==i) { if (++j==i) {
profileService.getTxps({ updateTxps();
limit: 3
}, function(err, txps, n) {
if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
}
$scope.txps = txps;
$scope.txpsN = n;
$ionicScrollDelegate.resize();
$timeout(function() {
$scope.$apply();
}, 1);
});
} }
}); });
}); });
@ -81,29 +75,18 @@ angular.module('copayApp.controllers').controller('tabHomeController',
} }
wallet.status = status; wallet.status = status;
$scope.fetchingNotifications = true;
profileService.getNotifications({ profileService.getNotifications({
limit: 3 limit: 3
}, function(err, notifications) { }, function(err, notifications) {
$scope.fetchingNotifications = false;
if (err) { if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
return; return;
} }
$scope.notifications = notifications; $scope.notifications = notifications;
profileService.getTxps({ updateTxps();
limit: 3
}, function(err, txps, n) {
if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
}
$scope.txps = txps;
$scope.txpsN = n;
$ionicScrollDelegate.resize();
$timeout(function() {
$scope.$apply();
}, 1);
})
}) })
}); });
}; };
@ -123,6 +106,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$scope.updateWallet(wallet); $scope.updateWallet(wallet);
}), }),
$rootScope.$on('Local/TxAction', function(e, walletId) { $rootScope.$on('Local/TxAction', function(e, walletId) {
$log.debug('Got action for wallet '+ walletId);
var wallet = profileService.getWallet(walletId); var wallet = profileService.getWallet(walletId);
$scope.updateWallet(wallet); $scope.updateWallet(wallet);
}), }),
@ -143,5 +127,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$scope.openTxpModal = txpModalService.open; $scope.openTxpModal = txpModalService.open;
$scope.version = $window.version;
$scope.name = $window.appConfig.nameCase;
}); });

7
src/js/controllers/tab-settings.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $rootScope, $log, $ionicModal, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService) { angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $rootScope, $log, $ionicModal, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService) {
$scope.init = function() { $scope.init = function() {
@ -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.appName = $window.appConfig.nameCase;
$scope.unitName = config.wallet.settings.unitName; $scope.unitName = config.wallet.settings.unitName;
$scope.currentLanguageName = uxLanguage.getCurrentLanguageName(); $scope.currentLanguageName = uxLanguage.getCurrentLanguageName();
$scope.selectedAlternative = { $scope.selectedAlternative = {
@ -30,9 +32,6 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.glideraEnabled = config.glidera.enabled; $scope.glideraEnabled = config.glidera.enabled;
$scope.coinbaseEnabled = config.coinbase.enabled; $scope.coinbaseEnabled = config.coinbase.enabled;
$scope.pushNotifications = config.pushNotifications.enabled; $scope.pushNotifications = config.pushNotifications.enabled;
if (isCordova && StatusBar.isVisible) {
StatusBar.backgroundColorByHexString("#4B6178");
}
$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;
}); });

9
src/js/controllers/termOfUse.js
View file

@ -1,7 +1,12 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('termOfUseController', angular.module('copayApp.controllers').controller('termOfUseController',
function($scope, uxLanguage, $ionicNavBarDelegate, gettextCatalog) { function($scope, $window, uxLanguage, $ionicNavBarDelegate, gettextCatalog, externalLinkService) {
$ionicNavBarDelegate.title(gettextCatalog.getString('About Copay')); $ionicNavBarDelegate.title(gettextCatalog.getString('Terms Of Use'));
$scope.lang = uxLanguage.currentLanguage; $scope.lang = uxLanguage.currentLanguage;
$scope.disclaimerUrl = $window.appConfig.disclaimerUrl;
$scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target);
};
}); });

8
src/js/controllers/translators.js Normal file
View file

@ -0,0 +1,8 @@
'use strict';
angular.module('copayApp.controllers').controller('translatorsController',
function($scope, externalLinkService) {
$scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target);
};
});

5
src/js/controllers/walletDetails.js
View file

@ -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, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, $ionicPopup, txpModalService) { angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, $ionicPopup, txpModalService, externalLinkService) {
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
var isWP = platformInfo.isWP; var isWP = platformInfo.isWP;
@ -12,6 +12,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var HISTORY_SHOW_LIMIT = 10; var HISTORY_SHOW_LIMIT = 10;
$scope.txps = []; $scope.txps = [];
$scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target);
};
var setPendingTxps = function(txps) { var setPendingTxps = function(txps) {
if (!txps) { if (!txps) {

4
src/js/directives/copyToClipboard.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.directives') angular.module('copayApp.directives')
.directive('copyToClipboard', function(platformInfo, nodeWebkit, gettextCatalog, ionicToast, clipboard) { .directive('copyToClipboard', function(platformInfo, nodeWebkitService, gettextCatalog, ionicToast, clipboard) {
return { return {
restrict: 'A', restrict: 'A',
scope: { scope: {
@ -22,7 +22,7 @@ angular.module('copayApp.directives')
window.cordova.plugins.clipboard.copy(data); window.cordova.plugins.clipboard.copy(data);
window.plugins.toast.showShortCenter(msg); window.plugins.toast.showShortCenter(msg);
} else if (isNW) { } else if (isNW) {
nodeWebkit.writeToClipboard(data); nodeWebkitService.writeToClipboard(data);
scope.$apply(function() { scope.$apply(function() {
ionicToast.show(msg, 'bottom', false, 1000); ionicToast.show(msg, 'bottom', false, 1000);
}); });

159
src/js/routes.js
View file

@ -143,14 +143,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/uri-coinbase/:url', url: '/uri-coinbase/:url',
templateUrl: 'views/coinbaseUri.html' templateUrl: 'views/coinbaseUri.html'
}) })
.state('activity', {
url: '/activity',
templateUrl: 'views/activity.html'
})
.state('proposals', {
url: '/proposals',
templateUrl: 'views/proposals.html'
})
/* /*
* *
@ -159,17 +151,33 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/ */
.state('tabs.details', { .state('tabs.details', {
url: '/details/{walletId}/{fromOnboarding}', url: '/details/{walletId}/{fromOnboarding}',
views: { views: {
'tab-home': { 'tab-home': {
templateUrl: 'views/walletDetails.html' templateUrl: 'views/walletDetails.html'
}
},
params: {
txid: null,
txpId: null,
},
})
.state('tabs.activity', {
url: '/activity',
views: {
'tab-home': {
templateUrl: 'views/activity.html',
}
} }
}, })
params: { .state('tabs.proposals', {
txid: null, url: '/proposals',
txpId: null, views: {
}, 'tab-home': {
}) templateUrl: 'views/proposals.html',
}
}
})
/* /*
* *
@ -254,12 +262,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
url: '/add', url: '/add',
views: { views: {
'tab-home': { 'tab-home': {
templateUrl: 'views/add.html', templateUrl: 'views/add.html'
controller: function(platformInfo) {
if (platformInfo.isCordova && StatusBar.isVisible) {
StatusBar.backgroundColorByHexString("#4B6178");
}
}
} }
} }
}) })
@ -306,30 +309,12 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}) })
.state('tabs.create', { .state('tabs.create', {
url: '/create', url: '/create',
abstract: true,
templateUrl: 'views/create.html',
views: { views: {
'tab-home': { 'tab-home': {
templateUrl: 'views/create.html' templateUrl: 'views/create.html'
}, },
} }
}) })
.state('tabs.create.personal', {
url: '/tab-create-personal',
views: {
'tab-create-personal': {
templateUrl: 'views/tab-create-personal.html',
},
}
})
.state('tabs.create.shared', {
url: '/tab-create-shared',
views: {
'tab-create-shared': {
templateUrl: 'views/tab-create-shared.html',
},
}
})
/* /*
* *
@ -565,11 +550,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('onboarding', { .state('onboarding', {
url: '/onboarding', url: '/onboarding',
abstract: true, abstract: true,
template: '<ion-nav-view name="onboarding"></ion-nav-view>', template: '<ion-nav-view name="onboarding"></ion-nav-view>'
params: {
walletId: null,
fromOnboarding: null,
},
}) })
.state('onboarding.welcome', { .state('onboarding.welcome', {
url: '/welcome', url: '/welcome',
@ -588,7 +569,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
.state('onboarding.collectEmail', { .state('onboarding.collectEmail', {
url: '/collectEmail', url: '/collectEmail/:walletId',
views: { views: {
'onboarding': { 'onboarding': {
templateUrl: 'views/onboarding/collectEmail.html' templateUrl: 'views/onboarding/collectEmail.html'
@ -596,7 +577,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
.state('onboarding.notifications', { .state('onboarding.notifications', {
url: '/notifications', url: '/notifications/:walletId',
views: { views: {
'onboarding': { 'onboarding': {
templateUrl: 'views/onboarding/notifications.html' templateUrl: 'views/onboarding/notifications.html'
@ -604,7 +585,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
.state('onboarding.backupRequest', { .state('onboarding.backupRequest', {
url: '/backupRequest', url: '/backupRequest/:walletId',
views: { views: {
'onboarding': { 'onboarding': {
templateUrl: 'views/onboarding/backupRequest.html' templateUrl: 'views/onboarding/backupRequest.html'
@ -612,7 +593,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
.state('onboarding.backupWarning', { .state('onboarding.backupWarning', {
url: '/backupWarning', url: '/backupWarning/:walletId',
views: { views: {
'onboarding': { 'onboarding': {
templateUrl: 'views/onboarding/backupWarning.html' templateUrl: 'views/onboarding/backupWarning.html'
@ -620,7 +601,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
.state('onboarding.backup', { .state('onboarding.backup', {
url: '/backup', url: '/backup/:walletId/:fromOnboarding',
views: { views: {
'onboarding': { 'onboarding': {
templateUrl: 'views/backup.html' templateUrl: 'views/backup.html'
@ -652,7 +633,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}, },
}, },
params: { params: {
code: null code: null,
fromOnboarding: null
}, },
}) })
.state('onboarding.import.phrase', { .state('onboarding.import.phrase', {
@ -807,74 +789,35 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}) })
.run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService) { .run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService) {
if (platformInfo.isCordova) {
if (screen.width < 768) {
screen.lockOrientation('portrait');
} else {
window.addEventListener("orientationchange", function() {
var leftMenuWidth = document.querySelector("ion-side-menu[side='left']").clientWidth;
if (screen.orientation.includes('portrait')) {
// Portrait
document.querySelector("ion-side-menu-content").style.width = (screen.width - leftMenuWidth) + "px";
} else {
// Landscape
document.querySelector("ion-side-menu-content").style.width = (screen.height - leftMenuWidth) + "px";
}
});
}
} else {
if (screen.width >= 768) {
window.addEventListener('resize', lodash.throttle(function() {
$rootScope.$emit('Local/WindowResize');
}, 100));
}
}
uxLanguage.init(); uxLanguage.init();
openURLService.init(); openURLService.init();
$ionicPlatform.ready(function() { $ionicPlatform.ready(function() {
if (platformInfo.isCordova) { if (platformInfo.isCordova) {
window.addEventListener('native.keyboardhide', function() {
$timeout(function() {
$rootScope.shouldHideMenuBar = false; //show menu bar when keyboard is hidden with back button action on send screen
}, 100);
});
window.addEventListener('native.keyboardshow', function() {
$timeout(function() {
$rootScope.shouldHideMenuBar = true; //hide menu bar when keyboard opens with back button action on send screen
}, 300);
});
if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) { if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
cordova.plugins.Keyboard.disableScroll(true); cordova.plugins.Keyboard.disableScroll(true);
} }
if (window.StatusBar) {
StatusBar.styleLightContent();
}
$ionicPlatform.registerBackButtonAction(function(e) { $ionicPlatform.registerBackButtonAction(function(e) {
var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : ''; var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : '';
var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : ''; var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : '';
if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) { if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) {
ionic.Platform.exitApp(); ionic.Platform.exitApp();
} else if ($ionicHistory.backView() && !fromTabs) { } else if ($ionicHistory.backView() && !fromTabs) {
$ionicHistory.goBack(); $ionicHistory.goBack();
} else { } else {
$rootScope.backButtonPressedOnceToExit = true; $rootScope.backButtonPressedOnceToExit = true;
window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit')); window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit'));
setInterval(function() { setInterval(function() {
$rootScope.backButtonPressedOnceToExit = false; $rootScope.backButtonPressedOnceToExit = false;
}, 5000); }, 5000);
} }
e.preventDefault(); e.preventDefault();
}, }, 101);
101);
$ionicPlatform.on('pause', function() { $ionicPlatform.on('pause', function() {
// Nothing to do // Nothing to do
@ -890,7 +833,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
setTimeout(function() { setTimeout(function() {
navigator.splashscreen.hide(); navigator.splashscreen.hide();
}, 1000); }, 500);
} }

3
src/js/services/applicationService.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services') angular.module('copayApp.services')
.factory('applicationService', function($rootScope, $timeout, platformInfo, $state) { .factory('applicationService', function($rootScope, $timeout, $ionicHistory, platformInfo, $state) {
var root = {}; var root = {};
var isChromeApp = platformInfo.isChromeApp; var isChromeApp = platformInfo.isChromeApp;
@ -19,6 +19,7 @@ angular.module('copayApp.services')
if (isChromeApp) { if (isChromeApp) {
chrome.runtime.reload(); chrome.runtime.reload();
} else if (isNW) { } else if (isNW) {
$ionicHistory.clearHistory();
$state.go('tabs.home'); $state.go('tabs.home');
$timeout(function() { $timeout(function() {
var win = require('nw.gui').Window.get(); var win = require('nw.gui').Window.get();

14
src/js/services/externalLinkService.js Normal file
View file

@ -0,0 +1,14 @@
'use strict';
angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService) {
this.open = function(url, target) {
if (platformInfo.isNW) {
nodeWebkitService.openExternalLink(url);
} else {
target = target || '_blank';
var ref = window.open(url, target, 'location=no');
}
};
});

8
src/js/services/incomingData.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, bitcore) { angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, bitcore) {
var root = {}; var root = {};
@ -63,10 +63,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
return $state.go('send.amount', {toAddress: data}) return $state.go('send.amount', {toAddress: data})
// copay: protocol // Protocol
} else if (data.indexOf('copay://glidera')==0) { } else if (data.indexOf($window.appConfig.name + '://glidera')==0) {
return $state.go('uriglidera', {url: data}) return $state.go('uriglidera', {url: data})
} else if (data.indexOf('copay://coinbase')==0) { } else if (data.indexOf($window.appConfig.name + '://coinbase')==0) {
return $state.go('uricoinbase', {url: data}) return $state.go('uricoinbase', {url: data})
// Join // Join

38
src/js/services/nodeWebkit.js
View file

@ -1,38 +0,0 @@
'use strict';
angular.module('copayApp.services').factory('nodeWebkit', function nodeWebkitFactory() {
var root = {};
var isNodeWebkit = function() {
var isNode = (typeof process !== "undefined" && typeof require !== "undefined");
if(isNode) {
try {
return (typeof require('nw.gui') !== "undefined");
} catch(e) {
return false;
}
}
};
root.readFromClipboard = function() {
if (!isNodeWebkit()) return;
var gui = require('nw.gui');
var clipboard = gui.Clipboard.get();
return clipboard.get();
};
root.writeToClipboard = function(text) {
if (!isNodeWebkit()) return;
var gui = require('nw.gui');
var clipboard = gui.Clipboard.get();
return clipboard.set(text);
};
root.openExternalLink = function(url) {
if (!isNodeWebkit()) return;
var gui = require('nw.gui');
return gui.Shell.openExternal(url);
};
return root;
});

22
src/js/services/nodeWebkitService.js Normal file
View file

@ -0,0 +1,22 @@
'use strict';
angular.module('copayApp.services').service('nodeWebkitService', function() {
this.readFromClipboard = function() {
var gui = require('nw.gui');
var clipboard = gui.Clipboard.get();
return clipboard.get();
};
this.writeToClipboard = function(text) {
var gui = require('nw.gui');
var clipboard = gui.Clipboard.get();
return clipboard.set(text);
};
this.openExternalLink = function(url) {
var gui = require('nw.gui');
return gui.Shell.openExternal(url);
};
});

1
src/js/services/onGoingProcess.js
View file

@ -31,6 +31,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
'sweepingWallet': gettext('Sweeping Wallet...'), 'sweepingWallet': gettext('Sweeping Wallet...'),
'deletingWallet': gettext('Deleting Wallet...'), 'deletingWallet': gettext('Deleting Wallet...'),
'extractingWalletInfo': gettext('Extracting Wallet Information...'), 'extractingWalletInfo': gettext('Extracting Wallet Information...'),
'gettingFeeLevels': gettext('Getting fee levels...'),
}; };
root.clear = function() { root.clear = function() {

28
src/js/services/profileService.js
View file

@ -30,13 +30,12 @@ angular.module('copayApp.services')
root.updateWalletSettings = function(wallet) { root.updateWalletSettings = function(wallet) {
var defaults = configService.getDefaults(); var defaults = configService.getDefaults();
var config = configService.getSync(); configService.whenAvailable(function(config){
wallet.usingCustomBWS = config.bwsFor && config.bwsFor[wallet.id] && (config.bwsFor[wallet.id] != defaults.bws.url);
wallet.usingCustomBWS = config.bwsFor && config.bwsFor[wallet.id] && (config.bwsFor[wallet.id] != defaults.bws.url); wallet.name = (config.aliasFor && config.aliasFor[wallet.id]) || wallet.credentials.walletName;
wallet.color = (config.colorFor && config.colorFor[wallet.id]) || '#4A90E2';
wallet.name = config.aliasFor && (config.aliasFor[wallet.id] || wallet.credentials.walletName); wallet.email = config.emailFor && config.emailFor[wallet.id];
wallet.color = config.colorFor && (config.colorFor[wallet.id] || '#4A90E2'); });
wallet.email = config.emailFor && config.emailFor[wallet.id];
} }
root.setBackupFlag = function(walletId) { root.setBackupFlag = function(walletId) {
@ -78,7 +77,7 @@ angular.module('copayApp.services')
var opts = opts || {}; var opts = opts || {};
var walletId = wallet.credentials.walletId; var walletId = wallet.credentials.walletId;
if ((root.wallet[walletId] && root.wallet[walletId].started) || opts.force) { if ((root.wallet[walletId] && root.wallet[walletId].started) && !opts.force) {
return false; return false;
} }
@ -123,7 +122,6 @@ angular.module('copayApp.services')
if (wallet.cachedActivity) if (wallet.cachedActivity)
wallet.cachedActivity.isValid = false; wallet.cachedActivity.isValid = false;
if (wallet.cachedTxps) if (wallet.cachedTxps)
wallet.cachedTxps.isValid = false; wallet.cachedTxps.isValid = false;
@ -908,22 +906,14 @@ angular.module('copayApp.services')
var txps = []; var txps = [];
function process(notifications) {
if (!notifications) return [];
var shown = lodash.sortBy(notifications, 'createdOn').reverse();
shown = shown.splice(0, opts.limit || MAX);
return shown;
};
lodash.each(w, function(x) { lodash.each(w, function(x) {
if (x.pendingTxps) if (x.pendingTxps)
txps = txps.concat(x.pendingTxps); txps = txps.concat(x.pendingTxps);
}); });
txps = lodash.sortBy(txps, 'createdOn'); txps = lodash.sortBy(txps, 'pendingForUs', 'createdOn');
txps = lodash.compact(lodash.flatten(txps)).slice(0,MAX); txps = lodash.compact(lodash.flatten(txps)).slice(0,MAX);
var n = txps.length; var n = txps.length;
return cb(null, process(txps), n); return cb(null, txps, n);
}; };
return root; return root;

35
src/js/services/uxLanguage.js
View file

@ -72,7 +72,8 @@ angular.module('copayApp.services')
root._set = function(lang) { root._set = function(lang) {
$log.debug('Setting default language: ' + lang); $log.debug('Setting default language: ' + lang);
gettextCatalog.setCurrentLanguage(lang); gettextCatalog.setCurrentLanguage(lang);
root.currentLanguage = lang; root.currentLanguage = lang;
if (lang == 'zh') lang = lang + '-CN'; // Fix for Chinese Simplified if (lang == 'zh') lang = lang + '-CN'; // Fix for Chinese Simplified
amMoment.changeLocale(lang); amMoment.changeLocale(lang);
}; };
@ -95,31 +96,19 @@ angular.module('copayApp.services')
return root.availableLanguages; return root.availableLanguages;
}; };
root.init = function() { root.init = function(cb) {
root._detect(function(lang) { configService.whenAvailable(function(config) {
root._set(lang); var userLang = config.wallet.settings.defaultLanguage;
});
};
root.update = function(cb) { if (userLang && userLang != root.currentLanguage) {
var userLang = configService.getSync().wallet.settings.defaultLanguage;
if (!userLang) {
root._detect(function(lang) {
userLang = lang;
if (userLang != root.currentLanguage) {
root._set(lang);
}
if (cb) return cb(userLang);
});
} else {
if (userLang != root.currentLanguage) {
root._set(userLang); root._set(userLang);
} else {
root._detect(function(lang) {
root._set(lang);
});
} }
if (cb) return cb();
if (cb) return cb(userLang); });
}
}; };
root.getName = function(lang) { root.getName = function(lang) {

27
src/js/services/walletService.js
View file

@ -92,13 +92,17 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
root.invalidateCache = function(wallet) { root.invalidateCache = function(wallet) {
if (wallet.cachedStatus) { if (wallet.cachedStatus)
wallet.cachedStatus.isValid = false; wallet.cachedStatus.isValid = false;
}
if (wallet.completeHistory) { if (wallet.completeHistory)
wallet.completeHistory.isValid = false; wallet.completeHistory.isValid = false;
}
if (wallet.cachedActivity)
wallet.cachedActivity.isValid = false;
if (wallet.cachedTxps)
wallet.cachedTxps.isValid = false;
}; };
root.getStatus = function(wallet, opts, cb) { root.getStatus = function(wallet, opts, cb) {
@ -623,6 +627,10 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
wallet.removeTxProposal(txp, function(err) { wallet.removeTxProposal(txp, function(err) {
$log.debug('Transaction removed'); $log.debug('Transaction removed');
root.invalidateCache(wallet);
$rootScope.$emit('Local/TxAction', wallet.id);
return cb(err); return cb(err);
}); });
}; };
@ -852,6 +860,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
askPassword(wallet.name, gettext('Enter Spending Password'), function(password) { askPassword(wallet.name, gettext('Enter Spending Password'), function(password) {
if (!password) return cb('no password'); if (!password) return cb('no password');
if (!wallet.checkPassword(password)) return cb('wrong password');
return cb(null, password); return cb(null, password);
}); });
@ -862,8 +872,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
ongoingProcess.set('rejectTx', true); ongoingProcess.set('rejectTx', true);
root.rejectTx(wallet, txp, function(err, txpr) { root.rejectTx(wallet, txp, function(err, txpr) {
root.invalidateCache(wallet); root.invalidateCache(wallet);
ongoingProcess.set('rejectTx', false); ongoingProcess.set('rejectTx', false);
if (err) return cb(err); if (err) return cb(err);
$rootScope.$emit('Local/TxAction', wallet.id); $rootScope.$emit('Local/TxAction', wallet.id);
@ -933,6 +943,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
var msg = err.message ? var msg = err.message ?
err.message : err.message :
gettext('The payment was created but could not be completed. Please try again from home screen'); gettext('The payment was created but could not be completed. Please try again from home screen');
$rootScope.$emit('Local/TxAction', wallet.id); $rootScope.$emit('Local/TxAction', wallet.id);
return cb(msg); return cb(msg);
} }
@ -943,18 +954,18 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
ongoingProcess.set('broadcastingTx', false); ongoingProcess.set('broadcastingTx', false);
if (err) return cb('sign error' + err); if (err) return cb('sign error' + err);
$rootScope.$emit('Local/TxAction', wallet.id);
var type = root.getViewStatus(wallet, broadcastedTxp); var type = root.getViewStatus(wallet, broadcastedTxp);
root.openStatusModal(type, broadcastedTxp, function() { root.openStatusModal(type, broadcastedTxp, function() {
$rootScope.$emit('Local/TxAction', wallet.id);
}); });
return cb(null, broadcastedTxp) return cb(null, broadcastedTxp)
}); });
} else { } else {
$rootScope.$emit('Local/TxAction', wallet.id);
var type = root.getViewStatus(wallet, signedTxp); var type = root.getViewStatus(wallet, signedTxp);
root.openStatusModal(type, signedTxp, function() { root.openStatusModal(type, signedTxp, function() {
root.invalidateCache(wallet);
$rootScope.$emit('Local/TxAction', wallet.id);
}); });
return cb(null, signedTxp); return cb(null, signedTxp);
} }

4
src/sass/views/includes/walletActivity.scss
View file

@ -1,5 +1,9 @@
.wallet-activity { .wallet-activity {
&-not-pending {
background-color:#eee;
}
&-amount { &-amount {
float: right; float: right;
font-size: 18px; font-size: 18px;

8
src/sass/views/onboarding/onboard-collect-email.scss
View file

@ -1,5 +1,8 @@
#onboarding-collect-email { #onboarding-collect-email {
background: rgb(17, 209, 166); background: rgb(17, 209, 166);
.scroll {
height: 100%;
}
#success-image { #success-image {
margin-top: 4rem; margin-top: 4rem;
} }
@ -11,17 +14,18 @@
opacity: 1; opacity: 1;
background: #fff; background: #fff;
color: rgb(108, 108, 108); color: rgb(108, 108, 108);
height: 11rem; height: 13rem;
animation-name: topBottom; animation-name: topBottom;
animation-iteration-count: 1; animation-iteration-count: 1;
animation-timing-function: ease-in; animation-timing-function: ease-in;
animation-duration: 1s; animation-duration: 1s;
animation-delay: 2s; animation-delay: 2s;
position: absolute; position: absolute;
bottom: -100%; bottom: -13rem;
animation-fill-mode: forwards; animation-fill-mode: forwards;
z-index: 5; z-index: 5;
margin-top: 0; margin-top: 0;
width: 100%;
label { label {
background: rgba(200, 200, 200, 0.20); background: rgba(200, 200, 200, 0.20);
height: 3rem; height: 3rem;

4
src/sass/views/onboarding/onboard-welcome.scss
View file

@ -7,7 +7,7 @@
#shopping-24 { #shopping-24 {
content: url("../img/onboarding-welcome-shopping24.png"); content: url("../img/onboarding-welcome-shopping24.png");
position: absolute; position: absolute;
top: 2%; top: 5%;
right: 5%; right: 5%;
width: 35px; width: 35px;
height: auto; height: auto;
@ -17,7 +17,7 @@
@include center-block(); @include center-block();
} }
.logo { .logo {
margin-top: 15rem; margin-top: 13rem;
} }
button { button {
@include center-block(1rem); @include center-block(1rem);

2
src/sass/views/onboarding/onboarding.scss
View file

@ -34,7 +34,7 @@
background-size: contain; background-size: contain;
width: 100%; width: 100%;
clear: both; clear: both;
height: 20rem; height: 23rem;
margin-bottom: -3rem; margin-bottom: -3rem;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;

4
src/sass/views/onboarding/terms-of-use.scss
View file

@ -3,8 +3,8 @@
background: #fff; background: #fff;
box-shadow: 0px 3px 3px 0px rgba(50, 50, 50, 0.2); box-shadow: 0px 3px 3px 0px rgba(50, 50, 50, 0.2);
} }
ion-content { ion-content{
margin-top: 1.5rem; padding-top: 1.5rem;
color: rgba(86, 86, 86, 0.77); color: rgba(86, 86, 86, 0.77);
p { p {
padding: 0 2.5%; padding: 0 2.5%;