[MM-29559][MM-29558] Company Info Fixes (#6764)

* [MM-29559][MM-29558] Company Info Fixes * Fixed so that the no company info screen loads when neither address exists
mattermost · Oct 13, 2020 · 9b7d71c · 9b7d71c
1 parent a0973be
commit 9b7d71c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/components/admin_console/billing/company_info_display.tsx b/components/admin_console/billing/company_info_display.tsx
@@ -59,10 +59,13 @@ const noCompanyInfoSection = (
 const CompanyInfoDisplay: React.FC = () => {
     const companyInfo = useSelector((state: GlobalState) => state.entities.cloud.customer);
 
-    let body = noCompanyInfoSection;
+    if (!companyInfo) {
+        return null;
+    }
 
-    if (companyInfo) {
-        const address = companyInfo.company_address || companyInfo.billing_address;
+    let body = noCompanyInfoSection;
+    const address = companyInfo.company_address.line1 ? companyInfo.company_address : companyInfo.billing_address;
+    if (address.line1) {
         body = (
             <div className='CompanyInfoDisplay__companyInfo'>
                 <div className='CompanyInfoDisplay__companyInfo-text'>