From 76ca1956ca8b4c1a44bda3b7d86f2fe26b74daba Mon Sep 17 00:00:00 2001
From: Jeffrey Lembeck <jlembeck@gmail.com>
Date: Thu, 6 Oct 2022 10:43:38 -0700
Subject: [PATCH] fix(account): sometimes company name is null, not empty

---
 tests/Handlers/AccountTest.php | 31 +++++++++++++++++++++++++++++++
 www/src/Handlers/Account.php   |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/tests/Handlers/AccountTest.php b/tests/Handlers/AccountTest.php
index d1e5844f4b..9c86102871 100644
--- a/tests/Handlers/AccountTest.php
+++ b/tests/Handlers/AccountTest.php
@@ -636,4 +636,35 @@ public function testGetAccountPageDefaultFree(): void
 
         Account::getAccountPage($req, $page);
     }
+
+    public function testGetAccountPageDefaultFreeCompanyNull(): void
+    {
+        $page = "";
+
+        $req = new RequestContext([]);
+        $user = new User();
+        $user->setUserId(12345);
+        $req->setUser($user);
+
+        $client = $this->createMock(CPClient::class);
+        $client->expects($this->once())
+            ->method('getFullWptPlanSet');
+        $client->expects($this->once())
+            ->method('getUserContactInfo')
+            ->with(12345)
+            ->willReturn([
+                'firstName' => "Goober",
+                'lastName' => "Goob",
+                'companyName' => null
+            ]);
+        $req->setClient($client);
+
+        $bmm = $this->createMock(BannerMessageManager::class);
+        $bmm->expects($this->once())
+            ->method('get')
+            ->willReturn([]);
+        $req->setBannerMessageManager($bmm);
+
+        Account::getAccountPage($req, $page);
+    }
 }
diff --git a/www/src/Handlers/Account.php b/www/src/Handlers/Account.php
index 41ef357549..acc967ed76 100644
--- a/www/src/Handlers/Account.php
+++ b/www/src/Handlers/Account.php
@@ -687,7 +687,7 @@ public static function getAccountPage(RequestContext $request_context, string $p
         $contact_info = $request_context->getClient()->getUserContactInfo($user_id);
         $first_name = $contact_info['firstName'];
         $last_name = $contact_info['lastName'];
-        $company_name = $contact_info['companyName'];
+        $company_name = $contact_info['companyName'] ?? "";
 
 
         $contact_info = [