BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix link + decrypt password

This commit is contained in:
Matias Alejo Garcia 2014-05-07 09:55:31 -03:00
parent 67a2cf386d
commit 542943c29f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -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>

7
js/models/storage/LocalEncrypted.js
View File

@ -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;
}; };