From 542943c29f2104893f244c25feb505ab1d42e508 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 7 May 2014 09:55:31 -0300
Subject: [PATCH] fix link + decrypt password

---
 index.html                          | 2 +-
 js/models/storage/LocalEncrypted.js | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 49ef17ef0..a675ee395 100644
--- a/index.html
+++ b/index.html
@@ -382,7 +382,7 @@
                     Transaction finally rejected
                   </span>
                   <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>
                       Sent at {{tx.sentTs | date:'medium'}}
                     </a>
diff --git a/js/models/storage/LocalEncrypted.js b/js/models/storage/LocalEncrypted.js
index 95520ebed..fc0570116 100644
--- a/js/models/storage/LocalEncrypted.js
+++ b/js/models/storage/LocalEncrypted.js
@@ -33,8 +33,11 @@ Storage.prototype._encryptObj = function(obj) {
 };
 
 Storage.prototype._decrypt = function(base64) {
-  var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
-  var decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
+  var decryptedStr=null;
+  try {
+    var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
+    decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
+  } catch (e) {}
   return decryptedStr;
 };