Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge: update branch with latest dev #5975

Merged
merged 5 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/meditrak-app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,16 +163,16 @@ export const ExportConfig = ({ onClose, selectedDashboardItems }: ExportDashboar
<ExportSubtitle>Edit export settings and click 'Download'.</ExportSubtitle>
</ExportSettingsInstructionsContainer>
<ExportSetting>
{hasChartItems && (
<section>
<ExportSettingsWrapper>
<DisplayFormatSettings />
</ExportSettingsWrapper>
<section>
<ExportSettingsWrapper>
<DisplayFormatSettings />
</ExportSettingsWrapper>
{hasChartItems && (
<ExportSettingsWrapper>
<DisplayOptionsSettings />
</ExportSettingsWrapper>
</section>
)}
)}
</section>
<MailingListSection
selectedDashboardItems={selectedDashboardItems}
settings={{
Expand Down
14 changes: 10 additions & 4 deletions packages/tupaia-web/src/layout/UserMenu/UserInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
}
Expand Down