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_push_notifications

Browse source
This commit is contained in:
Jamal Jackson 2016-09-14 14:46:23 -04:00
commit 30f8a641b1
5 changed files with 179 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

26
public/views/backup.html
View file

@ -6,7 +6,14 @@
</ion-nav-bar>
<ion-content>
<div ng-show="deleted">
<span translate>Wallet recovery phrase not available. You can still export it from Advanced &gt; Export.</span>
<div class="row text-center">
<h3 translate class="col col-75 center-block">Wallet recovery phrase not available.</h3>
</div>
<div class="row text-center">
<p translate class="col col-75 center-block">
You can still export it from Advanced &gt; Export.
</p>
</div>
</div>
<!--
## STEP 1
@ -20,11 +27,12 @@
Please carefully write down this phrase
</p>
</div>
<div ng-show="mnemonicHasPassphrase">
<i class="ion-alert-circled"></i>
<span translate>
This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed.
</span>
<div class="row text-center" ng-show="mnemonicHasPassphrase">
<p class="bold-text col col-80 center-block">
<span translate>
This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed.
</span>
</p>
</div>
<div class="cta-buttons">
<button ng-show="!deleted" ng-disabled="credentialsEncrypted || error" class="button button-block button-positive" ng-click="goToStep(2);" translate>I've written it down
@ -49,7 +57,7 @@
ng-disabled="shuffledWord.selected">{{shuffledWord.word}}
</button>
</span>
<button ng-show="selectComplete" class="button button-block button-positive" ng-click="goToStep(3);" translate>Confirm</button>
<button ng-show="selectComplete" id="confirm-phrase" class="button button-block button-positive" ng-click="goToStep(3);" translate>Confirm</button>
</div>
</div>
<!--
@ -59,9 +67,9 @@
<h5 translate>Enter your password</h5>
<label class="item item-input item-stacked-label">
<span class="input-label" transalate>In order to verify your wallet backup, please type your password:</span>
<input type="text" id="passphrase" ng-model="passphrase" autocapitalize="off" spellcheck="false" autofocus/>
<input type="text" id="passphrase" ng-model="data.passphrase" autocapitalize="off" spellcheck="false" autofocus/>
</label>
<button ng-disabled="!passphrase" class="button button-block button-positive" ng-click="goToStep(4);" translate>Confirm
<button ng-disabled="!data.passphrase" class="button button-block button-positive" ng-click="goToStep(4);" translate>Confirm
</button>
</div>
</ion-content>

6
public/views/includes/confirmBackupPopup.html
View file

@ -8,7 +8,7 @@
<p translate> Be sure to store your recovery phrase in a secure place. If this app is deelted, you money cannot be recoved with out it.</p>
<button
class="button button-clear expand"
ng-click="closePopup(true)"
ng-click="closeBackupResultModal()"
translate>I Understand
</button>
</div>
@ -18,8 +18,8 @@
Please review your backup and try again</p>
<button
class="button button-block button-stable"
ng-click="closePopup(false)"
translate>Ok
ng-click="closeBackupResultModal()">
Ok
</button>
</div>
</div>