mirror of https://github.com/BTCPrivate/copay.git
fix link + decrypt password
This commit is contained in:
parent
67a2cf386d
commit
542943c29f
|
@ -382,7 +382,7 @@
|
||||||
Transaction finally rejected
|
Transaction finally rejected
|
||||||
</span>
|
</span>
|
||||||
<p class="small" ng-show="!tx.missingSignatures && tx.sentTs">
|
<p class="small" ng-show="!tx.missingSignatures && tx.sentTs">
|
||||||
<a href="http://live.insight.is/tx/{{tx.sentTxid}}" target="blank">
|
<a href="http://{{$root.wallet.networkName === 'testnet' ? 'test':'live' }}.insight.is/tx/{{tx.sentTxid}}" target="blank">
|
||||||
<i class="fi-arrow-right size-40"></i>
|
<i class="fi-arrow-right size-40"></i>
|
||||||
Sent at {{tx.sentTs | date:'medium'}}
|
Sent at {{tx.sentTs | date:'medium'}}
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -33,8 +33,11 @@ Storage.prototype._encryptObj = function(obj) {
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype._decrypt = function(base64) {
|
Storage.prototype._decrypt = function(base64) {
|
||||||
var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
|
var decryptedStr=null;
|
||||||
var decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
|
try {
|
||||||
|
var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
|
||||||
|
decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
|
||||||
|
} catch (e) {}
|
||||||
return decryptedStr;
|
return decryptedStr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue