Merge branch 'main' of https://github.com/mattermost/mattermost-mobile into MM-42835

app/constants/deep_linking.ts

@@ -8,6 +8,7 @@ const DeepLinkType = {
     Invalid: 'invalid',
     Permalink: 'permalink',
     Plugin: 'plugin',
+    Redirect: '_redirect',
 } as const;
 
 export default DeepLinkType;

app/constants/events.ts

@@ -9,7 +9,6 @@ export default keyMirror({
     CHANNEL_SWITCH: null,
     CLOSE_BOTTOM_SHEET: null,
     CONFIG_CHANGED: null,
-    FETCHING_POSTS: null,
     FREEZE_SCREEN: null,
     GALLERY_ACTIONS: null,
     LEAVE_CHANNEL: null,

app/constants/launch.ts

@@ -3,6 +3,7 @@
 
 const LaunchType = {
     AddServer: 'add-server',
+    AddServerFromDeepLink: 'add-server-deeplink',
     Normal: 'normal',
     DeepLink: 'deeplink',
     Notification: 'notification',

app/constants/reaction_picker.ts

@@ -11,7 +11,7 @@ export const DEFAULT_EMOJIS = [
 ];
 export const LARGE_ICON_SIZE = 32;
 export const LARGE_CONTAINER_SIZE = 48;
-export const REACTION_PICKER_HEIGHT = 72;
+export const REACTION_PICKER_HEIGHT = 48;
 export const SMALL_CONTAINER_SIZE = 44;
 export const SMALL_ICON_BREAKPOINT = 410;
 export const SMALL_ICON_SIZE = 28;

app/constants/screens.ts

@@ -30,6 +30,7 @@ export const INTEGRATION_SELECTOR = 'IntegrationSelector';
 export const INTERACTIVE_DIALOG = 'InteractiveDialog';
 export const INVITE = 'Invite';
 export const IN_APP_NOTIFICATION = 'InAppNotification';
+export const JOIN_TEAM = 'JoinTeam';
 export const LATEX = 'Latex';
 export const LOGIN = 'Login';
 export const MENTIONS = 'Mentions';
@@ -96,6 +97,7 @@ export default {
     INTERACTIVE_DIALOG,
     INVITE,
     IN_APP_NOTIFICATION,
+    JOIN_TEAM,
     LATEX,
     LOGIN,
     MENTIONS,

app/constants/server_errors.ts

@@ -6,4 +6,5 @@ export default {
     TOWN_SQUARE_READ_ONLY_ERROR: 'api.post.create_post.town_square_read_only',
     PLUGIN_DISMISSED_POST_ERROR: 'plugin.message_will_be_posted.dismiss_post',
     SEND_EMAIL_WITH_DEFAULTS_ERROR: 'api.team.invite_members.unable_to_send_email_with_defaults.app_error',
+    TEAM_MEMBERSHIP_DENIAL_ERROR_ID: 'api.team.add_members.user_denied',
 };

app/constants/websocket.ts

@@ -51,6 +51,8 @@ const WebsocketEvents = {
     THREAD_UPDATED: 'thread_updated',
     THREAD_FOLLOW_CHANGED: 'thread_follow_changed',
     THREAD_READ_CHANGED: 'thread_read_changed',
+    DELETE_TEAM: 'delete_team',
+    RESTORE_TEAM: 'restore_team',
     APPS_FRAMEWORK_REFRESH_BINDINGS: 'custom_com.mattermost.apps_refresh_bindings',
     CALLS_CHANNEL_ENABLED: `custom_${Calls.PluginId}_channel_enable_voice`,
     CALLS_CHANNEL_DISABLED: `custom_${Calls.PluginId}_channel_disable_voice`,