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

Merge pull request #309 from matiu/bug/ux10

Browse source 
fix link + decrypt password
This commit is contained in:
Manuel Aráoz 2014-05-07 10:28:02 -03:00
commit 85eeec0ef7
2 changed files with 6 additions and 2 deletions
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>

6
js/models/storage/LocalEncrypted.js
View file

@ -33,8 +33,12 @@ Storage.prototype._encryptObj = function(obj) {
}; };
Storage.prototype._decrypt = function(base64) { Storage.prototype._decrypt = function(base64) {
var decryptedStr=null;
var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase()); var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
var decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
if (decrypted)
decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
return decryptedStr; return decryptedStr;
}; };