From d9f8501b8fc7f14f630a949cd2254bab631b02b6 Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Thu, 20 Oct 2016 10:35:18 -0400
Subject: [PATCH] changed or operator to ternary  operator

---
 src/js/controllers/preferencesAlias.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/preferencesAlias.js b/src/js/controllers/preferencesAlias.js
index 1d95d27d0..5060335c1 100644
--- a/src/js/controllers/preferencesAlias.js
+++ b/src/js/controllers/preferencesAlias.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesAliasController',
     var config = configService.getSync();
 
     $scope.walletName = wallet.credentials.walletName;
-    $scope.walletAlias = config.aliasFor[walletId] || wallet.credentials.walletName;
+    $scope.walletAlias = config.aliasFor && config.aliasFor[walletId] ? config.aliasFor[walletId] : wallet.credentials.walletName;
     $scope.alias = {
       value: $scope.walletAlias
     };