Add "Messaging not disabled" to tab display conditions

module/Olcs/src/Controller/Listener/Navigation.php

@@ -172,11 +172,19 @@ private function toggleMessagesTab(bool $shouldShowMessagesTab): void
 
     private function shouldShowMessagesTab(): bool
     {
-        $hasPendingOrValidLicence = $this->identity->getUserData()['hasOrganisationSubmittedLicenceApplication'];
+        $messagingToggleEnabled = $this->querySender->featuresEnabled([FeatureToggle::MESSAGING]);
 
-        $messagingToggleState = $this->querySender->featuresEnabled([FeatureToggle::MESSAGING]);
+        $userData = $this->identity->getUserData();
 
-        return $messagingToggleState && $hasPendingOrValidLicence;
+        $hasOrganisationSubmittedLicenceApplication = $userData['hasOrganisationSubmittedLicenceApplication'];
+
+        $isMessagingEnabled = $userData['organisationUsers'][0]['organisation']['isMessagingDisabled'] === false;
+
+        return (
+            $messagingToggleEnabled &&
+            $hasOrganisationSubmittedLicenceApplication &&
+            $isMessagingEnabled
+        );
     }
 
     /**

test/Olcs/src/Controller/Listener/NavigationTest.php

@@ -59,7 +59,18 @@ public function testOnDispatchWithNoReferalAnonymousUser()
     {
         $this->mockIdentity->shouldReceive('isAnonymous')->once()->withNoArgs()->andReturn(true);
 
-        $this->mockIdentity->expects('getUserData')->once()->andReturn(['hasOrganisationSubmittedLicenceApplication' => false]);
+        $this->mockIdentity->expects('getUserData')
+            ->once()
+            ->andReturn([
+                'hasOrganisationSubmittedLicenceApplication' => false,
+                'organisationUsers' => [
+                    0 => [
+                        'organisation' => [
+                            'isMessagingDisabled' => false
+                        ]
+                    ]
+                ]
+            ]);
 
         $this->mockQuerySender->shouldReceive('featuresEnabled')->with([$this->messagingToggle])->once();
 
@@ -101,9 +112,20 @@ public function testOnDispatchWithNoReferalAnonymousUser()
     public function testOnDispatchWithNoReferal($eligibleForPermits)
     {
         $this->mockIdentity->shouldReceive('isAnonymous')->once()->withNoArgs()->andReturn(false);
+
         $this->mockIdentity->expects('getUserData')
             ->twice()
-            ->andReturn(['eligibleForPermits' => $eligibleForPermits, 'hasOrganisationSubmittedLicenceApplication' => false]);
+            ->andReturn([
+                'eligibleForPermits' => $eligibleForPermits,
+                'hasOrganisationSubmittedLicenceApplication' => false,
+                'organisationUsers' => [
+                    0 => [
+                        'organisation' => [
+                            'isMessagingDisabled' => false
+                        ]
+                    ]
+                ]
+            ]);
 
         $this->mockQuerySender->shouldReceive('featuresEnabled')->with([$this->messagingToggle])->once();
 
@@ -155,7 +177,16 @@ public function testOnDispatchWithGovUkReferalMatch()
 
         $this->mockIdentity->expects('getUserData')
             ->once()
-            ->andReturn(['hasOrganisationSubmittedLicenceApplication' => false]);
+            ->andReturn([
+                'hasOrganisationSubmittedLicenceApplication' => false,
+                'organisationUsers' => [
+                    0 => [
+                        'organisation' => [
+                            'isMessagingDisabled' => false
+                        ]
+                    ]
+                ]
+            ]);
 
         $this->mockQuerySender->shouldReceive('featuresEnabled')->once()->with([$this->messagingToggle]);
 
@@ -192,7 +223,17 @@ public function testOnDispatchWithNoGovUkReferal($eligibleForPermits)
 
         $this->mockIdentity->expects('getUserData')
             ->twice()
-            ->andReturn(['eligibleForPermits' => $eligibleForPermits, 'hasOrganisationSubmittedLicenceApplication' => false]);
+            ->andReturn([
+                'eligibleForPermits' => $eligibleForPermits,
+                'hasOrganisationSubmittedLicenceApplication' => false,
+                'organisationUsers' => [
+                    0 => [
+                        'organisation' => [
+                            'isMessagingDisabled' => false
+                        ]
+                    ]
+                ]
+            ]);
 
         $this->mockNavigation
             ->shouldReceive('findBy')