Merge branch 'dev' into rn-1494-fix-pdf-settings

beyondessential · Oct 21, 2024 · 8392748 · 8392748
2 parents 13bb152 + 13ed0c9
commit 8392748
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/packages/meditrak-app/android/app/build.gradle b/packages/meditrak-app/android/app/build.gradle
@@ -84,7 +84,7 @@ android {
         applicationId "com.tupaiameditrak"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 143
+        versionCode 144
         versionName "1.14.144"
     }
     signingConfigs {

diff --git a/packages/meditrak-app/ios/TupaiaMediTrak.xcodeproj/project.pbxproj b/packages/meditrak-app/ios/TupaiaMediTrak.xcodeproj/project.pbxproj
@@ -495,7 +495,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 143;
+				CURRENT_PROJECT_VERSION = 144;
 				DEVELOPMENT_TEAM = 352QMCKRKJ;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 352QMCKRKJ;
 				ENABLE_BITCODE = NO;
@@ -528,7 +528,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 143;
+				CURRENT_PROJECT_VERSION = 144;
 				DEVELOPMENT_TEAM = 352QMCKRKJ;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 352QMCKRKJ;
 				INFOPLIST_FILE = TupaiaMediTrak/Info.plist;

diff --git a/packages/tupaia-web/src/layout/UserMenu/UserInfo.tsx b/packages/tupaia-web/src/layout/UserMenu/UserInfo.tsx
@@ -106,10 +106,16 @@ export const UserInfo = ({ user, isLandingPage, secondaryColor, isLoggedIn }: Us
     const userProjectName = user?.project?.name || 'Explore';
     return (
       <UsernameContainer $isLandingPage={isLandingPage}>
-        {userName} |
-        <Tooltip>
-          <ProjectButton modal={MODAL_ROUTES.PROJECT_SELECT}>{userProjectName}</ProjectButton>
-        </Tooltip>
+        {userName}
+        {!isLandingPage ? (
+          <>
+            {' '}
+            |
+            <Tooltip>
+              <ProjectButton modal={MODAL_ROUTES.PROJECT_SELECT}>{userProjectName}</ProjectButton>
+            </Tooltip>
+          </>
+        ) : null}
       </UsernameContainer>
     );
   }