Merge pull request #309 from matiu/bug/ux10

fix link + decrypt password

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>

js/models/storage/LocalEncrypted.js

@@ -33,8 +33,12 @@ Storage.prototype._encryptObj = function(obj) {
 };
 
 Storage.prototype._decrypt = function(base64) {
+  var decryptedStr=null;
   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;
 };