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

Merge pull request #187 from gabrielbazan7/ref/designWalletSettings

Browse source 
refactor wallet settings
This commit is contained in:
Matias Alejo Garcia 2016-08-16 17:38:21 -03:00 • committed by GitHub
commit 51befe7afd
17 changed files with 635 additions and 692 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/index.html
View file

@ -14,15 +14,7 @@
<!-- <body ng&#45;cloak class="ng&#45;cloak"> --> <!-- <body ng&#45;cloak class="ng&#45;cloak"> -->
<body > <body >
<ion-nav-bar class="bar-stable"> <ion-nav-bar class="bar-stable"></ion-nav-bar>
</ion-nav-bar>
<!-- <div notifications="right top"></div> -->
<!-- ng&#45;class="{ 'main': index.hasProfile }" -->
<!-- <ion&#45;nav&#45;bar class="bar&#45;positive"> -->
<!-- <ion&#45;nav&#45;back&#45;button class="button&#45;icon ion&#45;arrow&#45;left&#45;c"> -->
<!-- </ion&#45;nav&#45;back&#45;button> -->
<!-- </ion&#45;nav&#45;bar> -->
<ion-nav-view name="main"></ion-nav-view> <ion-nav-view name="main"></ion-nav-view>
<script src="lib/ionic.bundle.min.js"></script> <script src="lib/ionic.bundle.min.js"></script>

64
public/views/backup.html
View file

@ -1,24 +1,13 @@
<div class="backup" ng-controller="backupController" ng-init="init(index.prevState)"> <ion-view ng-controller="backupController" cache-view="false" ng-init="init(index.prevState)">
<nav class="tab-bar"> <ion-nav-bar class="bar-stable">
<section class="left-small" ng-show="(step != 1 && step != 4)"> <ion-nav-title>Backup Flow</ion-nav-title>
<a ng-click="goToStep(1);"> <ion-nav-buttons side="primary" ng-show="(step != 1 && step != 4)">
<i class="icon-arrow-left3 icon-back"></i>  <button class="button" ng-click="goToStep(1); goBack()">
</a>      <i class="ion-arrow-left-c"></i> Back
</section>    </button>
  </ion-nav-buttons>
<section class="middle tab-bar-section" ng-style="{'color':index.backgroundColor}"> </ion-nav-bar>
<span>{{walletName}}</span> <ion-content class="has-header">
</section>
<section class="right-small">
<a class="p10" ng-click="goBack()">
<span class="text-close">
<i class="fi-x size-24"></i>
</span>
</a>
</section>
</nav>
<div class="box-notification" ng-show="error"> <div class="box-notification" ng-show="error">
<span class="text-warning"> <span class="text-warning">
{{error|translate}} {{error|translate}}
@ -90,8 +79,7 @@
<button <button
ng-show="!deleted" ng-show="!deleted"
ng-disabled="credentialsEncrypted || error" ng-disabled="credentialsEncrypted || error"
class="round expand m0" class="button button-block button-stable"
ng-style="{'background-color':index.backgroundColor}"
ng-click="goToStep(2);" ng-click="goToStep(2);"
translate>Continue translate>Continue
</button> </button>
@ -103,7 +91,6 @@
--> -->
<div ng-show="step == 2"> <div ng-show="step == 2">
<ion-content class="m20b">
<div class="columns text-center extra-padding-bottom"> <div class="columns text-center extra-padding-bottom">
<h5 translate>Confirm your wallet recovery phrase</h5> <h5 translate>Confirm your wallet recovery phrase</h5>
<p class="text-gray m0" translate> <p class="text-gray m0" translate>
@ -122,13 +109,11 @@
</span> </span>
</div> </div>
</div> </div>
</ion-content>
<div class="button-box"> <div class="button-box">
<button <button
ng-disabled="!selectComplete" ng-disabled="!selectComplete"
class="round expand m0" class="button button-block button-stable"
ng-style="{'background-color':index.backgroundColor}"
ng-click="goToStep(3);" ng-click="goToStep(3);"
translate>Continue translate>Continue
</button> </button>
@ -140,21 +125,15 @@
--> -->
<div ng-show="step == 3"> <div ng-show="step == 3">
<div class="columns text-center">
<h5 translate>Enter your password</h5> <h5 translate>Enter your password</h5>
<p class="text-gray m0" translate> <label class="item item-input item-stacked-label">
In order to verify your wallet backup, please type your password: <span class="input-label" transalate>In order to verify your wallet backup, please type your password:</span>
</p>
<div class="m20v">
<input type="text" id="passphrase" ng-model="passphrase" autocapitalize="off" spellcheck="false" autofocus/> <input type="text" id="passphrase" ng-model="passphrase" autocapitalize="off" spellcheck="false" autofocus/>
</div> </label>
</div>
<div class="button-box"> <div class="button-box">
<button <button
ng-disabled="!passphrase" ng-disabled="!passphrase"
ng-style="{'background-color':index.backgroundColor}" class="button button-block button-stable"
class="button round expand m0"
ng-click="goToStep(4);" ng-click="goToStep(4);"
translate>Continue translate>Continue
</button> </button>
@ -177,7 +156,7 @@
<div class="columns text-center m20t"> <div class="columns text-center m20t">
<button <button
ng-style="{'background-color':index.backgroundColor}"
class="button round expand" class="button round expand"
href ui-sref="walletHome" href ui-sref="walletHome"
translate>Finish translate>Finish
@ -214,14 +193,13 @@
<div class="button-box"> <div class="button-box">
<button <button
ng-style="{'background-color':index.backgroundColor}"
class="button round expand m0" class="button button-block button-stable"
ng-click="goToStep(1);" ng-click="goToStep(1);"
translate>Try again translate>Try again
</button> </button>
</div> </div>
</div> </div>
</div> </div>
</div> </ion-content>
</div> </ion-view>
<div class="extra-margin-bottom"></div>

20
public/views/export.html
View file

@ -1,10 +1,14 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Export Wallet'; goBackToState = 'preferencesAdvanced'">
</div>
<div class="content preferences" ng-controller="exportController" ng-init="init(index.prevState)"> <ion-view ng-controller="exportController" cache-view="false" ng-init="init(index.prevState)">
<ion-nav-bar class="bar-stable">
<ion-nav-title>Export Wallet</ion-nav-title>
<ion-nav-buttons side="primary">
 <button class="button" href ui-sref="preferencesAdvanced">
     <i class="ion-arrow-left-c"></i> Back
   </button>
  </ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div ng-show="!index.canSign"><h4></h4></div> <div ng-show="!index.canSign"><h4></h4></div>
<div ng-show="index.canSign" class="create-tab small-only-text-center"> <div ng-show="index.canSign" class="create-tab small-only-text-center">
<div class="row"> <div class="row">
@ -131,5 +135,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </ion-content>
<div class="extra-margin-bottom"></div> </ion-view>

144
public/views/preferences.html
View file

@ -1,91 +1,81 @@
<ion-view ng-controller="preferencesController" cache-view="false" ng-init="init()">
<div <ion-nav-bar class="bar-stable">
class="topbar-container" <ion-nav-title>Wallet Settings</ion-nav-title>
ng-include="'views/includes/topbar.html'" <ion-nav-buttons side="primary">
ng-init="titleSection=index.setWalletPreferencesTitle(); closeToHome = true">  <button class="button" href ui-sref="walletDetails">
     <i class="ion-arrow-left-c"></i> Back
   </button>
  </ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div class="list">
<div class="item item-divider">
Preferences
</div> </div>
<div class="item item-icon-right" href ui-sref="preferencesAlias">
<span translate>Wallet Name</span>
<div class="content preferences" ng-controller="preferencesController" ng-init="init()"> <span class="item-note">
<h4></h4>
<ul class="no-bullet m0" ng-show="!index.noFocusedWallet">
<li href ui-sref="preferencesAlias">
<div class="right text-gray">
{{index.alias||index.walletName}} {{index.alias||index.walletName}}
<i class="icon-arrow-right3 size-24 right"></i> </span>
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div translate>Alias</div> <div class="item">
</li> <span translate>Devices</span>
<span class="item-note">
<li href ui-sref="preferencesEmail"> 1
<div class="right text-gray"> </span>
</div>
<div class="item">
<span translate>Required number of signatures</span>
<span class="item-note">
1
</span>
</div>
<div class="item" ng-show="index.isPrivKeyExternal">
<span translate>Hardware wallet</span>
<span class="item-note">
{{externalSource}}
</span>
</div>
<div class="item item-icon-right" href ui-sref="preferencesColor">
<span ng-style="{'color':index.backgroundColor}">&block;</span>
<span translate>Wallet Color</span>
<span class="item-note">
{{index.alias||index.walletName}}
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="preferencesEmail">
<span translate>Email Notifications</span>
<span class="item-note">
<span ng-if="!index.preferences.email" translate>Disabled</span> <span ng-if="!index.preferences.email" translate>Disabled</span>
<span ng-if="index.preferences.email">{{index.preferences.email}}</span> <span ng-if="index.preferences.email">{{index.preferences.email}}</span>
<i class="icon-arrow-right3 size-24 right"></i>
</div>
<div translate>Email Notifications</div>
</li>
<li href ui-sref="preferencesColor">
<div class="right text-gray">
<span ng-style="{'color':index.backgroundColor}">&block;</span>
<i class="icon-arrow-right3 size-24 right"></i>
</div>
<div translate>Color</div>
</li>
<li ng-show="index.isPrivKeyExternal">
<div class="right text-gray m10r">
{{externalSource}}
</div>
<div translate>Hardware wallet</div>
</li>
<li href ui-sref="backup" ng-hide="index.isPrivKeyExternal">
<div class="right text-gray">
<span class="text-warning" ng-show="index.needsBackup">
<i class="fi-alert"></i> <span translate>Not completed</span>
</span> </span>
<i class="icon-arrow-right3 size-24 text-gray"></i> <i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-divider">
Security
</div>
<div class="item item-icon-right" href ui-sref="backup" ng-hide="index.isPrivKeyExternal">
<span translate>Backup</span>
<i class="icon ion-ios-arrow-right"></i>
</div> </div>
<div translate>Backup</div>
</li>
<li href ui-sref="preferencesAdvanced">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Advanced</div>
</li>
</ul>
<h4 translate ng-show="index.canSign || !deleted">
Security preferences
</h4>
<div ng-show="!index.noFocusedWallet && index.canSign"> <div ng-show="!index.noFocusedWallet && index.canSign">
<ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()"> <ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()">
<span class="toggle-label" translate>Request Spending Password</span> <span class="toggle-label" translate>Request Spending Password</span>
</ion-toggle> </ion-toggle>
<ion-toggle ng-model="touchidEnabled" toggle-class="toggle-balanced" ng-change="touchidChange()" ng-show="touchidAvailable">
<span class="toggle-label" translate>Scan Fingerprint</span>
</ion-toggle>
</div> </div>
<div ng-show ="!deleted"> <div class="item item-icon-right" href ui-sref="deleteWords" ng-show ="!deleted">
<span translate>Delete recovery phrase</span>
<ul class="no-bullet m0"> <i class="icon ion-ios-arrow-right"></i>
<li href ui-sref="deleteWords">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Delete recovery phrase</div>
</li>
</ul>
</div> </div>
<div class="item item-divider">
<h4></h4> Advanced
</div> </div>
<div class="item item-icon-right" href ui-sref="preferencesAdvanced">
<div class="extra-margin-bottom"></div> <span translate>Advanced</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
</div>
</ion-content>
</ion-view>

83
public/views/preferencesAdvanced.html
View file

@ -1,47 +1,40 @@
<div <ion-view cache-view="false">
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-title>Advanced Preferences</ion-nav-title>
ng-init="titleSection='Advanced'; goBackToState = 'preferences'"> <ion-nav-buttons side="primary">
 <button class="button" href ui-sref="preferences">
     <i class="ion-arrow-left-c"></i> Back
   </button>
  </ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div class="list">
<div class="item item-divider">
</div> </div>
<div class="item item-icon-right" href ui-sref="information">
<div class="content preferences"> <span translate>Wallet Information</span>
<i class="icon ion-ios-arrow-right"></i>
<h4></h4>
<ul class="no-bullet m0">
<li href ui-sref="information">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Wallet Information</div>
</li>
<li ng-show="index.network == 'livenet'" href ui-sref="paperWallet">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Sweep paper wallet</div>
</li>
<li href ui-sref="export">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Export Wallet</div>
</li>
<li href ui-sref="preferencesBwsUrl">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div>Wallet Service URL</div>
</li>
<li href ui-sref="preferencesHistory">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Transaction History</div>
</li>
<li href ui-sref="delete">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Delete Wallet</div>
</li>
</ul>
</div> </div>
<div class="extra-margin-bottom"></div> <div class="item item-icon-right" ng-show="index.network == 'livenet'" href ui-sref="paperWallet">
<span translate>Sweep paper wallet</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="export">
<span translate>Export Wallet</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="preferencesBwsUrl">
<span translate>Wallet Service URL</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="preferencesHistory">
<span translate>Transaction History</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="delete">
<span translate>Delete Wallet</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
</div>
</ion-content>
</ion-view>

37
public/views/preferencesAlias.html
View file

@ -1,19 +1,20 @@
<div <ion-view ng-controller="preferencesAliasController" cache-view="false">
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-title>Alias</ion-nav-title>
ng-init="titleSection='Alias'; goBackToState = 'preferences'"> <ion-nav-buttons side="primary">
</div>  <button class="button" href ui-sref="preferences">
     <i class="ion-arrow-left-c"></i> Back
<div class="content preferences" ng-controller="preferencesAliasController">    </button>
  </ion-nav-buttons>
<h4></h4> </ion-nav-bar>
<form name="settingsAliasForm" ng-submit="save()" class="columns"> <ion-content class="has-header">
<label><span translate>Alias for <i>{{index.walletName}}</i></span></label> <form name="aliasForm" ng-submit="save(aliasForm)" novalidate>
<input type="text" id="alias2" type="text" name="alias2" ng-model="alias"> <label class="item item-input item-stacked-label">
<input type="submit" class="button expand black round" value="{{'Save'|translate}}" <span class="input-label" transalate>Alias for {{walletName}}</span>
ng-style="{'background-color':index.backgroundColor}"> <input type="text" id="alias" name="alias" ng-model="alias" placeholder="John" required></input>
</label>
<input type="submit" class="button button-block button-stable" value="{{'Save'|translate}}" ng-disabled="aliasForm.$invalid">
</form> </form>
<div class="text-gray size-12 text-center" translate>Changing wallet alias only affects the local wallet name. <div translate>Changing wallet alias only affects the local wallet name.</div>
</div> </ion-content>
</div> </ion-view>
<div class="extra-margin-bottom"></div>

32
public/views/preferencesBwsUrl.html
View file

@ -1,17 +1,19 @@
<div <ion-view ng-controller="preferencesBwsUrlController" cache-view="false">
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-title>Wallet Service URL</ion-nav-title>
ng-init="titleSection='Wallet Service URL'; goBackToState = 'preferencesAdvanced';"> <ion-nav-buttons side="primary">
</div>  <button class="button" href ui-sref="preferencesAdvanced">
     <i class="ion-arrow-left-c"></i> Back
<div class="content preferences" ng-controller="preferencesBwsUrlController">    </button>
<h4></h4>   </ion-nav-buttons>
<form name="settingsBwsUrlForm" ng-submit="save()" class="columns"> </ion-nav-bar>
<label class="left">Wallet Service URL</label> <ion-content class="has-header">
<a class="right size-12" ng-click="resetDefaultUrl()" translate> Set default url</a> <form name="settingsBwsUrlForm" ng-submit="save(settingsBwsUrlForm)" novalidate>
<label class="item item-input item-stacked-label">
<span class="input-label" transalate>Wallet Service URL</span><a ng-click="resetDefaultUrl()" translate> Set default url</a>
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl"> <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
<input type="submit" class="button expand black round" value="{{'Save'|translate}}" </label>
ng-style="{'background-color':index.backgroundColor}"> <input type="submit" class="button button-block button-stable" value="{{'Save'|translate}}"></input>
</form> </form>
</div> </ion-content>
<div class="extra-margin-bottom"></div> </ion-view>

22
public/views/preferencesColor.html
View file

@ -1,11 +1,15 @@
<div class="topbar-container" ng-include="'views/includes/topbar.html'" <ion-view ng-controller="preferencesColorController" cache-view="false">
ng-init="titleSection='Color'; goBackToState = 'preferences'"> <ion-nav-bar class="bar-stable">
</div> <ion-nav-title>Color</ion-nav-title>
<ion-nav-buttons side="primary">
<div class="content preferences" ng-controller="preferencesColorController">  <button class="button" href ui-sref="preferences">
<h4></h4>      <i class="ion-arrow-left-c"></i> Back
   </button>
<ion-radio class="size-12" ng-repeat="c in colorList" ng-value="c" ng-model="currentColor" ng-click="save(c)">   </ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<ion-radio ng-repeat="c in colorList" ng-value="c" ng-model="currentColor" ng-click="save(c)">
<span ng-style="{'color': c}">&block;</span> <span ng-style="{'color': c}">&block;</span>
</ion-radio> </ion-radio>
</div> </ion-content>
</ion-view>

33
public/views/preferencesDeleteWallet.html
View file

@ -1,21 +1,18 @@
<div <ion-view ng-controller="preferencesDeleteWalletController" cache-view="false">
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-title>Delete Wallet</ion-nav-title>
ng-init="titleSection='Delete Wallet'; goBackToState = 'preferencesAdvanced'"> <ion-nav-buttons side="primary">
</div>  <button class="button" href ui-sref="preferencesAdvanced">
     <i class="ion-arrow-left-c"></i> Back
<div class="content preferences" ng-controller="preferencesDeleteWalletController">    </button>
<div class="text-center text-gray m20v size-12">   </ion-nav-buttons>
<div class="text-warning size-18 m10b" translate>Warning!</div> </ion-nav-bar>
<div class="m10" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div> <ion-content class="has-header">
</div> <div translate>Warning!</div>
<div translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
<ul class="no-bullet m0">
<li ng-click="deleteWallet()">
<div class="right" ng-style="{'color':index.backgroundColor}" ng-show="!isDeletingWallet"> <div class="right" ng-style="{'color':index.backgroundColor}" ng-show="!isDeletingWallet">
{{index.walletName}}<span ng-show="index.alias">({{index.alias}})</span> {{index.walletName}}<span ng-show="index.alias">({{index.alias}})</span>
</div> </div>
<div translate>Delete wallet</div> <button class="button button-block button-stable" ng-click="deleteWallet()"translate>Delete wallet</button>
</li> </ion-content>
</ul> </ion-view>
</div>

47
public/views/preferencesDeleteWords.html
View file

@ -1,35 +1,26 @@
<div <ion-view ng-controller="preferencesDeleteWordsController" cache-view="false">
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-title>Delete Recovery Phrase</ion-nav-title>
ng-init="titleSection='Delete Recovery Phrase'; goBackToState = 'preferences'"> <ion-nav-buttons side="primary">
</div>  <button class="button" href ui-sref="preferences">
     <i class="ion-arrow-left-c"></i> Back
   </button>
<div class="content preferences" ng-controller="preferencesDeleteWordsController">   </ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div ng-show="!deleted"> <div ng-show="!deleted">
<div class="text-center text-gray m20t size-12"> <div ng-show="error">
<div class="box-notification text-warning" ng-show="error" >
{{error|translate}} {{error|translate}}
</div> </div>
<div class="text-warning size-18 m10b" translate>Warning!</div> <div translate>Warning!</div>
<div class="m15" ng-show="!index.needsBackup" translate>Once you have copied your wallet recovery phrase down, it is recommended to delete it from this device.</div> <div ng-show="!index.needsBackup" translate>Once you have copied your wallet recovery phrase down, it is recommended to delete it from this device.</div>
<div class="m15" ng-show="index.needsBackup" translate>Need to do backup</div> <div ng-show="index.needsBackup" translate>Need to do backup</div>
<div ng-show="!index.needsBackup">
<button class="button button-block button-stable" ng-click="delete()" translate>Delete Recovery Phrase</button>
</div> </div>
<ul class="no-bullet m0" ng-show="!index.needsBackup">
<li ng-click="delete()">
<div class="right" ng-style="{'color':index.backgroundColor}">
{{index.walletName}} <span ng-show="index.alias">({{index.alias}})</span>
</div> </div>
<div translate>Delete Recovery Phrase</div> <div ng-show="deleted" translate>
</li>
</ul>
</div>
<div class="row m20t" ng-show="deleted">
<div class="columns size-14 text-gray text-center" translate>
Wallet recovery phrase not available. You can still export it from Advanced &gt; Export. Wallet recovery phrase not available. You can still export it from Advanced &gt; Export.
</div> </div>
</div> </ion-content>
</ion-view>
</div>

42
public/views/preferencesEmail.html
View file

@ -1,25 +1,21 @@
<div <ion-view ng-controller="preferencesEmailController" cache-view="false">
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-title>Email Notifications</ion-nav-title>
ng-init="titleSection='Email Notifications'; goBackToState = 'preferences'"> <ion-nav-buttons side="primary">
</div>  <button class="button" href ui-sref="preferences">
     <i class="ion-arrow-left-c"></i> Back
<div class="content preferences" ng-controller="preferencesEmailController">    </button>
<h4></h4>   </ion-nav-buttons>
</ion-nav-bar>
<form name="emailForm" ng-submit="save(emailForm)" class="columns" novalidate ng-init="email = index.preferences.email"> <ion-content class="has-header">
<div class="box-notification" ng-show="error"> <form name="emailForm" ng-submit="save(emailForm)" novalidate>
<span class="text-warning size-14"> <label class="item item-input item-stacked-label">
{{error|translate}} <span class="input-label" transalate>Email for wallet notifications</span>
</span> <input type="email" id="email" name="email" ng-model="email" required></input>
</div> </label>
<input type="submit" class="button button-block button-stable" value="{{'Save'|translate}}" ng-disabled="emailForm.$invalid">
<label translate>Email for wallet notifications</label>
<input type="email" id="email" name="email" ng-model="email" required>
<input type="submit" class="button expand black round" value="{{'Save'|translate}}"
ng-style="{'background-color':index.backgroundColor}" ng-disabled="emailForm.$invalid && !index.preferences.email">
</form> </form>
<div class="text-gray size-12 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 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>
</div> </ion-content>
<div class="extra-margin-bottom"></div> </ion-view>

45
public/views/preferencesHistory.html
View file

@ -1,24 +1,25 @@
<div <ion-view ng-controller="preferencesHistory" cache-view="false" ng-init="index.updatingTxHistory ? null : csvHistory()">
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-title>Transaction History</ion-nav-title>
ng-init="titleSection='Transaction History'; goBackToState = 'preferencesAdvanced'"> <ion-nav-buttons side="primary">
</div>  <button class="button" href ui-sref="preferencesAdvanced">
<div class="content preferences" ng-controller="preferencesHistory">      <i class="ion-arrow-left-c"></i> Back
<h4></h4>    </button>
  </ion-nav-buttons>
<ul class="no-bullet m0" ng-init="index.updatingTxHistory ? null : csvHistory()"> </ion-nav-bar>
<li ng-show="csvReady && !index.isCordova" <ion-content class="has-header">
ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{index.alias || index.walletName}}.csv"> <div class="item item-divider"></div>
<span ng-style="{'color':index.backgroundColor}" translate> <div class="item" ng-show="csvReady && !index.isCordova" ng-csv="csvContent" csv-header="csvHeader" filename="Copay-{{index.alias || index.walletName}}.csv">
Export to file
</span>
</li>
<li ng-show="!csvReady && !index.isCordova">
<span class="right text-gray text-italic" translate>preparing...</span>
<span translate>Export to file</span> <span translate>Export to file</span>
</li>
<li ng-click="clearTransactionHistory()" ng-style="{'color':index.backgroundColor}" translate>
Clear cache
</li>
</ul>
</div> </div>
<div class="item" ng-show="!csvReady && !index.isCordova">
<span translate>Export to file</span>
<span class="item-note" translate>
preparing...
</span>
</div>
<div class="item" ng-click="clearTransactionHistory()">
<span translate>Clear cache</span>
</div>
</ion-content>
</ion-view>

178
public/views/preferencesInformation.html
View file

@ -1,123 +1,116 @@
<div
class="topbar-container" <ion-view ng-controller="preferencesInformation" cache-view="false" ng-init="init()">
ng-include="'views/includes/topbar.html'" <ion-nav-bar class="bar-stable">
ng-init="titleSection='Wallet Information'; goBackToState = 'preferencesAdvanced'"> <ion-nav-title>Wallet Information</ion-nav-title>
<ion-nav-buttons side="primary">
 <button class="button" href ui-sref="preferencesAdvanced">
     <i class="ion-arrow-left-c"></i> Back
   </button>
  </ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div class="list">
<div class="item item-divider">
Wallet Information
</div> </div>
<div class="item">
<div class="content preferences" ng-controller="preferencesInformation" ng-init="init()"> <span translate>BETA: Android Key Derivation Test:</span>
<h4 class="title m0" translate>Wallet Information</h4> <span class="item-note">
<ul class="no-bullet m0 size-14">
<li class="line-b p20 oh " ng-if="androidTest">
<span style="color:red" translate>BETA: Android Key Derivation Test:</span>
<span class="right text-gray">
{{androidTest}} {{androidTest}}
</span> </span>
</li> </div>
<div class="item" ng-click="saveBlack()">
<li class="line-b p20 oh" ng-click="saveBlack()">
<span translate>Wallet Name (at creation)</span> <span translate>Wallet Name (at creation)</span>
<span class="right text-gray"> <span class="item-note">
{{walletName}} {{walletName}}
</span> </span>
</li> </div>
<div class="item" ng-click="copyToClipboard(walletId)">
<li class="line-b p20 oh" ng-click="copyToClipboard(walletId)">
<span translate>Wallet Id</span> <span translate>Wallet Id</span>
<span class="right text-gray enable_text_select"> <span class="item-note">
{{walletId}} {{walletId}}
</span> </span>
</li> </div>
<div class="item">
<li class="line-b p20 oh">
<span translate>Wallet Configuration (m-n)</span> <span translate>Wallet Configuration (m-n)</span>
<span class="right text-gray"> <span class="item-note">
{{M}}-{{N}} {{M}}-{{N}}
</span> </span>
</li> </div>
<div class="item">
<li class="line-b p20 oh">
<span translate>Wallet Network</span> <span translate>Wallet Network</span>
<span class="right text-gray"> <span class="item-note">
{{network}} {{network}}
</span> </span>
</li> </div>
<div class="item">
<li class="line-b p20 oh">
<span translate>Address Type</span> <span translate>Address Type</span>
<span class="right text-gray"> <span class="item-note">
{{addressType}} {{addressType}}
</span> </span>
</li> </div>
<div class="item">
<li class="line-b p20 oh">
<span translate>Derivation Strategy</span> <span translate>Derivation Strategy</span>
<span class="right text-gray"> <span class="item-note">
{{derivationStrategy}} {{derivationStrategy}}
</span> </span>
</li> </div>
<div class="item" ng-show="index.externalSource">
<li class="line-b p20 oh" ng-show="index.externalSource"> <span translate>Hardware Wallet</span>
<span>Hardware Wallet</span> <span class="item-note">
<span class="right text-gray capitalize">
{{index.externalSource}} {{index.externalSource}}
</span> </span>
</li> </div>
<div class="item" ng-show="!index.externalSource && !index.canSign">
<li class="line-b p20 oh" ng-show="!index.externalSource && !index.canSign">
<span translate></span> <span translate></span>
<span class="right text-gray capitalize"> <span class="item-note">
No private key No private key
</span> </span>
</li> </div>
<div class="item" ng-show="index.account">
<li class="line-b p20 oh" ng-show="index.account">
<span translate>Account</span>({{derivationStrategy}}) <span translate>Account</span>({{derivationStrategy}})
<span class="right text-gray"> <span class="item-note">
#{{index.account}} #{{index.account}}
</span> </span>
</li> </div>
<h4 class="title m0" translate>Copayers</h4> <div class="item item-divider">
<li ng-repeat="copayer in index.copayers"> Copayers
<span class="size-12" ng-show="copayer.id == index.copayerId"> </div>
<i class="icon-contact size-24 m10r"></i> {{copayer.name}} ({{'Me'|translate}}) <i class="fi-check m5 right"></i>
</span>
<span class="size-12 text-gray" ng-show="copayer.id != index.copayerId">
<i class="icon-contact size-24 m10r"></i> {{copayer.name}}<i class="fi-check m5 right"></i>
</span>
</li>
<h4 class="title m0" translate>Extended Public Keys</h4> <div class="item item-icon-right" ng-repeat="copayer in index.copayers">
<li ng-repeat="pk in pubKeys" ng-click="copyToClipboard(pk)"> <span ng-show="copayer.id == index.copayerId" translate>{{copayer.name}} ({{'Me'|translate}})</span>
<div class="row collapse"> <span ng-style="{'color': 'grey';}" ng-show="copayer.id != index.copayerId" translate>{{copayer.name}}</span>
<div class="small-4 columns">Copayer {{$index}}</div> <i class="icon ion-ios-checkmark-outline"></i>
<div class="small-8 columns oh text-gray">
<div class="ellipsis enable_text_select">{{pk}}</div>
<div class="size-12 text-right" ng-if="$index == 0">
({{basePath}})
</div> </div>
<div class="item item-divider">
Extended Public Keys
</div> </div>
<div class="item" ng-repeat="pk in pubKeys" ng-click="copyToClipboard(pk)">
<span translate>Copayer {{$index}}<</span>
<i class="icon ion-ios-checkmark-outline"></i>
<span class="item-note">
<span>Copayer {{$index}}</span>
<span>{{pk}}</span>
<span ng-if="$index == 0">({{basePath}})</span>
</span>
</div> </div>
</li>
</ul>
<div ng-show="addrs"> <div ng-show="addrs">
<h4 class="title m0" translate>Last Wallet Addresses</h4> <div class="item item-divider">
<ul class="no-bullet m0"> Last Wallet Addresses
<li ng-repeat="a in addrs" class="oh" ng-click="copyToClipboard(a.address)">
<div class="enable_text_select ellipsis">
{{a.address}}
</div>
<div class="text-gray size-12 right enable_text_select">
{{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}
</div>
</li>
</ul>
<div class="text-centered text-gray size-12 m10" translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div> </div>
<div class="item" ng-repeat="a in addrs" class="oh" ng-click="copyToClipboard(a.address)">
<span>{{a.address}}</span>
<span>{{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}</span>
<i class="icon ion-ios-checkmark-outline"></i>
</div>
<div translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-style="{'color':index.backgroundColor}" href ui-sref="walletHome" ng-click="index.retryScan()" translate> <li ng-style="{'color':index.backgroundColor}" href ui-sref="walletHome" ng-click="index.retryScan()" translate>
Scan addresses for funds Scan addresses for funds
@ -128,20 +121,17 @@
</ul> </ul>
</div> </div>
<ul class="no-bullet m0 size-14" ng-show="index.balanceByAddress"> <div ng-show="index.balanceByAddress" ng-if="index.balanceByAddress[0]">
<div ng-if="index.balanceByAddress[0]"> <div class="item item-divider">
<h4 class="title m0" translate>Balance By Address</h4> Balance By Address
<li class="line-b p20 oh" ng-repeat="a in index.balanceByAddress" ng-click="copyToClipboard(a.address)">
<div class="enable_text_select ellipsis">
{{a.address}}
</div> </div>
<div class="text-gray text-right"> <div class="item" ng-repeat="a in index.balanceByAddress" ng-click="copyToClipboard(a.address)">
<span>{{a.address}}</span>
<span class="item-note">
{{(a.amount/1e8).toFixed(8)}} BTC {{(a.amount/1e8).toFixed(8)}} BTC
</span>
</div> </div>
</li>
</div> </div>
</ul>
<h4></h4>
<div class="extra-margin-bottom"></div>
</div> </div>
</ion-content>
</ion-view>

3
public/views/walletDetails.html
View file

@ -9,6 +9,9 @@
<i class="ion-arrow-left-c"></i> Back <i class="ion-arrow-left-c"></i> Back
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-nav-buttons side="secondary">
<button class="button button-icon icon ion-ios-settings" href ui-sref="preferences"></button>
</ion-nav-buttons>
<ion-content delegate-handle="my-handle" overflow-scroll="true"> <ion-content delegate-handle="my-handle" overflow-scroll="true">

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

@ -2,12 +2,14 @@
angular.module('copayApp.controllers').controller('preferencesAliasController', angular.module('copayApp.controllers').controller('preferencesAliasController',
function($scope, $timeout, configService, profileService, go) { function($scope, $timeout, configService, profileService, go) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var walletId = fc.credentials.walletId; var walletId = fc.credentials.walletId;
var config = configService.getSync(); var config = configService.getSync();
config.aliasFor = config.aliasFor || {}; config.aliasFor = config.aliasFor || {};
$scope.alias = config.aliasFor[walletId] || fc.credentials.walletName; $scope.walletName = fc.credentials.walletName;
$scope.alias = config.aliasFor[walletId] || $scope.walletName;
$scope.save = function() { $scope.save = function() {
var opts = { var opts = {

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

@ -1,19 +1,18 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesEmailController', function($rootScope, $scope, go, profileService, walletService) { angular.module('copayApp.controllers').controller('preferencesEmailController', function($rootScope, $scope, go, profileService, walletService) {
$scope.save = function(form) { $scope.save = function(form) {
$scope.error = null;
$scope.saving = true;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var email = $scope.email || ''; var email = $scope.email || '';
walletService.updateRemotePreferences(fc, { walletService.updateRemotePreferences(fc, {
email: email, email: email,
}, function(err) { }, function(err) {
$scope.saving = false;
if (!err) if (!err)
$rootScope.$emit('Local/EmailUpdated', email); $rootScope.$emit('Local/EmailUpdated', email);
go.path('preferences'); go.path('preferences');
}); });
}; };
}); });