From 2a58a9297355c5f8211f122b4d8976955e619dfd Mon Sep 17 00:00:00 2001 From: Timmy Luong Date: Tue, 12 May 2020 12:13:49 -0700 Subject: [PATCH] fix: add default value for "settings" --- ui/src/shared/components/CloudUpgradeButton.tsx | 8 +++----- ui/src/shared/components/CloudUpgradeNavBanner.tsx | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ui/src/shared/components/CloudUpgradeButton.tsx b/ui/src/shared/components/CloudUpgradeButton.tsx index 854e73e892..4445c2295d 100644 --- a/ui/src/shared/components/CloudUpgradeButton.tsx +++ b/ui/src/shared/components/CloudUpgradeButton.tsx @@ -2,6 +2,7 @@ import React, {FC} from 'react' import {Link} from 'react-router' import {connect} from 'react-redux' +import {get} from 'lodash' // Components import CloudOnly from 'src/shared/components/cloud/CloudOnly' @@ -36,11 +37,8 @@ const CloudUpgradeButton: FC = ({inView}) => { ) } -const mstp = ({ - cloud: { - orgSettings: {settings}, - }, -}: AppState) => { +const mstp = (state: AppState) => { + const settings = get(state, 'cloud.orgSettings.settings', []) const hideUpgradeButtonSetting = settings.find( (setting: OrgSetting) => setting.key === HIDE_UPGRADE_CTA_KEY ) diff --git a/ui/src/shared/components/CloudUpgradeNavBanner.tsx b/ui/src/shared/components/CloudUpgradeNavBanner.tsx index 507e51f66d..515cdcf749 100644 --- a/ui/src/shared/components/CloudUpgradeNavBanner.tsx +++ b/ui/src/shared/components/CloudUpgradeNavBanner.tsx @@ -2,6 +2,7 @@ import React, {FC} from 'react' import {Link} from 'react-router' import {connect} from 'react-redux' +import {get} from 'lodash' // Components import { @@ -71,11 +72,8 @@ const CloudUpgradeNavBanner: FC = ({inView}) => { ) } -const mstp = ({ - cloud: { - orgSettings: {settings}, - }, -}: AppState) => { +const mstp = (state: AppState) => { + const settings = get(state, 'cloud.orgSettings.settings', []) const hideUpgradeButtonSetting = settings.find( (setting: OrgSetting) => setting.key === HIDE_UPGRADE_CTA_KEY )