adds warn if mnemonic is encrypted
This commit is contained in:
parent
fdbf9e2675
commit
03e6b2b5c4
6 changed files with 39 additions and 18 deletions
|
|
@ -17,7 +17,7 @@
|
||||||
"ng-lodash": "~0.2.0",
|
"ng-lodash": "~0.2.0",
|
||||||
"angular-moment": "0.10.1",
|
"angular-moment": "0.10.1",
|
||||||
"moment": "2.10.3",
|
"moment": "2.10.3",
|
||||||
"angular-bitcore-wallet-client": "0.1.4",
|
"angular-bitcore-wallet-client": "0.2.0",
|
||||||
"angular-ui-router": "~0.2.13",
|
"angular-ui-router": "~0.2.13",
|
||||||
"qrcode-decoder-js": "*",
|
"qrcode-decoder-js": "*",
|
||||||
"fastclick": "*",
|
"fastclick": "*",
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<h2> Wallet Seed </h2>
|
<h2> Wallet Seed </h2>
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="wordsC.mywords">
|
<div ng-show="wordsC.mnemonicWords">
|
||||||
<div class="row" ng-show="index.n==1">
|
<div class="row" ng-show="index.n==1">
|
||||||
<div class="m10t columns size-14 text-gray" translate>
|
<div class="m10t columns size-14 text-gray" translate>
|
||||||
<span translate>
|
<span translate>
|
||||||
|
|
@ -49,13 +49,13 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row m20t" ng-show="!wordsC.mywords">
|
<div class="row m20t" ng-show="!wordsC.mnemonicWords">
|
||||||
<div class="columns size-14 text-gray" translate>
|
<div class="columns size-14 text-gray" translate>
|
||||||
The wallet seed for this wallet is not available on this device. You can still export the wallet to backup it.
|
The wallet seed for this wallet is not available on this device. You can still export the wallet to backup it.
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="wordsC.mywords">
|
<div ng-show="wordsC.mnemonicWords">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="m10t oh" ng-init="show=false">
|
<div class="m10t oh" ng-init="show=false">
|
||||||
<a class="button outline light-gray expand tiny" ng-click="show=!show">
|
<a class="button outline light-gray expand tiny" ng-click="show=!show">
|
||||||
|
|
@ -68,11 +68,27 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row enable_text_select" ng-show="show" >
|
<div class="row enable_text_select" ng-show="show">
|
||||||
|
|
||||||
|
|
||||||
<div class="small-centered p10t p10b large-centered medium-centered large-8 medium-8 small-10 columns enable_text_select" style="border:1px solid gray; background:#eee;
|
<div class="small-centered p10t p10b large-centered medium-centered large-8 medium-8 small-10 columns enable_text_select" style="border:1px solid gray; background:#eee;
|
||||||
">
|
">
|
||||||
<span class="m10r" ng-repeat="word in wordsC.mywords">{{word}} </span>
|
<span class="m10r" ng-repeat="word in wordsC.mnemonicWords">{{word}} </span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="box-notification large-centered medium-centered small-centered large-8 medium-8 small-10 columns m10t" ng-show="wordsC.mnemonicHasPassphrase">
|
||||||
|
<span class="text-warning size-14">
|
||||||
|
<i class="fi-alert"></i>
|
||||||
|
<span translate>
|
||||||
|
WARNING: This seed was created with a passphrase. To recover this wallet both the mnemonic and passphrase are needed.
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="m10 text-center columns">
|
<div class="m10 text-center columns">
|
||||||
<div class="m10 size-14 text-gray" translate>
|
<div class="m10 size-14 text-gray" translate>
|
||||||
<span translate>
|
<span translate>
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label for="seed" class="oh">
|
<label for="seed" class="oh">
|
||||||
<span translate>Specify your wallet's key seed</span>
|
<span translate>Specify your wallet seed</span>
|
||||||
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
|
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
|
@ -130,7 +130,7 @@
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label for="ext-master" class="m10t" ng-show="setSeed">
|
<label for="ext-master" class="m10t" ng-show="setSeed">
|
||||||
<span translate>Wallet Key Seed</span>
|
<span translate>Wallet Seed</span>
|
||||||
<small translate>Enter the 12 words seed (BIP39)</small>
|
<small translate>Enter the 12 words seed (BIP39)</small>
|
||||||
<input id="ext-master"
|
<input id="ext-master"
|
||||||
type="text"
|
type="text"
|
||||||
|
|
|
||||||
6
public/views/includes/walletInfo.html
Normal file
6
public/views/includes/walletInfo.html
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
<span ng-show="index.network != 'livenet'"> Testnet </span>
|
||||||
|
<span ng-show="!index.canSign && !index.isPrivKeyExternal" translate>No Private key</span>
|
||||||
|
<span ng-show="index.isPrivKeyExternal" style="text-transform: capitalize">
|
||||||
|
<span translate>External Private Key:</span>
|
||||||
|
{{index.externalSource}}
|
||||||
|
</span>
|
||||||
|
|
@ -101,7 +101,7 @@
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
|
|
||||||
<label for="seed" class="oh">
|
<label for="seed" class="oh">
|
||||||
<span translate>Specify your wallet's key seed</span>
|
<span translate>Specify your wallet seed</span>
|
||||||
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
|
<switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label for="ext-master" class="m10t" ng-show="setSeed">
|
<label for="ext-master" class="m10t" ng-show="setSeed">
|
||||||
<span translate>Wallet Key Seed</span>
|
<span translate>Wallet Seed</span>
|
||||||
<small translate>Enter the 12 words seed (BIP39)</small>
|
<small translate>Enter the 12 words seed (BIP39)</small>
|
||||||
<input id="ext-master"
|
<input id="ext-master"
|
||||||
type="text"
|
type="text"
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,6 @@ angular.module('copayApp.controllers').controller('wordsController',
|
||||||
var msg = gettext('Are you to delete the backup words?');
|
var msg = gettext('Are you to delete the backup words?');
|
||||||
var successMsg = gettext('Backup words deleted');
|
var successMsg = gettext('Backup words deleted');
|
||||||
|
|
||||||
this.getMnemonic = function() {
|
|
||||||
var fc = profileService.focusedClient;
|
|
||||||
var words = fc.getMnemonic();
|
|
||||||
if (!words) return;
|
|
||||||
return words.split(' ');
|
|
||||||
};
|
|
||||||
|
|
||||||
this.done = function() {
|
this.done = function() {
|
||||||
$rootScope.$emit('Local/BackupDone');
|
$rootScope.$emit('Local/BackupDone');
|
||||||
};
|
};
|
||||||
|
|
@ -30,5 +23,11 @@ angular.module('copayApp.controllers').controller('wordsController',
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.mywords = this.getMnemonic();
|
var fc = profileService.focusedClient;
|
||||||
|
var words = fc.getMnemonic();
|
||||||
|
|
||||||
|
if (words)
|
||||||
|
this.mnemonicWords = words.split(' ');
|
||||||
|
|
||||||
|
this.mnemonicHasPassphrase = fc.mnemonicHasPassphrase();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue