From e25227aed4b8ac8a820f2825552d8d19abdca8e4 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Tue, 13 Oct 2020 23:04:42 +0200
Subject: [PATCH] [MM-29559][MM-29558] Company Info Fixes (#6764) (#6767)

* [MM-29559][MM-29558] Company Info Fixes

* Fixed so that the no company info screen loads when neither address exists

(cherry picked from commit 9b7d71cd0b4516cd98e637804af67f9ffda334d3)

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
---
 .../admin_console/billing/company_info_display.tsx       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/admin_console/billing/company_info_display.tsx b/components/admin_console/billing/company_info_display.tsx
index 795ae0a35273..930e39929dc9 100644
--- 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'>