From bdb363bd2866c3f4e31d51e639b9f3278f5d108d Mon Sep 17 00:00:00 2001
From: Antonis Stamatiou <stamatiou.antonis@gmail.com>
Date: Mon, 13 Nov 2023 10:33:47 +0200
Subject: [PATCH] fix: Fix about modal version for cloud installations (#25389)

---
 .../about_build_modal/about_build_modal.test.tsx         | 2 +-
 .../about_build_modal_cloud/about_build_modal_cloud.tsx  | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx b/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx
index 17c72c7451..5827c3b1a0 100644
--- a/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx
+++ b/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx
@@ -106,7 +106,7 @@ describe('components/AboutBuildModal', () => {
 
         expect(screen.getByText('Mattermost Cloud')).toBeInTheDocument();
         expect(screen.getByText('High trust messaging for the enterprise')).toBeInTheDocument();
-
+        expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: 3.6.0');
         expect(screen.getByText('0123456789abcdef', {exact: false})).toBeInTheDocument();
         expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt');
         expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt');
diff --git a/webapp/channels/src/components/about_build_modal/about_build_modal_cloud/about_build_modal_cloud.tsx b/webapp/channels/src/components/about_build_modal/about_build_modal_cloud/about_build_modal_cloud.tsx
index 5bba99a7f7..7742065a5a 100644
--- a/webapp/channels/src/components/about_build_modal/about_build_modal_cloud/about_build_modal_cloud.tsx
+++ b/webapp/channels/src/components/about_build_modal/about_build_modal_cloud/about_build_modal_cloud.tsx
@@ -57,11 +57,6 @@ export default function AboutBuildModalCloud(props: Props) {
         </div>
     );
 
-    let mmversion = config.BuildNumber;
-    if (!isNaN(config.BuildNumber)) {
-        mmversion = 'ci';
-    }
-
     return (
         <Modal
             dialogClassName={classNames('a11y__modal', 'about-modal', 'cloud')}
@@ -94,12 +89,12 @@ export default function AboutBuildModalCloud(props: Props) {
                         </h3>
                         <p className='subtitle'>{subTitle}</p>
                         <div className='description'>
-                            <div>
+                            <div data-testid='aboutModalVersion'>
                                 <FormattedMessage
                                     id='about.version'
                                     defaultMessage='Mattermost Version:'
                                 />
-                                <span id='versionString'>{'\u00a0' + mmversion}</span>
+                                <span id='versionString'>{'\u00a0' + config.Version}</span>
                             </div>
                         </div>
                         {licensee}