Merge pull request #2330 from CruGlobal/develop

Merge Develop to Master for 5.4.9
CruGlobal · Jan 15, 2024 · ca8ce90 · ca8ce90
2 parents 946b127 + b0e8914
commit ca8ce90
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -141,7 +141,7 @@ android {
         applicationId "com.missionhub"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "5.4.7"
+        versionName "5.4.9"
         versionCode grgit.log(includes:['HEAD']).size() + 363
 
         // Enable multidex for apps with over 64K lines

diff --git a/ios/MissionHub.xcodeproj/project.pbxproj b/ios/MissionHub.xcodeproj/project.pbxproj
@@ -703,7 +703,7 @@
 					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 5.4.8;
+				MARKETING_VERSION = 5.4.9;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.missionhub;
 				PRODUCT_NAME = MissionHub;
@@ -811,7 +811,7 @@
 					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 5.4.8;
+				MARKETING_VERSION = 5.4.9;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.missionhub;
 				PRODUCT_NAME = MissionHub;

diff --git a/src/routes/groups/joinCommunityUnauthenticatedFlow.ts b/src/routes/groups/joinCommunityUnauthenticatedFlow.ts
@@ -2,17 +2,17 @@ import { createStackNavigator } from 'react-navigation-stack';
 
 import { navigateNestedReset } from '../../actions/navigation';
 import { COMMUNITIES_TAB, MAIN_TABS } from '../../constants';
-import { JOIN_GROUP_SCREEN } from '../../containers/Groups/JoinGroupScreen';
 import { authFlowGenerator } from '../auth/authFlowGenerator';
 import { SIGNUP_TYPES } from '../../containers/Auth/SignUpScreen';
+import { JOIN_BY_CODE_FLOW } from '../constants';
 
 const JoinCommunityUnauthenticatedFlowScreens = authFlowGenerator({
   completeAction: navigateNestedReset([
     {
       routeName: MAIN_TABS,
       tabName: COMMUNITIES_TAB,
     },
-    { routeName: JOIN_GROUP_SCREEN },
+    { routeName: JOIN_BY_CODE_FLOW },
   ]),
   includeSignUp: true,
   // @ts-ignore