@capillarytech/creatives-library 6.13.2 → 6.13.4

package/app.js

@@ -25,7 +25,6 @@ import initialState from './initialState';
 import './styles/vendor/semantic/dist/semantic.min.css';
 import './styles/main.scss';
 import pathConfig from './config/path';
-import ignoredErrorMessages from './utils/ignoredErrorMessages';
 // addLocaleData([...en, ...es, ...fr, ...it, ...zh]);
 
 const browserHistory = useRouterHistory(createHistory)({
@@ -39,12 +38,10 @@ const history = syncHistoryWithStore(browserHistory, store, {
 });
 
 const bugSnagErrorCallback = (event) => {
-  const { app: { releaseStage } = {}, error } = event || {};
-  const errorMessage = error && error.message;
+  const { app: { releaseStage } = {} } = event || {};
   if (
     (releaseStage || '').includes('nightly') ||
-    process.env.NODE_ENV !== 'production' ||
-    ignoredErrorMessages.include[errorMessage]
+    process.env.NODE_ENV !== 'production'
   ) {
     return false;
   }

package/components/FormBuilder/index.js

@@ -204,9 +204,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
     if (!_.isEmpty(nextProps.formData) && !_.isEqual(this.state.formData, nextProps.formData)) {
       if (nextProps.isNewVersionFlow) {
-        const nextPropsFormData = nextProps.formData[nextProps.currentTab - 1];
-        const nextPropsTabKey = nextPropsFormData && nextPropsFormData.tabKey;
-        const tabKey = (this.state.tabKey !== nextPropsTabKey) ? nextPropsTabKey: this.state.tabKey;
+        const tabKey = (this.state.tabKey !== nextProps.formData[nextProps.currentTab - 1].tabKey) ? nextProps.formData[nextProps.currentTab - 1].tabKey : this.state.tabKey;
 
         this.setState({tabKey});
       }
@@ -1843,9 +1841,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             formData.base.tabKey = `${data}`;
           }
 
-          const formDataActiveKey = formData[(this.state.currentTab - 1)][formData[(this.state.currentTab - 1)].activeTab];
-          const formDataTabKey = formDataActiveKey && formDataActiveKey.tabKey;
-          that.setState({formData, currentLangTab: formData[(this.state.currentTab - 1)].activeTab, tabKey: formDataTabKey}, () => {
+          that.setState({formData, currentLangTab: formData[(this.state.currentTab - 1)].activeTab, tabKey: formData[(this.state.currentTab - 1)][formData[(this.state.currentTab - 1)].activeTab].tabKey}, () => {
             val.injectedEvents[event].call(that.props.parent, this.state.currentTab, formData);
           });
         } else {

package/containers/Ebill/index.js

@@ -908,9 +908,6 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   injectEvents(schema) {
     console.log('now injecting events', schema);
     const temp = schema;
-    if (!temp.standalone) {
-      temp.standalone = {};
-    }
     temp.standalone.sections = this.injectSections(temp.standalone.sections);
     _.forEach(temp.containers, (container) => {
       let tempContainer = container;

package/containers/Email/index.js

@@ -1155,11 +1155,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const msgString = JSON.stringify(msg);
       const langId = formData[this.state.currentTab - 1].activeTab;
       const langIndex = formData[this.state.currentTab - 1].selectedLanguages.indexOf(langId);
-      const elementToSelect = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`);
-      if (elementToSelect) {
-        const win = elementToSelect.contentWindow;
-        win.postMessage(msgString, '*');
-      }
+      const win = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`).contentWindow;
+      win.postMessage(msgString, '*');
     } else {
       console.log('tag', this.state, this.state.editorInstanse);
       if (this.state.editorInstanse) {
@@ -1418,8 +1415,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
   getMappedEvent = (id, event) => {
     console.log('Map ', this.map, id, event);
-    const mapIdObject = this.map[id];
-    return mapIdObject && mapIdObject[event] ? mapIdObject[event] : () => {};
+    return this.map[id][event];
   }
 
   getCurrentWindow = (e) => {
@@ -1515,11 +1511,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         _.forEach(data.selectedLanguages, (language, langIndex) => {
           if (data[language].is_drag_drop) {
             console.log('saving edm template', document.getElementById("edmeditor"), `edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`);
-            const elementToSelect = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`);
-            if (elementToSelect) {
-              const win = elementToSelect.contentWindow;
-              win.postMessage("saveProject", '*');
-            }
+            const win = document.getElementById(`edmeditor${(langIndex + 1) > 1 ? (langIndex + 1) : ''}`).contentWindow;
+            win.postMessage("saveProject", '*');
           }
         });
       });
@@ -2508,7 +2501,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           const tempEl = containerInputFieldCol;
           if (containerInputFieldCol.id === "tab-header") {
             const baseLanguage = this.props.Global.currentOrgDetails && this.props.Global.currentOrgDetails.basic_details && this.props.Global.currentOrgDetails.basic_details.base_language && this.props.Global.currentOrgDetails.basic_details.base_language !== "" ? this.props.Global.currentOrgDetails.basic_details.base_language : 'en';
-            const supportedLanguages = this.props.Global.currentOrgDetails && this.props.Global.currentOrgDetails.basic_details && this.props.Global.currentOrgDetails.basic_details.supported_languages;
+            const supportedLanguages = this.props.Global.currentOrgDetails.basic_details.supported_languages;
             if (!supportedLanguages) {
               tempEl.value = baseLanguage || 'English';
               return;
@@ -2662,13 +2655,12 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         if (languageIndex === -1) {
           languageIndex = 0;
         }
-        const dataBase = data.base;
         const tempData = {
-          "is_drag_drop": dataBase && dataBase.is_drag_drop,
+          "is_drag_drop": data.base.is_drag_drop,
           "lang_id": this.supportedLanguages[languageIndex].lang_id,
           "iso_code": this.supportedLanguages[languageIndex].iso_code,
           "language": this.supportedLanguages[languageIndex].language,
-          "template-content": dataBase && !dataBase.is_drag_drop && dataBase.is_drag_drop !== 1 ? dataBase.html_content : "",
+          "template-content": !data.base.is_drag_drop && data.base.is_drag_drop !== 1 ? data.base.html_content : "",
         };
         formData[0].base = true;
         formData[0].selectedLanguages.push(this.supportedLanguages[languageIndex].iso_code);

package/containers/Sms/Create/index.js

@@ -297,8 +297,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         onTabChange: this.onTabChange,
       },
     };
-    const mappedIdObject = map[id];
-    return mappedIdObject && mappedIdObject[event] ? mappedIdObject[event] : () => {};
+    return map[id][event];
   }
 
   setFormValidity(isFormValid) {

package/index.js

@@ -65,6 +65,10 @@ import LineCreate from './v2Containers/Line/Container';
 import lineCreateReducer from './v2Containers/Line/Container/reducer';
 import lineCreateSaga from './v2Containers/Line/Container/sagas';
 
+import Viber from './v2Containers/Viber';
+import viberReducer from './v2Containers/Viber/reducer';
+import viberSaga from './v2Containers/Viber/sagas';
+
 import TemplatesV2 from './v2Containers/TemplatesV2/index';
 
 import CreativesContainer from './v2Containers/CreativesContainer';
@@ -82,7 +86,7 @@ const TemplatesContainer = {Templates, templateReducer, templateSaga};
 const SmsCreateContainer = {SmsCreate, smsCreateReducer, smsCreateSaga};
 const SmsEditContainer = {SmsEdit, smsEditReducer, smsEditSaga};
 const EmailContainer = {Email, emailReducer, emailSaga};
-const BeeContainer ={ BeeEditor,beeReducer,beeSaga}
+const BeeContainer = { BeeEditor, beeReducer, beeSaga};
 const CallTaskContainer = {CallTask, callTaskReducer, callTaskSaga};
 const WeChatMapTemplateContainer = {WeChatMapTemplate, weChatMapTemplateReducer, weChatMapTemplateSaga};
 const WeChatRichMediaCreateContainer = {WeChatRichMediaCreate, weChatRichMediaCreateReducer, weChatRichMediaCreateSaga};
@@ -92,6 +96,8 @@ const MobilePushEditContainer = {MobilepushEdit, mobilepushEditReducer, mobilepu
 const LineCreateContainer = {LineCreate, lineCreateReducer, lineCreateSaga};
 const TemplatesV2Container = {TemplatesV2, templateReducer, templateSaga};
 const FacebookContainer = {Facebook, facebookReducer, facebookSaga};
+const ViberContainer = {Viber, viberReducer, viberSaga};
+
 const GalleryContainer = {Gallery, galleryReducer, gallerySagas};
 
 export {default as TagList} from './v2Containers/TagList/index';
@@ -131,4 +137,5 @@ export { CapContainer,
   updateCharCount,
   FacebookContainer,
   GalleryContainer,
+  ViberContainer,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "6.13.2",
+  "version": "6.13.4",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -15,7 +15,7 @@
     "@babel/polyfill": "7.4.3",
     "@bugsnag/js": "^7.2.1",
     "@bugsnag/plugin-react": "^7.2.1",
-    "@capillarytech/cap-ui-utils": "1.3.3",
+    "@capillarytech/cap-ui-utils": "1.3.2",
     "@mailupinc/bee-plugin": "^1.2.0",
     "babel-cli": "^6.26.0",
     "chalk": "1.1.3",

package/reducers.js

@@ -9,6 +9,8 @@ import { LOCATION_CHANGE } from 'react-router-redux';
 
 import languageProviderReducer from 'v2Containers/LanguageProvider/reducer';
 import beeEditorReducer from 'v2Containers/BeeEditor/reducer';
+
+
 import capReducer from 'containers/Cap/reducer';
 import appReducer from 'containers/App/reducer';
 import createSmsReducer from 'containers/Sms/Create/reducer';

package/routes.js

@@ -598,7 +598,8 @@ export default function createRoutes(store) {
 
         importModules.catch(errorLoading);
       },
-    }, {
+    },
+    {
       path: '/v2(/:channel)',
       name: 'templatesV2',
       getComponent(nextState, cb) {
@@ -634,6 +635,8 @@ export default function createRoutes(store) {
           import('v2Containers/Facebook/reducer'),
           import('v2Containers/Line/Container/sagas'),
           import('v2Containers/Line/Container/reducer'),
+          import('v2Containers/Viber/sagas'),
+          import('v2Containers/Viber/reducer'),
         ]);
 
         const renderRoute = loadModule(cb);
@@ -654,6 +657,7 @@ export default function createRoutes(store) {
           galleryReducer, gallerySagas,
           facebookSagas, facebookReducer,
           lineCreateSagas, lineCreateReducer,
+          viberSagas, viberReducer,
         ]) => {
           injectReducer('templates', reducer.default);
           injectReducer('cap', capReducer.default);
@@ -670,6 +674,7 @@ export default function createRoutes(store) {
           injectReducer('gallery', galleryReducer.default);
           injectReducer('facebook', facebookReducer.default);
           injectReducer('lineCreate', lineCreateReducer.default);
+          injectReducer('viber', viberReducer.default);
           injectSagas(gallerySagas.default);
           injectSagas(sagas.default);
           injectSagas(capSagas.default);
@@ -685,6 +690,7 @@ export default function createRoutes(store) {
           injectSagas(weChatRichmediaTemplatesEditSagas.default);
           injectSagas(facebookSagas.default);
           injectSagas(lineCreateSagas.default);
+          injectSagas(viberSagas.default);
           renderRoute(component);
         });
         importModules.catch(errorLoading);

package/services/api.js

@@ -358,6 +358,12 @@ export const createLineTemplate = ({template}) => {
   return request(url, getAPICallObject('POST', template));
 };
 
+export const createViberTemplate = ({template}) => {
+  console.log('VIBER : in api.js', template);
+  const url = `${API_ENDPOINT}/templates/VIBER`;
+  return request(url, getAPICallObject('POST', template));
+};
+
 export const getLocizMessage = async (locale) => {
   const appName = 'creatives_v2';
   const url = `${ARYA_ENDPOINT}/translations/${appName}/${locale}`;

package/v2Components/FormBuilder/index.js

@@ -2362,9 +2362,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           this.renderTextAreaContent(styling, columns, val, isVersionEnable, rows, cols, val.offset);
           break;
         case "contentPreview":
-          const { formData , currentTab } = this.state || {};
-          const tab = formData && formData[currentTab - 1];
-          content = isVersionEnable ? tab && tab['sms-editor'] : formData && formData['sms-editor'];
+          content = isVersionEnable ? this.state.formData[this.state.currentTab - 1]['sms-editor'] : this.state.formData['sms-editor'];
           charList = updateCharCount(content).char_list;
           columns.push(<CapColumn id={val.id} className={"preview-chars"} span={val.width}>
             {charList.map((char) => char)}
@@ -3177,7 +3175,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               }
               console.log('CKEditor Data 2', this.state.formData, this.state.formData[`${this.state.currentTab - 1}`], val, this.state.currentTab, this.state.currentLangTab, langIndex);
               const currentLang = ((!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage) || 'en';
-              const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`] && this.state.formData[`${this.state.currentTab - 1}`][currentLang] && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] || '');
+              const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] ? this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] : '');
               columns.push(
                 <CapColumn style={val.colStyle ? val.colStyle : {}} span={val.width}>
                   <CKEditor
@@ -3200,7 +3198,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               }
             }
             const { currentTab, formData } = this.state;
-            const supportedLanguages = (formData[currentTab - 1] || {}).selectedLanguages || {};
+            const supportedLanguages = formData[currentTab - 1].selectedLanguages;
             const currentLang = supportedLanguages[langTab - 1];
 
             let beeJson = '',

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -21,8 +21,6 @@
     left: 23%;
     width: 42%;
     height: 336px;
-    display: -webkit-box;
-    display: -ms-flexbox;
     display: flex;
 
     .sms-icon{
@@ -51,6 +49,14 @@
         left: 36px;
         margin-top: -6px;
       }
+      }
+      &.viber-preview{
+        width: 43%;
+        .message-pop {
+          width: 80%;
+          left: 36px;
+          margin-top: -6px;
+        }
     }
 
     .message-pop{

package/v2Components/TemplatePreview/index.js

@@ -19,12 +19,14 @@ import Carousel from '../Carousel';
 const wechatBodyNew = require('./assets/images/wechat_mobile_android.svg');
 const smsMobileAndroid = require('./assets/images/sms_mobile_android.svg');
 const lineMobileAndroid = require('../../assets/line.png');
+const viberMobileAndroid = require('../../assets/viber.png');
+
 const lineImgPlaceholder = require('../../assets/line-image-placeholder.svg');
 const lineStickerPlaceholder = require('../../assets/smiley-placeholder.svg');
 const lineVideoPlaceholder = require('../../assets/rich-video-placeholder.svg');
 const androidPushMessagePhone = require('./assets/images/androidPushMessage.svg');
 const iPhonePushMessagePhone = require('./assets/images/iPhonePushMessage.svg');
-import { CAP_COLOR_03, CAP_WHITE, FONT_COLOR_01, CAP_G08, CAP_G06 } from '@capillarytech/cap-ui-library/styled/variables';
+import { CAP_COLOR_03, CAP_WHITE, FONT_COLOR_01, CAP_G08, CAP_G06, CAP_G15, CAP_PURPLE01, CAP_G16 } from '@capillarytech/cap-ui-library/styled/variables';
 import { TEMPLATE, IMAGE_CAROUSEL, IMAGE, STICKER, TEXT, IMAGE_MAP, VIDEO } from '../../v2Containers/Line/Container/constants';
 
 class TemplatePreview extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -155,11 +157,11 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
       });
     }
     const disablePreviewAndTest = this.props.channel === 'MOBILEPUSH' ? !this.props.content.header : (this.props.channel === 'SMS' ? !this.props.content : false);
-    const showTestAndPreview = showTestAndPreviewIcon && 
+    const showTestAndPreview = showTestAndPreviewIcon &&
         channel !== WECHAT &&
         ['outbound', 'library'].includes(module);
 
-    const renderLineMultiText = (content)  => {
+    const renderLineMultiText = (content) => {
       let textCount = 0;
       return content.map((item) => {
         const { type, messageContent = '' } = item || {};
@@ -170,12 +172,17 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
               {this.props.intl.formatMessage(messages.textMessageLabel)}
               {textCount}: ({messageContent.length}/{1600} {this.props.intl.formatMessage(messages.textMessageCharacter)})
             </p>
-          )
+          );
         }
-        return null
+        return null;
       });
-    }
-    
+    };
+    const viberSectionStyle = {
+      "padding": '3.5px 0 0',
+      'border-radius': '8px',
+      'background-color': CAP_G15,
+      'width': '79%',
+    };
     const getVideoContent = ({
       video,
       actionUrl,
@@ -245,7 +252,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
             />
           )
         }
-      </div>  
+      </div>
     );
 
     return (
@@ -393,7 +400,8 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                   marginLeft: 40,
                 }}
               >
-                <div className="sms-icon"
+                <div
+                  className="sms-icon"
                   style={{
                     left: 0,
                     top: 8,
@@ -401,7 +409,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                     width: 20,
                     height: 20,
                     background: CAP_COLOR_03,
-                    paddingRight: 5
+                    paddingRight: 5,
                   }}
                 >
                   {this.props.LineAccountName}
@@ -464,7 +472,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                                 },
                               }}
                             />
-                          </div>  
+                          </div>
                         );
                       }
                       if (type === VIDEO) {
@@ -495,7 +503,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                                 },
                               }}
                             />
-                          </div>  
+                          </div>
                         );
                       }
                       if (type === STICKER && selectedSticker) {
@@ -510,7 +518,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                               alignItems: 'center',
                             }}
                           >
-                            <CapImage 
+                            <CapImage
                               src={selectedSticker.stickerUrl}
                               style={{maxWidth: '100%', marginBottom: 5 }}
                               rest={{
@@ -519,11 +527,11 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                                   marginBottom: 5,
                                 },
                                 height: 70,
-                                onMouseOut: e => (e.currentTarget.src = selectedSticker.stickerUrl),
-                                onMouseOver: e => (e.currentTarget.src = selectedSticker.animatedStickerUrl ||  selectedSticker.stickerUrl),
+                                onMouseOut: (e) => (e.currentTarget.src = selectedSticker.stickerUrl),
+                                onMouseOver: (e) => (e.currentTarget.src = selectedSticker.animatedStickerUrl || selectedSticker.stickerUrl),
                               }}
                             />
-                          </div>  
+                          </div>
                         );
                       }
                       if ((type === IMAGE_CAROUSEL || type === TEMPLATE) && imageCarousel) {
@@ -535,7 +543,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                           >
                             <Carousel imageCarousel={imageCarousel}/>
                           </div>
-                        )
+                        );
                       }
                       return null;
                     })
@@ -546,7 +554,82 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
             </div>
           ) : ''
         }
+            {
+          channel && channel.toLowerCase() === 'viber' ? (
+            <div className="shell-v2 align-center" id="sms-preview">
+              <CapImage className="preview-image" src={viberMobileAndroid} alt={this.props.intl.formatMessage(messages.previewGenerated)}/>
+              <div
+                className="msgContainer viber-preview"
+                style={{
+                  maxHeight: 292,
+                  marginLeft: 28,
+                }}
+              >
+                <div
+                  className="sms-icon"
+                  style={{
+                    "width": 20,
+                    "height": 20,
+                    "margin": '0 4px 277px 0',
+                    "padding": '6px 2px 7px 3px',
+                    'border-radius': '4px',
+                    'background-color': CAP_PURPLE01,
+                    'font-size': '6px',
+                    'font-weight': 900,
+                    "color": CAP_WHITE,
+                  }}
+                >
+                  {this.props.viberAccountName}
+                </div>
+                <div
+                  className="message-pop align-left"
+                  style={viberSectionStyle}>
+                  {/* Text Viber preview */}
+                  <p
+                    style={{
+                      'font-size': '10px',
+                      "color": CAP_G16,
+                      "margin": '1.5px 6px 1px 7px',
+                    }}>{this.props.content.messageContent || ''}
+                  </p>
+                  {/* Image Viber preview */}
+                  {this.props.content.imageURL && <CapImage
+                    src={this.props.content.imageURL}
+                    alt="brand-name"
+                    rest={{
+                      style: {
+                        maxWidth: '100%',
+                        marginBottom: 5,
+                      },
+                    }}
+                    />
+                  }
+                  {/* button viber preview */}
+                  {this.props.content.buttonText && <div
+                    style={{
+                      'border-radius': '16px',
+                      'background-color': CAP_PURPLE01,
+                      "margin-top": '14px',
+                      'text-align': 'center',
+                      "width": '132px',
+                      "height": '20px',
+                      "margin-left": "5px",
+                    }}>
+                    <p
+                      style={{ 'font-size': '12px',
+                        'font-weight': '500',
+                        "color": CAP_WHITE }}
+                      >
+                      {this.props.content.buttonText || ''}</p>
+                  </div>
+                  }
+                  <div style={{ paddingBottom: 32}}></div>
+                </div>
 
+              </div>
+            </div>
+          ) : ''
+        }
           </div>
 
         </CapColumn>

package/v2Containers/Cap/index.js

@@ -33,7 +33,7 @@ import './_cap.scss';
 const gtm = window.dataLayer || [];
 const {
   logNewTab,
-  utilsGetOrgNameFromId,
+  getOrgNameFromId,
   tabBeforeUnloadEventHandler,
   utilsHandleStorageChange,
   isMultipleTabsOpen,
@@ -297,36 +297,18 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     }
   };
 
-  getOrgNameFromId = orgId => {
-    const {
-      Global: {
-        user: {
-          proxyOrgList,
-          orgName: defaultOrgName,
-          orgID: defaultOrgID,
-        } = {},
-      } = {},
-    } = this.props;
-    return utilsGetOrgNameFromId(
-      orgId,
-      proxyOrgList,
-      defaultOrgID,
-      defaultOrgName,
-    );
-  };
-
   renderOrgRefreshModal = () => {
     const {
       localStorageOrgInfo: { oldValue: oldOrgId, newValue: newOrgId } = {},
       showRefreshModal,
       refreshSeconds,
     } = this.state;
-    const { intl: { formatMessage } = {} } = this.props;
-    const oldOrgName = this.getOrgNameFromId(Number(oldOrgId));
-    const newOrgName = this.getOrgNameFromId(Number(newOrgId));
-    // some users do not have entry for their default org in proxyOrgList.
-    // getOrgNameFromId returns back orgID if no matching entry is present in proxyOrgList
-    // so replacing with defaultOrgName if defaultOrgID is returned
+    const {
+      Global: { user: { proxyOrgList } = {} } = {},
+      intl: { formatMessage } = {},
+    } = this.props;
+    const oldOrgName = getOrgNameFromId(Number(oldOrgId), proxyOrgList);
+    const newOrgName = getOrgNameFromId(Number(newOrgId), proxyOrgList);
     const modalData = (
       <CapModal
         title={formatMessage(messages.orgRefreshHeading)}
@@ -357,15 +339,12 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   renderOrgChangeModal = () => {
     const { selectedOrgId, showOrgChangeModal } = this.state;
     const {
-      Global: { 
+      Global: { user: { proxyOrgList } = {},
       currentOrgDetails: { basic_details: { name: oldOrgName } = {} } = {},
       },
       intl: { formatMessage } = {},
     } = this.props; 
-    const newOrgName = this.getOrgNameFromId(selectedOrgId);
-    // some users do not have entry for their default org in proxyOrgList.
-    // getOrgNameFromId returns back orgID if no matching entry is present in proxyOrgList
-    // so replacing with defaultOrgName if defaultOrgID is returned
+    const newOrgName = getOrgNameFromId(selectedOrgId, proxyOrgList);
     return (
       <CapModal
         className="change-org-confirm"