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

Merge Develop to Master for 5.4.9 #2330

Merged
merged 6 commits into from
Jan 15, 2024
Merged

Merge Develop to Master for 5.4.9 #2330

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
d97ab59
Change screen
Jan 15, 2024
497b173
Update screen to navigate
Jan 15, 2024
0ecb8a4
Fix lint error
Jan 15, 2024
48e744f
Merge pull request #2328 from CruGlobal/fix/sign-in-bug
rossellemabunga Jan 15, 2024
7e81185
Bump version to 5.4.9
Jan 15, 2024
b0e8914
Merge pull request #2329 from CruGlobal/v5.4.9
rossellemabunga Jan 15, 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
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ios/MissionHub.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/routes/groups/joinCommunityUnauthenticatedFlow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading