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.

Sign up for GitHub

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

Jump to bottom

Release/2.5.1 [main] #891

Merged
merged 6 commits into from
Nov 8, 2024
Merged

Release/2.5.1 [main] #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
848d235
chore: add applets refresh after answers submission (#884)
qiushihe Oct 30, 2024
0d230e7
chore: bump version 2.5.0 (1593)
mbanting Oct 31, 2024
b2af586
fix: Revert "chore: add applets refresh after answers submission (#88…
farmerpaul Oct 31, 2024
ce1c323
fix: Self-report assessments started by notification (M2-8144, M2-816…
farmerpaul Oct 31, 2024
8e6a21f
fix: Fix clearing of one-time-completion manual self-report assessmen…
farmerpaul Nov 1, 2024
bafa408
chore: bump version 2.5.1 (1596)
mbanting Nov 6, 2024
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
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ android {
applicationId "lab.childmindinstitute.data"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1592
versionName "2.5.0"
versionCode 1596
versionName "2.5.1"
resValue "string", "app_name", "Mindlogger"
resValue "string", "build_config_package", "lab.childmindinstitute.data"
manifestPlaceholders = [
Expand Down
48 changes: 24 additions & 24 deletions ios/MindloggerMobile.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,7 +1667,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
Expand All @@ -1679,7 +1679,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"-ObjC",
"-lc++",
Expand All @@ -1698,15 +1698,15 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
INFOPLIST_FILE = MindloggerMobileTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"-ObjC",
"-lc++",
Expand All @@ -1728,7 +1728,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
ENABLE_BITCODE = NO;
Expand All @@ -1739,7 +1739,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1769,7 +1769,7 @@
CODE_SIGN_ENTITLEMENTS = MindloggerMobile/MindloggerMobileRelease.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
INFOPLIST_FILE = MindloggerMobile/Info.plist;
Expand All @@ -1779,7 +1779,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1979,7 +1979,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
ENABLE_BITCODE = NO;
Expand All @@ -1990,7 +1990,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -2019,7 +2019,7 @@
CODE_SIGN_ENTITLEMENTS = MindloggerMobileDevRelease.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
INFOPLIST_FILE = "MindloggerMobile dev-Info.plist";
Expand All @@ -2029,7 +2029,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -2058,7 +2058,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
ENABLE_BITCODE = NO;
Expand All @@ -2069,7 +2069,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -2099,7 +2099,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
INFOPLIST_FILE = "MindloggerMobile qa-Info.plist";
Expand All @@ -2109,7 +2109,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -2136,7 +2136,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = MindloggerMobileStagingDebug.entitlements;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
ENABLE_BITCODE = NO;
Expand All @@ -2147,7 +2147,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -2176,7 +2176,7 @@
CODE_SIGN_ENTITLEMENTS = MindloggerMobileStagingRelease.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
INFOPLIST_FILE = "MindloggerMobile staging-Info.plist";
Expand All @@ -2186,7 +2186,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -2215,7 +2215,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
ENABLE_BITCODE = NO;
Expand All @@ -2226,7 +2226,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -2256,7 +2256,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1592;
CURRENT_PROJECT_VERSION = 1596;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
INFOPLIST_FILE = "MindloggerMobile uat-Info.plist";
Expand All @@ -2266,7 +2266,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.5.0;
MARKETING_VERSION = 2.5.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mindlogger-mobile",
"version": "2.5.0",
"version": "2.5.1",
"private": true,
"scripts": {
"android": "yarn android:dev",
Expand Down
10 changes: 9 additions & 1 deletion src/entities/notification/model/factory/NotificationBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,18 @@ export class NotificationBuilder implements INotificationBuilder {

for (const eventEntity of this.eventEntities) {
try {
const { assignment } = eventEntity;

// Normalize target subject ID to null for self-reports
const targetSubjectId =
assignment && assignment.target.id !== assignment.respondent.id
? assignment.target.id
: null;

const eventNotifications = this.processEvent(
eventEntity.event,
eventEntity.entity,
eventEntity.assignment?.target.id || null,
targetSubjectId,
);
eventNotificationsResult.push(eventNotifications);
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion src/features/tap-on-notification/model/hooks/useOnNotificationTap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export function useOnNotificationTap({
entityType,
eventId!,
entityName!,
targetSubjectId!,
targetSubjectId ?? null,
);
},
executing ? GoBackDuration : WorkaroundDuration,
Expand Down
Loading