diff --git a/android/app/build.gradle b/android/app/build.gradle
index 27409cf6a..822f1f861 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -144,7 +144,7 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 417
+ versionCode 419
versionName "2.0.0"
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/app/screens/edit_profile/components/edit_profile_picture.tsx b/app/screens/edit_profile/components/edit_profile_picture.tsx
index 1daef07ac..a7a2c3745 100644
--- a/app/screens/edit_profile/components/edit_profile_picture.tsx
+++ b/app/screens/edit_profile/components/edit_profile_picture.tsx
@@ -11,7 +11,6 @@ import {useServerUrl} from '@context/server';
import {useTheme} from '@context/theme';
import useDidUpdate from '@hooks/did_update';
import NetworkManager from '@managers/network_manager';
-import {dismissBottomSheet} from '@screens/navigation';
import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
import ProfileImagePicker from './profile_image_picker';
@@ -81,7 +80,6 @@ const EditProfilePicture = ({user, onUpdateProfilePicture}: ChangeProfilePicture
setPictureUrl(pUrl);
onUpdateProfilePicture({isRemoved, localPath});
- dismissBottomSheet();
}, [onUpdateProfilePicture]);
const pictureSource = useMemo(() => {
diff --git a/app/screens/edit_profile/components/panel_item.tsx b/app/screens/edit_profile/components/panel_item.tsx
index dfb66a6e2..8f62373dd 100644
--- a/app/screens/edit_profile/components/panel_item.tsx
+++ b/app/screens/edit_profile/components/panel_item.tsx
@@ -6,6 +6,7 @@ import {useIntl} from 'react-intl';
import DocumentPicker from 'react-native-document-picker';
import SlideUpPanelItem from '@components/slide_up_panel_item';
+import {dismissBottomSheet} from '@screens/navigation';
import type {MessageDescriptor} from '@formatjs/intl/src/types';
import type PickerUtil from '@utils/file/file_picker';
@@ -31,25 +32,35 @@ const PanelItem = ({pickerAction, pictureUtils, onRemoveProfileImage}: PanelItem
const panelTypes = useMemo(() => ({
takePhoto: {
icon: 'camera-outline',
- onPress: () => pictureUtils?.attachFileFromCamera(),
+ onPress: async () => {
+ await dismissBottomSheet();
+ pictureUtils?.attachFileFromCamera();
+ },
testID: 'attachment.takePhoto',
text: {id: 'mobile.file_upload.camera_photo', defaultMessage: 'Take Photo'},
},
browsePhotoLibrary: {
icon: 'file-generic-outline',
- onPress: () => pictureUtils?.attachFileFromPhotoGallery(),
+ onPress: async () => {
+ await dismissBottomSheet();
+ pictureUtils?.attachFileFromPhotoGallery();
+ },
testID: 'attachment.browsePhotoLibrary',
text: {id: 'mobile.file_upload.library', defaultMessage: 'Photo Library'},
},
browseFiles: {
icon: 'file-multiple-outline',
- onPress: () => pictureUtils?.attachFileFromFiles(DocumentPicker.types.images),
+ onPress: async () => {
+ await dismissBottomSheet();
+ pictureUtils?.attachFileFromFiles(DocumentPicker.types.images);
+ },
testID: 'attachment.browseFiles',
text: {id: 'mobile.file_upload.browse', defaultMessage: 'Browse Files'},
},
removeProfilePicture: {
icon: 'trash-can-outline',
- onPress: () => {
+ onPress: async () => {
+ await dismissBottomSheet();
return onRemoveProfileImage && onRemoveProfileImage();
},
testID: 'attachment.removeImage',
diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock
index 0986b0f80..931aa971e 100644
--- a/fastlane/Gemfile.lock
+++ b/fastlane/Gemfile.lock
@@ -8,8 +8,8 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
- aws-partitions (1.611.0)
- aws-sdk-core (3.131.4)
+ aws-partitions (1.618.0)
+ aws-sdk-core (3.132.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -37,7 +37,7 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.92.4)
- faraday (1.10.0)
+ faraday (1.10.1)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
- fastlane (2.208.0)
+ fastlane (2.209.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@@ -126,7 +126,7 @@ GEM
google-apis-core (>= 0.7, < 2.a)
google-apis-playcustomapp_v1 (0.10.0)
google-apis-core (>= 0.7, < 2.a)
- google-apis-storage_v1 (0.18.0)
+ google-apis-storage_v1 (0.17.0)
google-apis-core (>= 0.7, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
@@ -134,11 +134,11 @@ GEM
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.2.0)
- google-cloud-storage (1.37.0)
+ google-cloud-storage (1.38.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
- google-apis-storage_v1 (~> 0.1)
+ google-apis-storage_v1 (~> 0.17.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index b99bf18e1..5f0c668f5 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -1043,7 +1043,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 417;
+ CURRENT_PROJECT_VERSION = 419;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
@@ -1087,7 +1087,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 417;
+ CURRENT_PROJECT_VERSION = 419;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
@@ -1230,7 +1230,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 417;
+ CURRENT_PROJECT_VERSION = 419;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1281,7 +1281,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 417;
+ CURRENT_PROJECT_VERSION = 419;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
GCC_C_LANGUAGE_STANDARD = gnu11;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index 020440b11..ff73b7578 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -37,7 +37,7 @@
CFBundleVersion
- 417
+ 419
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index 7078bd458..e01f56ef8 100644
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -21,7 +21,7 @@
CFBundleShortVersionString
2.0.0
CFBundleVersion
- 417
+ 419
UIAppFonts
OpenSans-Bold.ttf
diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist
index e76236350..c743aa059 100644
--- a/ios/NotificationService/Info.plist
+++ b/ios/NotificationService/Info.plist
@@ -21,7 +21,7 @@
CFBundleShortVersionString
2.0.0
CFBundleVersion
- 417
+ 419
NSExtension
NSExtensionPointIdentifier