Merge remote-tracking branch 'origin/feature/customerService' into feature/customerService

@@ -28,8 +28,9 @@ const getClientData = (type, encryptedUid, imgSize) => {
     return Promise.all(apiMethod)
         .then(res => {
             let history = res[1].data;
-            let hasHistory = history.length > 0;
+            let hasHistory = history && history.length > 0 || false;
             let csSetting = res[0].data.config;
+
             csSetting.windowLogo = csSetting.windowLogo.replace(regExp, logoSize);
             csSetting.qrCode = csSetting.qrCode.replace(regExp, qcSize);
             csSetting.pcAdImg = csSetting.pcAdImg.replace(regExp, advSize);