update fastlane

match type
Merge branch 'master' into match
2022-01-13 11:54:00 -03:00 · 2021-10-01 21:14:18 -03:00 · 2021-10-01 21:00:04 -03:00 · 2021-09-30 09:50:44 -03:00 · 2021-09-30 09:34:57 -03:00 · 2021-09-28 11:38:35 -03:00
172 changed files with 13881 additions and 24508 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ executors:
      NODE_ENV: production
      BABEL_ENV: production
    docker:
-      - image: circleci/android:api-29-node
+      - image: circleci/android:api-30-node
    working_directory: ~/mattermost-mobile
    resource_class: <<parameters.resource_class>>

@@ -24,7 +24,7 @@ executors:
      NODE_ENV: production
      BABEL_ENV: production
    macos:
-      xcode: "12.1.0"
+      xcode: "13.0.0"
    working_directory: ~/mattermost-mobile
    shell: /bin/bash --login -o pipefail

--- a/.flowconfig
+++ b/.flowconfig
@@ -23,9 +23,6 @@ node_modules/react-native/flow/
 [options]
 emoji=true

-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
 exact_by_default=true

 module.file_ext=.js
@@ -64,4 +61,4 @@ untyped-import
 untyped-type-import

 [version]
-^0.137.0
+^0.149.0
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -532,6 +532,29 @@ SOFTWARE.

 ---

+## @types/redux-mock-store
+
+This product contains '@types/redux-mock-store' by Redux.
+
+A mock store for testing Redux async action creators and middleware. The mock store will create an array of dispatched actions which serve as an action log for tests.
+
+* HOMEPAGE:
+  * https://github.com/reduxjs/redux-mock-store
+
+* LICENSE: MIT
+
+The MIT License (MIT)
+
+Copyright (c) 2017 Arnaud Benard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
 ## analytics-react-native

 This product contains a modified version of 'analytics-react-native' by Segment.
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -122,17 +122,12 @@ def enableHermes = project.ext.react.get("enableHermes", false);
 android {
    compileSdkVersion rootProject.ext.compileSdkVersion

-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
    defaultConfig {
        applicationId "com.mattermost.rnbeta"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
-        versionCode 369
+        versionCode 370
        versionName "1.47.0"
        multiDexEnabled = true
        testBuildType System.getProperty('testBuildType', 'debug')
@@ -269,7 +264,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
    into 'libs'
 }

--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -57,7 +57,6 @@ private final ReactNativeHost mReactNativeHost =
      // Packages that cannot be auto linked yet can be added manually here, for example:
      // packages.add(new MyReactNativePackage());
      packages.add(new RNNotificationsPackage(MainApplication.this));
-      packages.add(new RNPasteableTextInputPackage());
      packages.add(
        new TurboReactPackage() {
              @Override
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNEditTextOnPasteListener.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNEditTextOnPasteListener.java
@@ -1,7 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.net.Uri;
-
-public interface RNEditTextOnPasteListener {
-    void onPaste(Uri itemUri);
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableActionCallback.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableActionCallback.java
@@ -1,98 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.ActionMode;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-public class RNPasteableActionCallback implements ActionMode.Callback {
-
-    private final RNPasteableEditText mEditText;
-
-    RNPasteableActionCallback(RNPasteableEditText editText) {
-        mEditText = editText;
-    }
-
-    @Override
-    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-        Bundle config = MainApplication.instance.getManagedConfig();
-        if (config != null) {
-            WritableMap result = Arguments.fromBundle(config);
-            String copyPasteProtection = result.getString("copyAndPasteProtection");
-            assert copyPasteProtection != null;
-            if (copyPasteProtection.equals("true")) {
-                disableMenus(menu);
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-        return false;
-    }
-
-    @Override
-    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-        Uri uri = this.getUriInClipboard();
-        if (item.getItemId() == android.R.id.paste && uri != null) {
-            mEditText.getOnPasteListener().onPaste(uri);
-            mode.finish();
-        } else {
-            mEditText.onTextContextMenuItem(item.getItemId());
-        }
-
-        return true;
-    }
-
-    @Override
-    public void onDestroyActionMode(ActionMode mode) {
-
-    }
-
-    private void disableMenus(Menu menu) {
-        for (int i = 0; i < menu.size(); i++) {
-            MenuItem item = menu.getItem(i);
-            int id = item.getItemId();
-            boolean shouldDisableMenu = (
-                id == android.R.id.paste
-                || id == android.R.id.copy
-                || id == android.R.id.cut
-            );
-            item.setEnabled(!shouldDisableMenu);
-        }
-    }
-
-    private Uri getUriInClipboard() {
-        ClipboardManager clipboardManager = (ClipboardManager) mEditText.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData clipData = clipboardManager.getPrimaryClip();
-        if (clipData == null) {
-            return null;
-        }
-
-        ClipData.Item item = clipData.getItemAt(0);
-        if (item == null) {
-            return null;
-        }
-
-        CharSequence chars = item.getText();
-        if (chars == null) {
-            return null;
-        }
-
-        String text = chars.toString(); 
-        if (text.length() > 0) {
-            return null;
-        }
-
-        return item.getUri();
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditText.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditText.java
@@ -1,22 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.Context;
-
-import com.facebook.react.views.textinput.ReactEditText;
-
-public class RNPasteableEditText extends ReactEditText {
-
-    private RNEditTextOnPasteListener mOnPasteListener;
-
-    public RNPasteableEditText(Context context) {
-        super(context);
-    }
-
-    public void setOnPasteListener(RNEditTextOnPasteListener listener) {
-        mOnPasteListener = listener;
-    }
-
-    public RNEditTextOnPasteListener getOnPasteListener() {
-        return mOnPasteListener;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditTextOnPasteListener.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableEditTextOnPasteListener.java
@@ -1,163 +0,0 @@
-package com.mattermost.rnbeta;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.AssetFileDescriptor;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Patterns;
-import android.webkit.MimeTypeMap;
-import android.webkit.URLUtil;
-
-import androidx.annotation.RequiresApi;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.mattermost.share.RealPathUtil;
-import com.mattermost.share.ShareModule;
-
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.regex.Matcher;
-
-public class RNPasteableEditTextOnPasteListener implements RNEditTextOnPasteListener {
-
-    private final RNPasteableEditText mEditText;
-
-    RNPasteableEditTextOnPasteListener(RNPasteableEditText editText) {
-        mEditText = editText;
-    }
-
-    @Override
-    public void onPaste(Uri itemUri) {
-        ReactContext reactContext = (ReactContext)mEditText.getContext();
-        String uri = itemUri.toString();
-
-        WritableArray images = null;
-        WritableMap error = null;
-
-        String uriMimeType = reactContext.getContentResolver().getType(itemUri);
-        if (uriMimeType == null) {
-            return;
-        }
-
-        // Special handle for Google docs
-        if (uri.equals("content://com.google.android.apps.docs.editors.kix.editors.clipboard")) {
-            ClipboardManager clipboardManager = (ClipboardManager) reactContext.getSystemService(Context.CLIPBOARD_SERVICE);
-            ClipData clipData = clipboardManager.getPrimaryClip();
-            if (clipData == null) {
-                return;
-            }
-
-            ClipData.Item item = clipData.getItemAt(0);
-            String htmlText = item.getHtmlText();
-            // Find uri from html
-            Matcher matcher = Patterns.WEB_URL.matcher(htmlText);
-            if (matcher.find()) {
-                uri = htmlText.substring(matcher.start(1), matcher.end());
-            }
-        }
-
-        if (uri.startsWith("http")) {
-            Thread pastImageFromUrlThread = new Thread(new RNPasteableImageFromUrl(reactContext, mEditText, uri));
-            pastImageFromUrlThread.start();
-            return;
-        }
-
-        uri = RealPathUtil.getRealPathFromURI(reactContext, itemUri);
-        if (uri == null) {
-            return;
-        }
-
-        // Get type
-        String extension = MimeTypeMap.getFileExtensionFromUrl(uri);
-        if (extension == null) {
-            return;
-        }
-
-        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-        if (mimeType == null) {
-            return;
-        }
-
-        // Get fileName
-        String fileName = URLUtil.guessFileName(uri, null, mimeType);
-
-        if (uri.contains(ShareModule.CACHE_DIR_NAME) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            uri = moveToImagesCache(uri, fileName);
-        }
-
-        if (uri == null) {
-            return;
-        }
-
-        // Get fileSize
-        long fileSize;
-        try {
-            ContentResolver contentResolver = reactContext.getContentResolver();
-            AssetFileDescriptor assetFileDescriptor = contentResolver.openAssetFileDescriptor(itemUri, "r");
-            if (assetFileDescriptor == null) {
-                return;
-            }
-
-            fileSize = assetFileDescriptor.getLength();
-
-            WritableMap image = Arguments.createMap();
-            image.putString("type", mimeType);
-            image.putDouble("fileSize", fileSize);
-            image.putString("fileName", fileName);
-            image.putString("uri", "file://" + uri);
-
-            images = Arguments.createArray();
-            images.pushMap(image);
-        } catch (FileNotFoundException e) {
-            error = Arguments.createMap();
-            error.putString("message", e.getMessage());
-        }
-
-        WritableMap event = Arguments.createMap();
-        event.putArray("data", images);
-        event.putMap("error", error);
-
-        reactContext
-                .getJSModule(RCTEventEmitter.class)
-                .receiveEvent(
-                        mEditText.getId(),
-                        "onPaste",
-                        event
-                );
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private String moveToImagesCache(String src, String fileName) {
-        ReactContext ctx = (ReactContext)mEditText.getContext();
-        String cacheFolder = ctx.getCacheDir().getAbsolutePath() + "/Images/";
-        String dest = cacheFolder + fileName;
-        File folder = new File(cacheFolder);
-
-        try {
-            if (!folder.exists()) {
-                boolean created = folder.mkdirs();
-                if (!created) {
-                    return null;
-                }
-            }
-
-            Files.move(Paths.get(src), Paths.get(dest));
-        } catch (FileAlreadyExistsException fileError) {
-            // Do nothing and return dest path
-        } catch (Exception err) {
-            return null;
-        }
-
-        return dest;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableImageFromUrl.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableImageFromUrl.java
@@ -1,76 +0,0 @@
-package com.mattermost.rnbeta;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.facebook.react.views.textinput.ReactEditText;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-
-public class RNPasteableImageFromUrl implements Runnable {
-
-    private final ReactContext mContext;
-    private final String mUri;
-    private final ReactEditText mTarget;
-
-    RNPasteableImageFromUrl(ReactContext context, ReactEditText target, String uri) {
-        mContext = context;
-        mUri = uri;
-        mTarget = target;
-    }
-
-    @Override
-    public void run() {
-        WritableArray images = null;
-        WritableMap error = null;
-
-        try {
-            URL url = new URL(mUri);
-            URLConnection u = url.openConnection();
-
-            // Get type
-            String mimeType = u.getHeaderField("Content-Type");
-            if (!mimeType.startsWith("image")) {
-                return;
-            }
-
-            // Get fileSize
-            long fileSize = Long.parseLong(u.getHeaderField("Content-Length"));
-
-            // Get fileName
-            String contentDisposition = u.getHeaderField("Content-Disposition");
-            int startIndex = contentDisposition.indexOf("filename=\"") + 10;
-            int endIndex = contentDisposition.length() - 1;
-            String fileName = contentDisposition.substring(startIndex, endIndex);
-
-            WritableMap image = Arguments.createMap();
-            image.putString("type", mimeType);
-            image.putDouble("fileSize", fileSize);
-            image.putString("fileName", fileName);
-            image.putString("uri", mUri);
-
-            images = Arguments.createArray();
-            images.pushMap(image);
-
-        } catch (IOException e) {
-            error = Arguments.createMap();
-            error.putString("message", e.getMessage());
-        }
-
-        WritableMap event = Arguments.createMap();
-        event.putArray("data", images);
-        event.putMap("error", error);
-
-        mContext
-                .getJSModule(RCTEventEmitter.class)
-                .receiveEvent(
-                        mTarget.getId(),
-                        "onPaste",
-                        event
-                );
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputManager.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputManager.java
@@ -1,85 +0,0 @@
-package com.mattermost.rnbeta;
-
-import androidx.annotation.NonNull;
-import androidx.core.view.inputmethod.EditorInfoCompat;
-import androidx.core.view.inputmethod.InputConnectionCompat;
-import android.text.InputType;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.views.textinput.ReactEditText;
-import com.facebook.react.views.textinput.ReactTextInputManager;
-
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-public class RNPasteableTextInputManager extends ReactTextInputManager {
-
-    @Override
-    @NonNull
-    public String getName() {
-        return "PasteableTextInputAndroid";
-    }
-
-    @Override
-    @NonNull
-    public ReactEditText createViewInstance(ThemedReactContext context) {
-        RNPasteableEditText editText = new RNPasteableEditText(context) {
-            @Override
-            public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
-                final InputConnection ic = super.onCreateInputConnection(editorInfo);
-                EditorInfoCompat.setContentMimeTypes(editorInfo,
-                        new String [] {"image/*"});
-
-
-                final InputConnectionCompat.OnCommitContentListener callback =
-                        (inputContentInfo, flags, opts) -> {
-                            // read and display inputContentInfo asynchronously
-                            if ((flags &
-                                    InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
-                                try {
-                                    inputContentInfo.requestPermission();
-                                }
-                                catch (Exception e) {
-                                    return false;
-                                }
-                            }
-
-                            this.getOnPasteListener().onPaste(inputContentInfo.getContentUri());
-                            return true;
-                        };
-                return InputConnectionCompat.createWrapper(ic, editorInfo, callback);
-            }
-        };
-        int inputType = editText.getInputType();
-        editText.setInputType(inputType & (~InputType.TYPE_TEXT_FLAG_MULTI_LINE));
-        editText.setReturnKeyType("done");
-        editText.setCustomInsertionActionModeCallback(new RNPasteableActionCallback(editText));
-        editText.setCustomSelectionActionModeCallback(new RNPasteableActionCallback(editText));
-        return editText;
-    }
-
-    @Override
-    protected void addEventEmitters(ThemedReactContext reactContext, ReactEditText editText) {
-        super.addEventEmitters(reactContext, editText);
-
-        RNPasteableEditText pasteableEditText = (RNPasteableEditText)editText;
-        pasteableEditText.setOnPasteListener(new RNPasteableEditTextOnPasteListener(pasteableEditText));
-    }
-
-    @Nullable
-    @Override
-    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
-        Map<String, Object> map = super.getExportedCustomBubblingEventTypeConstants();
-        assert map != null;
-        map.put(
-                "onPaste",
-                MapBuilder.of(
-                    "phasedRegistrationNames",
-                    MapBuilder.of("bubbled", "onPaste")));
-        return map;
-    }
-}
--- a/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputPackage.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/RNPasteableTextInputPackage.java
@@ -1,28 +0,0 @@
-package com.mattermost.rnbeta;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-public class RNPasteableTextInputPackage implements ReactPackage {
-    @Nonnull
-    @Override
-    public List<NativeModule> createNativeModules(@Nonnull ReactApplicationContext reactContext) {
-        return Collections.emptyList();
-    }
-
-    @Nonnull
-    @Override
-    public List<ViewManager> createViewManagers(@Nonnull ReactApplicationContext reactContext) {
-        return Arrays.asList(
-                new RNPasteableTextInputManager()
-        );
-    }
-}
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,15 +2,15 @@

 buildscript {
    ext {
-        buildToolsVersion = "29.0.3"
+        buildToolsVersion = "30.0.2"
        minSdkVersion = 24
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 30
+        targetSdkVersion = 30
        supportLibVersion = "28.0.0"
-        kotlinVersion = "1.3.61"
+        kotlinVersion = "1.5.30"
        firebaseVersion = "21.0.0"
        RNNKotlinVersion = kotlinVersion
-        ndkVersion = "21.1.6352462"
+        ndkVersion = "20.1.5948944"
 
    }
    repositories {
@@ -20,7 +20,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
        classpath 'com.google.gms:google-services:4.2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -30,4 +30,4 @@ android.useAndroidX=true
 android.enableJetifier=true

 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.75.1
+FLIPPER_VERSION=0.93.0
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
--- a/app/actions/navigation/index.js
+++ b/app/actions/navigation/index.js
@@ -457,6 +457,13 @@ export function showOverlay(name, passProps, options = {}) {
        overlay: {
            interceptTouchOutside: false,
        },
+        ...Platform.select({
+            android: {
+                statusBar: {
+                    drawBehind: true,
+                },
+            },
+        }),
    };

    Navigation.showOverlay({
--- a/app/actions/websocket/apps.ts
+++ b/app/actions/websocket/apps.ts
@@ -1,7 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {fetchAppBindings} from '@mm-redux/actions/apps';
+import {fetchAppBindings, fetchThreadAppBindings} from '@mm-redux/actions/apps';
+import {getThreadAppsBindingsChannelId} from '@mm-redux/selectors/entities/apps';
 import {getCurrentChannelId} from '@mm-redux/selectors/entities/common';
 import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
 import {ActionResult, DispatchFunc, GetStateFunc} from '@mm-redux/types/actions';
@@ -10,9 +11,17 @@ import {appsEnabled} from '@utils/apps';
 export function handleRefreshAppsBindings() {
    return (dispatch: DispatchFunc, getState: GetStateFunc): ActionResult => {
        const state = getState();
-        if (appsEnabled(state)) {
-            dispatch(fetchAppBindings(getCurrentUserId(state), getCurrentChannelId(state)));
+        if (!appsEnabled(state)) {
+            return {data: true};
        }
+
+        dispatch(fetchAppBindings(getCurrentUserId(state), getCurrentChannelId(state)));
+
+        const threadChannelID = getThreadAppsBindingsChannelId(state);
+        if (threadChannelID) {
+            dispatch(fetchThreadAppBindings(getCurrentUserId(state), threadChannelID));
+        }
+
        return {data: true};
    };
 }
--- a/app/actions/websocket/channels.test.js
+++ b/app/actions/websocket/channels.test.js
@@ -36,7 +36,7 @@ describe('Websocket Chanel Events', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
--- a/app/actions/websocket/general.test.js
+++ b/app/actions/websocket/general.test.js
@@ -28,7 +28,7 @@ describe('Websocket General Events', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
--- a/app/actions/websocket/integrations.test.js
+++ b/app/actions/websocket/integrations.test.js
@@ -26,7 +26,7 @@ describe('Websocket Integration Events', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
--- a/app/actions/websocket/posts.test.js
+++ b/app/actions/websocket/posts.test.js
@@ -34,7 +34,7 @@ describe('Websocket Post Events', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
--- a/app/actions/websocket/reactions.test.js
+++ b/app/actions/websocket/reactions.test.js
@@ -26,7 +26,7 @@ describe('Websocket Reaction Events', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
--- a/app/actions/websocket/teams.test.js
+++ b/app/actions/websocket/teams.test.js
@@ -35,7 +35,7 @@ describe('Websocket Team Events', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
--- a/app/actions/websocket/users.test.js
+++ b/app/actions/websocket/users.test.js
@@ -33,7 +33,7 @@ describe('Websocket User Events', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
--- a/app/actions/websocket/websocket.test.js
+++ b/app/actions/websocket/websocket.test.js
@@ -64,7 +64,7 @@ describe('Actions.Websocket', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        mockServer.stop();
        await TestHelper.tearDown();
    });
@@ -166,7 +166,7 @@ describe('Actions.Websocket doReconnect', () => {
    });

    afterAll(async () => {
-        Actions.close()();
+        Actions.close();
        await TestHelper.tearDown();
    });

@@ -373,7 +373,7 @@ describe('Actions.Websocket notVisibleUsersActions', () => {
    const user4 = TestHelper.fakeUserWithId();
    const user5 = TestHelper.fakeUserWithId();

-    it('should do nothing if the known users and the profiles list are the same', async () => {
+    it.skip('should do nothing if the known users and the profiles list are the same', async () => {
        const profiles = {
            [me.id]: me,
            [user.id]: user,
@@ -397,7 +397,7 @@ describe('Actions.Websocket notVisibleUsersActions', () => {
        expect(actions.length).toEqual(0);
    });

-    it('should do nothing if there are known users in my memberships but not in the profiles list', async () => {
+    it.skip('should do nothing if there are known users in my memberships but not in the profiles list', async () => {
        const profiles = {
            [me.id]: me,
            [user3.id]: user3,
@@ -419,7 +419,7 @@ describe('Actions.Websocket notVisibleUsersActions', () => {
        expect(actions.length).toEqual(0);
    });

-    it('should remove the users if there are unknown users in the profiles list', async () => {
+    it.skip('should remove the users if there are unknown users in the profiles list', async () => {
        const profiles = {
            [me.id]: me,
            [user.id]: user,
@@ -502,7 +502,7 @@ describe('Actions.Websocket handleUserTypingEvent', () => {

        const expectedActionsTypes = [
            WebsocketEvents.TYPING,
-            UserTypes.RECEIVED_STATUSES,
+            'BATCHING_REDUCER.BATCH',
        ];

        await testStore.dispatch(Actions.handleUserTypingEvent(msg));
--- a/app/client/rest/posts.ts
+++ b/app/client/rest/posts.ts
@@ -250,8 +250,13 @@ const ClientPosts = (superclass: any) => class extends superclass {
    searchPostsWithParams = async (teamId: string, params: any) => {
        analytics.trackAPI('api_posts_search', {team_id: teamId});

+        let route = `${this.getPostsRoute()}/search`;
+        if (teamId) {
+            route = `${this.getTeamRoute(teamId)}/posts/search`;
+        }
+
        return this.doFetch(
-            `${this.getTeamRoute(teamId)}/posts/search`,
+            route,
            {method: 'post', body: JSON.stringify(params)},
        );
    };
--- a/app/client/rest/users.ts
+++ b/app/client/rest/users.ts
@@ -104,7 +104,6 @@ const ClientUsers = (superclass: any) => class extends superclass {

    getKnownUsers = async () => {
        analytics.trackAPI('api_get_known_users');
-
        return this.doFetch(
            `${this.getUsersRoute()}/known`,
            {method: 'get'},
--- a/app/components/attachment_button/index.js
+++ b/app/components/attachment_button/index.js
@@ -232,7 +232,7 @@ export default class AttachmentButton extends PureComponent {

        if (hasPermission) {
            try {
-                const res = await DocumentPicker.pick({type: [browseFileTypes]});
+                const res = await DocumentPicker.pickSingle({type: [browseFileTypes]});
                emmProvider.inBackgroundSince = null;
                if (Platform.OS === 'android') {
                    // For android we need to retrieve the realPath in case the file being imported is from the cloud
--- a/app/components/autocomplete/emoji_suggestion/snapshots/emoji_suggestion.test.js.snap
+++ b/app/components/autocomplete/emoji_suggestion/snapshots/emoji_suggestion.test.js.snap
@@ -2341,7 +2341,6 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
      "zzz",
    ]
  }
-  disableVirtualization={false}
  extraData={
    Object {
      "active": true,
@@ -4682,19 +4681,14 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
      ],
    }
  }
-  horizontal={false}
  initialListSize={10}
-  initialNumToRender={10}
  keyExtractor={[Function]}
  keyboardShouldPersistTaps="always"
-  maxToRenderPerBatch={10}
  nestedScrollEnabled={false}
  numColumns={1}
-  onEndReachedThreshold={2}
  pageSize={10}
  removeClippedSubviews={true}
  renderItem={[Function]}
-  scrollEventThrottle={50}
  style={
    Array [
      Object {
@@ -4708,7 +4702,5 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
    ]
  }
  testID="emoji_suggestion.list"
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 />
 `;
--- a/app/components/autocomplete/slash_suggestion/snapshots/slash_suggestion.test.tsx.snap
+++ b/app/components/autocomplete/slash_suggestion/snapshots/slash_suggestion.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`components/autocomplete/slash_suggestion should match snapshot 1`] = `
      },
    ]
  }
-  disableVirtualization={false}
  extraData={
    Object {
      "active": true,
@@ -29,17 +28,12 @@ exports[`components/autocomplete/slash_suggestion should match snapshot 1`] = `
      "lastCommandRequest": 1234,
    }
  }
-  horizontal={false}
-  initialNumToRender={10}
  keyExtractor={[Function]}
  keyboardShouldPersistTaps="always"
-  maxToRenderPerBatch={10}
  nestedScrollEnabled={false}
  numColumns={1}
-  onEndReachedThreshold={2}
  removeClippedSubviews={true}
  renderItem={[Function]}
-  scrollEventThrottle={50}
  style={
    Array [
      Object {
@@ -54,7 +48,5 @@ exports[`components/autocomplete/slash_suggestion should match snapshot 1`] = `
    ]
  }
  testID="slash_suggestion.list"
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 />
 `;
--- a/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser.test.ts
+++ b/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser.test.ts
@@ -33,7 +33,11 @@ describe('AppCommandParser', () => {
            ...reduxTestState,
            entities: {
                ...reduxTestState.entities,
-                apps: {bindings},
+                apps: {
+                    bindings,
+                    threadBindings: bindings,
+                    threadBindingsForms: {},
+                },
            },
        } as any;
        const testStore = await mockStore(initialState);
@@ -415,6 +419,60 @@ describe('AppCommandParser', () => {
                command: '/jira issue create --project == test',
                submit: {expectError: 'Multiple `=` signs are not allowed.'},
            },
+            {
+                title: 'rest field',
+                command: '/jira issue rest hello world',
+                autocomplete: {verify: (parsed: ParsedCommand): void => {
+                    expect(parsed.state).toBe(ParseState.Rest);
+                    expect(parsed.binding?.label).toBe('rest');
+                    expect(parsed.incomplete).toBe('hello world');
+                    expect(parsed.values?.summary).toBe(undefined);
+                }},
+                submit: {verify: (parsed: ParsedCommand): void => {
+                    expect(parsed.state).toBe(ParseState.Rest);
+                    expect(parsed.binding?.label).toBe('rest');
+                    expect(parsed.values?.summary).toBe('hello world');
+                }},
+            },
+            {
+                title: 'rest field with other field',
+                command: '/jira issue rest --verbose true hello world',
+                autocomplete: {verify: (parsed: ParsedCommand): void => {
+                    expect(parsed.state).toBe(ParseState.Rest);
+                    expect(parsed.binding?.label).toBe('rest');
+                    expect(parsed.incomplete).toBe('hello world');
+                    expect(parsed.values?.summary).toBe(undefined);
+                    expect(parsed.values?.verbose).toBe('true');
+                }},
+                submit: {verify: (parsed: ParsedCommand): void => {
+                    expect(parsed.state).toBe(ParseState.Rest);
+                    expect(parsed.binding?.label).toBe('rest');
+                    expect(parsed.values?.summary).toBe('hello world');
+                    expect(parsed.values?.verbose).toBe('true');
+                }},
+            },
+            {
+                title: 'rest field as flag with other field',
+                command: '/jira issue rest --summary "hello world" --verbose true',
+                autocomplete: {verify: (parsed: ParsedCommand): void => {
+                    expect(parsed.state).toBe(ParseState.EndValue);
+                    expect(parsed.binding?.label).toBe('rest');
+                    expect(parsed.incomplete).toBe('true');
+                    expect(parsed.values?.summary).toBe('hello world');
+                    expect(parsed.values?.verbose).toBe(undefined);
+                }},
+                submit: {verify: (parsed: ParsedCommand): void => {
+                    expect(parsed.state).toBe(ParseState.EndValue);
+                    expect(parsed.binding?.label).toBe('rest');
+                    expect(parsed.values?.summary).toBe('hello world');
+                    expect(parsed.values?.verbose).toBe('true');
+                }},
+            },
+            {
+                title: 'error: rest after rest field flag',
+                command: '/jira issue rest --summary "hello world" --verbose true hello world',
+                submit: {expectError: 'Unable to identify argument.'},
+            },
        ];

        table.forEach((tc) => {
@@ -504,6 +562,13 @@ describe('AppCommandParser', () => {
                    IconData: 'Create icon',
                    Description: 'Create a new Jira issue',
                },
+                {
+                    Suggestion: 'rest',
+                    Complete: 'jira issue rest',
+                    Hint: 'rest hint',
+                    IconData: 'rest icon',
+                    Description: 'rest description',
+                },
            ]);
        });

@@ -524,6 +589,14 @@ describe('AppCommandParser', () => {
                    IconData: 'Create icon',
                    Description: 'Create a new Jira issue',
                },
+                {
+                    Suggestion: 'rest',
+                    Complete: 'JiRa IsSuE rest',
+                    Hint: 'rest hint',
+                    IconData: 'rest icon',
+                    Description: 'rest description',
+                },
+
            ]);
        });

@@ -855,7 +928,7 @@ describe('AppCommandParser', () => {
            context: {
                app_id: 'jira',
                channel_id: 'current_channel_id',
-                location: '/command',
+                location: '/command/jira/issue/create',
                root_id: 'root_id',
                team_id: 'team_id',
            },
--- a/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser.ts
+++ b/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser.ts
@@ -4,6 +4,7 @@
 /* eslint-disable max-lines */

 import {
+    AppsTypes,
    AppCallRequest,
    AppBinding,
    AppField,
@@ -32,7 +33,6 @@ import {
    EXECUTE_CURRENT_COMMAND_ITEM_ID,
    COMMAND_SUGGESTION_ERROR,
    getExecuteSuggestion,
-    displayError,
    createCallRequest,
    selectUserByUsername,
    getUserByUsername,
@@ -45,10 +45,13 @@ import {
    filterEmptyOptions,
    autocompleteUsersInChannel,
    autocompleteChannels,
-    ExtendedAutocompleteSuggestion,
    getChannelSuggestions,
    getUserSuggestions,
    inTextMentionSuggestions,
+    ExtendedAutocompleteSuggestion,
+    getAppCommandForm,
+    getAppRHSCommandForm,
+    makeRHSAppBindingSelector,
 } from './app_command_parser_dependencies';

 export interface Store {
@@ -74,6 +77,7 @@ export enum ParseState {
    EndQuotedValue = 'EndQuotedValue',
    EndTickedValue = 'EndTickedValue',
    Error = 'Error',
+    Rest = 'Rest',
 }

 interface FormsCache {
@@ -85,6 +89,7 @@ interface Intl {
 }

 const getCommandBindings = makeAppBindingsSelector(AppBindingLocations.COMMAND);
+const getRHSCommandBindings = makeRHSAppBindingSelector(AppBindingLocations.COMMAND);

 export class ParsedCommand {
    state = ParseState.Start;
@@ -299,12 +304,20 @@ export class ParsedCommand {
                    // Positional parameter.
                    this.position++;
                    // eslint-disable-next-line no-loop-func
-                    const field = fields.find((f: AppField) => f.position === this.position);
+                    let field = fields.find((f: AppField) => f.position === this.position);
                    if (!field) {
-                        return this.asError(this.intl.formatMessage({
-                            id: 'apps.error.parser.no_argument_pos_x',
-                            defaultMessage: 'Unable to identify argument.',
-                        }));
+                        field = fields.find((f) => f.position === -1 && f.type === AppFieldTypes.TEXT);
+                        if (!field || this.values[field.name]) {
+                            return this.asError(this.intl.formatMessage({
+                                id: 'apps.error.parser.no_argument_pos_x',
+                                defaultMessage: 'Unable to identify argument.',
+                            }));
+                        }
+                        this.incompleteStart = this.i;
+                        this.incomplete = '';
+                        this.field = field;
+                        this.state = ParseState.Rest;
+                        break;
                    }
                    this.field = field;
                    this.state = ParseState.StartValue;
@@ -314,6 +327,28 @@ export class ParsedCommand {
                break;
            }

+            case ParseState.Rest: {
+                if (!this.field) {
+                    return this.asError(this.intl.formatMessage({
+                        id: 'apps.error.parser.missing_field_value',
+                        defaultMessage: 'Field value is missing.',
+                    }));
+                }
+
+                if (autocompleteMode && c === '') {
+                    return this;
+                }
+
+                if (c === '') {
+                    this.values[this.field.name] = this.incomplete;
+                    return this;
+                }
+
+                this.i++;
+                this.incomplete += c;
+                break;
+            }
+
            case ParseState.ParameterSeparator: {
                this.incompleteStart = this.i;
                switch (c) {
@@ -470,7 +505,7 @@ export class ParsedCommand {
                    if (this.incompleteStart === this.i - 1) {
                        return this.asError(this.intl.formatMessage({
                            id: 'apps.error.parser.empty_value',
-                            defaultMessage: 'empty values are not allowed',
+                            defaultMessage: 'Empty values are not allowed.',
                        }));
                    }
                    this.i++;
@@ -510,7 +545,7 @@ export class ParsedCommand {
                    if (this.incompleteStart === this.i - 1) {
                        return this.asError(this.intl.formatMessage({
                            id: 'apps.error.parser.empty_value',
-                            defaultMessage: 'empty values are not allowed',
+                            defaultMessage: 'Empty values are not allowed.',
                        }));
                    }
                    this.i++;
@@ -544,13 +579,13 @@ export class ParsedCommand {
                    (!autocompleteMode && this.incomplete !== 'true' && this.incomplete !== 'false'))) {
                    // reset back where the value started, and treat as a new parameter
                    this.i = this.incompleteStart;
-                    this.values![this.field.name] = 'true';
+                    this.values[this.field.name] = 'true';
                    this.state = ParseState.StartParameter;
                } else {
                    if (autocompleteMode && c === '') {
                        return this;
                    }
-                    this.values![this.field.name] = this.incomplete;
+                    this.values[this.field.name] = this.incomplete;
                    this.incomplete = '';
                    this.incompleteStart = this.i;
                    if (c === '') {
@@ -572,8 +607,6 @@ export class AppCommandParser {
    private rootPostID?: string;
    private intl: Intl;

-    forms: {[location: string]: AppForm} = {};
-
    constructor(store: Store|null, intl: Intl, channelID: string, teamID = '', rootPostID = '') {
        this.store = store || getStore() as Store;
        this.channelID = channelID;
@@ -619,57 +652,59 @@ export class AppCommandParser {
    }

    private async addDefaultAndReadOnlyValues(parsed: ParsedCommand) {
-        await Promise.all(parsed.form?.fields?.map(async (f) => {
+        if (!parsed.form?.fields) {
+            return;
+        }
+
+        await Promise.all(parsed.form.fields.map(async (f) => {
            if (!f.value) {
                return;
            }

-            if (!f.readonly || f.name in parsed.values) {
-                return;
-            }
-
-            switch (f.type) {
-            case AppFieldTypes.TEXT:
-                parsed.values[f.name] = f.value as string;
-                break;
-            case AppFieldTypes.BOOL:
-                parsed.values[f.name] = 'true';
-                break;
-            case AppFieldTypes.USER: {
-                const userID = (f.value as AppSelectOption).value;
-                let user = selectUser(this.store.getState(), userID);
-                if (!user) {
-                    const dispatchResult = await this.store.dispatch(getUser(userID));
-                    if ('error' in dispatchResult) {
-                        // Silently fail on default value
-                        break;
+            if (f.readonly || !(f.name in parsed.values)) {
+                switch (f.type) {
+                case AppFieldTypes.TEXT:
+                    parsed.values[f.name] = f.value as string;
+                    break;
+                case AppFieldTypes.BOOL:
+                    parsed.values[f.name] = 'true';
+                    break;
+                case AppFieldTypes.USER: {
+                    const userID = (f.value as AppSelectOption).value;
+                    let user = selectUser(this.store.getState(), userID);
+                    if (!user) {
+                        const dispatchResult = await this.store.dispatch(getUser(userID));
+                        if ('error' in dispatchResult) {
+                            // Silently fail on default value
+                            break;
+                        }
+                        user = dispatchResult.data;
                    }
-                    user = dispatchResult.data;
+                    parsed.values[f.name] = user.username;
+                    break;
                }
-                parsed.values[f.name] = user.username;
-                break;
-            }
-            case AppFieldTypes.CHANNEL: {
-                const channelID = (f.value as AppSelectOption).label;
-                let channel = selectChannel(this.store.getState(), channelID);
-                if (!channel) {
-                    const dispatchResult = await this.store.dispatch(getChannel(channelID));
-                    if ('error' in dispatchResult) {
-                        // Silently fail on default value
-                        break;
+                case AppFieldTypes.CHANNEL: {
+                    const channelID = (f.value as AppSelectOption).label;
+                    let channel = selectChannel(this.store.getState(), channelID);
+                    if (!channel) {
+                        const dispatchResult = await this.store.dispatch(getChannel(channelID));
+                        if ('error' in dispatchResult) {
+                            // Silently fail on default value
+                            break;
+                        }
+                        channel = dispatchResult.data;
                    }
-                    channel = dispatchResult.data;
+                    parsed.values[f.name] = channel.name;
+                    break;
                }
-                parsed.values[f.name] = channel.name;
-                break;
-            }
-            case AppFieldTypes.STATIC_SELECT:
-            case AppFieldTypes.DYNAMIC_SELECT:
-                parsed.values[f.name] = (f.value as AppSelectOption).value;
-                break;
-            case AppFieldTypes.MARKDOWN:
+                case AppFieldTypes.STATIC_SELECT:
+                case AppFieldTypes.DYNAMIC_SELECT:
+                    parsed.values[f.name] = (f.value as AppSelectOption).value;
+                    break;
+                case AppFieldTypes.MARKDOWN:

-                // Do nothing
+                    // Do nothing
+                }
            }
        }) || []);
    }
@@ -926,8 +961,11 @@ export class AppCommandParser {
    // getCommandBindings returns the commands in the redux store.
    // They are grouped by app id since each app has one base command
    private getCommandBindings = (): AppBinding[] => {
-        const bindings = getCommandBindings(this.store.getState());
-        return bindings;
+        const state = this.store.getState();
+        if (this.rootPostID) {
+            return getRHSCommandBindings(state);
+        }
+        return getCommandBindings(state);
    }

    // getChannel gets the channel in which the user is typing the command
@@ -937,9 +975,6 @@ export class AppCommandParser {
    }

    public setChannelContext = (channelID: string, teamID = '', rootPostID?: string) => {
-        if (this.channelID !== channelID || this.rootPostID !== rootPostID || this.teamID !== teamID) {
-            this.forms = {};
-        }
        this.channelID = channelID;
        this.rootPostID = rootPostID;
        this.teamID = teamID;
@@ -981,7 +1016,7 @@ export class AppCommandParser {
        }

        context.channel_id = channel.id;
-        context.team_id = this.teamID || channel.team_id || getCurrentTeamId(this.store.getState());
+        context.team_id = channel.team_id || getCurrentTeamId(this.store.getState());

        return context;
    }
@@ -989,7 +1024,10 @@ export class AppCommandParser {
    // fetchForm unconditionaly retrieves the form for the given binding (subcommand)
    private fetchForm = async (binding: AppBinding): Promise<{form?: AppForm; error?: string} | undefined> => {
        if (!binding.call) {
-            return undefined;
+            return {error: this.intl.formatMessage({
+                id: 'apps.error.parser.missing_call',
+                defaultMessage: 'Missing binding call.',
+            })};
        }

        const payload = createCallRequest(
@@ -1033,28 +1071,25 @@ export class AppCommandParser {
    public getForm = async (location: string, binding: AppBinding): Promise<{form?: AppForm; error?: string} | undefined> => {
        const rootID = this.rootPostID || '';
        const key = `${this.channelID}-${rootID}-${location}`;
-        const form = this.forms[key];
+        const form = this.rootPostID ? getAppRHSCommandForm(this.store.getState(), key) : getAppCommandForm(this.store.getState(), key);
        if (form) {
            return {form};
        }

-        this.forms = {};
        const fetched = await this.fetchForm(binding);
        if (fetched?.form) {
-            this.forms[key] = fetched.form;
+            let actionType: string = AppsTypes.RECEIVED_APP_COMMAND_FORM;
+            if (this.rootPostID) {
+                actionType = AppsTypes.RECEIVED_APP_RHS_COMMAND_FORM;
+            }
+            this.store.dispatch({
+                data: {form: fetched.form, location: key},
+                type: actionType,
+            });
        }
        return fetched;
    }

-    // displayError shows an error that was caught by the parser
-    private displayError = (err: any): void => {
-        let errStr = err as string;
-        if (err.message) {
-            errStr = err.message;
-        }
-        displayError(this.intl, errStr);
-    }
-
    // getSuggestionsForSubCommands returns suggestions for a subcommand's name
    private getCommandSuggestions = (parsed: ParsedCommand): AutocompleteSuggestion[] => {
        if (!parsed.binding?.bindings?.length) {
@@ -1104,6 +1139,14 @@ export class AppCommandParser {
        case ParseState.EndTickedValue:
        case ParseState.TickValue:
            return this.getValueSuggestions(parsed, '`');
+        case ParseState.Rest: {
+            const execute = getExecuteSuggestion(parsed);
+            const value = await this.getValueSuggestions(parsed);
+            if (execute) {
+                return [execute, ...value];
+            }
+            return value;
+        }
        }
        return [];
    }
@@ -1332,11 +1375,11 @@ export class AppCommandParser {
        });
        return [{
            Complete: '',
-            Suggestion: this.intl.formatMessage({
+            Suggestion: '',
+            Hint: this.intl.formatMessage({
                id: 'apps.suggestion.dynamic.error',
                defaultMessage: 'Dynamic select error',
            }),
-            Hint: '',
            IconData: COMMAND_SUGGESTION_ERROR,
            Description: errMsg,
        }];
--- a/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser_dependencies.ts
+++ b/app/components/autocomplete/slash_suggestion/app_command_parser/app_command_parser_dependencies.ts
@@ -2,7 +2,6 @@
 // See LICENSE.txt for license information.

 import {intlShape} from 'react-intl';
-import {Alert} from 'react-native';

 import {getUserByUsername, getUser, autocompleteUsers} from '@mm-redux/actions/users';
 import {getCurrentTeamId, getCurrentTeam} from '@mm-redux/selectors/entities/teams';
@@ -37,6 +36,8 @@ export type {
    DoAppCallResult,
 } from 'types/actions/apps';

+export {AppsTypes} from '@mm-redux/action_types';
+
 export type {AutocompleteSuggestion};

 export type {
@@ -65,7 +66,7 @@ export {
    COMMAND_SUGGESTION_USER,
 } from '@mm-redux/constants/apps';

-export {makeAppBindingsSelector} from '@mm-redux/selectors/entities/apps';
+export {makeAppBindingsSelector, makeRHSAppBindingSelector, getAppCommandForm, getAppRHSCommandForm} from '@mm-redux/selectors/entities/apps';

 export {getPost} from '@mm-redux/selectors/entities/posts';
 export {getChannel as selectChannel, getCurrentChannel, getChannelByName as selectChannelByName} from '@mm-redux/selectors/entities/channels';
@@ -112,14 +113,6 @@ export const getExecuteSuggestion = (_: ParsedCommand): AutocompleteSuggestion |
    return null;
 };

-export const displayError = (intl: typeof intlShape, body: string) => {
-    const title = intl.formatMessage({
-        id: 'mobile.general.error.title',
-        defaultMessage: 'Error',
-    });
-    Alert.alert(title, body);
-};
-
 export const errorMessage = (intl: typeof intlShape, error: string, _command: string, _position: number): string => { // eslint-disable-line @typescript-eslint/no-unused-vars
    return intl.formatMessage({
        id: 'apps.error.parser',
--- a/app/components/autocomplete/slash_suggestion/app_command_parser/tests/app_command_parser_test_data.ts
+++ b/app/components/autocomplete/slash_suggestion/app_command_parser/tests/app_command_parser_test_data.ts
@@ -181,6 +181,37 @@ export const createCommand: AppBinding = {
    } as AppForm,
 };

+export const restCommand: AppBinding = {
+    app_id: 'jira',
+    label: 'rest',
+    location: 'rest',
+    description: 'rest description',
+    icon: 'rest icon',
+    hint: 'rest hint',
+    form: {
+        call: {
+            path: '/create-issue',
+        },
+        fields: [
+            {
+                name: 'summary',
+                label: 'summary',
+                description: 'The Jira issue summary',
+                type: AppFieldTypes.TEXT,
+                hint: 'The thing is working great!',
+                position: -1,
+            },
+            {
+                name: 'verbose',
+                label: 'verbose',
+                description: 'display details',
+                type: AppFieldTypes.BOOL,
+                hint: 'yes or no!',
+            },
+        ],
+    } as AppForm,
+};
+
 export const testBindings: AppBinding[] = [
    {
        app_id: '',
@@ -204,6 +235,7 @@ export const testBindings: AppBinding[] = [
                    bindings: [
                        viewCommand,
                        createCommand,
+                        restCommand,
                    ],
                }],
            },
--- a/app/components/autocomplete/slash_suggestion/app_slash_suggestion/snapshots/app_slash_suggestion.test.tsx.snap
+++ b/app/components/autocomplete/slash_suggestion/app_slash_suggestion/snapshots/app_slash_suggestion.test.tsx.snap
@@ -13,18 +13,12 @@ exports[`components/autocomplete/app_slash_suggestion should match snapshot 1`]
      },
    ]
  }
-  disableVirtualization={false}
-  horizontal={false}
-  initialNumToRender={10}
  keyExtractor={[Function]}
  keyboardShouldPersistTaps="always"
-  maxToRenderPerBatch={10}
  nestedScrollEnabled={false}
  numColumns={1}
-  onEndReachedThreshold={2}
  removeClippedSubviews={true}
  renderItem={[Function]}
-  scrollEventThrottle={50}
  style={
    Array [
      Object {
@@ -39,7 +33,5 @@ exports[`components/autocomplete/app_slash_suggestion should match snapshot 1`]
    ]
  }
  testID="app_slash_suggestion.list"
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 />
 `;
--- a/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.test.tsx
+++ b/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.test.tsx
@@ -27,7 +27,12 @@ const makeStore = async (bindings: AppBinding[]) => {
        ...reduxTestState,
        entities: {
            ...reduxTestState.entities,
-            apps: {bindings},
+            apps: {
+                bindings,
+                bindingsForms: {},
+                threadBindings: bindings,
+                threadBindingsForms: {},
+            },
        },
    } as any;
    const testStore = await mockStore(initialState);
@@ -103,7 +108,7 @@ describe('components/autocomplete/app_slash_suggestion', () => {
        expect(wrapper.state('dataSource')).toEqual([]);
    });

-    test('should show commands from app sub commands', async (done) => {
+    test('should show commands from app sub commands', (done?: jest.DoneCallback) => {
        const props: Props = {
            ...baseProps,
        };
@@ -126,7 +131,9 @@ describe('components/autocomplete/app_slash_suggestion', () => {

        setTimeout(() => {
            expect(wrapper.state('dataSource')).toEqual(expected);
-            done();
+            if (done) {
+                done();
+            }
        });
    });

--- a/app/components/channel_loader/snapshots/channel_loader.test.js.snap
+++ b/app/components/channel_loader/snapshots/channel_loader.test.js.snap
@@ -60,9 +60,7 @@ exports[`ChannelLoader should match snapshot 1`] = `
        }
      >
        <ActivityIndicator
-          animating={true}
          color="#FFFFFF"
-          hidesWhenStopped={true}
          size="small"
        />
      </View>
--- a/app/components/channel_loader/channel_loader.test.js
+++ b/app/components/channel_loader/channel_loader.test.js
@@ -23,6 +23,8 @@ describe('ChannelLoader', () => {

    test('should call setTimeout and setInterval for showIndicator and retryLoad on mount', () => {
        shallow(<ChannelLoader {...baseProps}/>);
+        const setTimeout = jest.spyOn(global, 'setTimeout');
+        const setInterval = jest.spyOn(global, 'setInterval');
        expect(setTimeout).not.toHaveBeenCalled();
        expect(setInterval).not.toHaveBeenCalled();

@@ -42,6 +44,8 @@ describe('ChannelLoader', () => {
            retryLoad: jest.fn(),
        };
        const wrapper = shallow(<ChannelLoader {...props}/>);
+        const clearTimeout = jest.spyOn(global, 'clearTimeout');
+        const clearInterval = jest.spyOn(global, 'clearInterval');
        const instance = wrapper.instance();
        instance.componentWillUnmount();

--- a/app/components/custom_list/snapshots/index.test.js.snap
+++ b/app/components/custom_list/snapshots/index.test.js.snap
@@ -20,15 +20,12 @@ exports[`CustomList should match snapshot with FlatList 1`] = `
      },
    ]
  }
-  disableVirtualization={false}
-  horizontal={false}
  initialNumToRender={15}
  keyExtractor={[Function]}
  keyboardDismissMode="on-drag"
  keyboardShouldPersistTaps="always"
  maxToRenderPerBatch={16}
  numColumns={1}
-  onEndReachedThreshold={2}
  onLayout={[Function]}
  onScroll={[Function]}
  removeClippedSubviews={true}
@@ -41,8 +38,6 @@ exports[`CustomList should match snapshot with FlatList 1`] = `
      "flex": 1,
    }
  }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 />
 `;

@@ -56,16 +51,12 @@ exports[`CustomList should match snapshot with SectionList 1`] = `
      "flexGrow": 1,
    }
  }
-  data={Array []}
-  disableVirtualization={false}
  extraData={false}
-  horizontal={false}
  initialNumToRender={15}
  keyExtractor={[Function]}
  keyboardDismissMode="on-drag"
  keyboardShouldPersistTaps="always"
  maxToRenderPerBatch={16}
-  onEndReachedThreshold={2}
  onLayout={[Function]}
  onScroll={[Function]}
  removeClippedSubviews={true}
@@ -89,8 +80,6 @@ exports[`CustomList should match snapshot with SectionList 1`] = `
      "flex": 1,
    }
  }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 />
 `;

--- a/app/components/custom_status/snapshots/clear_button.test.tsx.snap
+++ b/app/components/custom_status/snapshots/clear_button.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`components/custom_status/clear_button should match snapshot 1`] = `
-<ForwardRef
+<TouchableOpacity
  onPress={[Function]}
  style={
    Array [
@@ -27,5 +27,5 @@ exports[`components/custom_status/clear_button should match snapshot 1`] = `
      }
    }
  />
-</ForwardRef>
+</TouchableOpacity>
 `;
--- a/app/components/emoji_picker/snapshots/emoji_picker.test.js.snap
+++ b/app/components/emoji_picker/snapshots/emoji_picker.test.js.snap
@@ -87,15 +87,10 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
    >
      <SectionList
        ListFooterComponent={[Function]}
-        data={Array []}
-        disableVirtualization={false}
        getItemLayout={[Function]}
-        horizontal={false}
        initialNumToRender={50}
-        keyExtractor={[Function]}
        keyboardDismissMode="interactive"
        keyboardShouldPersistTaps="always"
-        maxToRenderPerBatch={10}
        nativeID="emojiPicker"
        onEndReached={[Function]}
        onEndReachedThreshold={0}
@@ -106,7 +101,6 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
        removeClippedSubviews={true}
        renderItem={[Function]}
        renderSectionHeader={[Function]}
-        scrollEventThrottle={50}
        sections={
          Array [
            Object {
@@ -12888,7 +12882,6 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
          ]
        }
        showsVerticalScrollIndicator={false}
-        stickySectionHeadersEnabled={true}
        style={
          Array [
            Object {},
@@ -12897,8 +12890,6 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
            },
          ]
        }
-        updateCellsBatchingPeriod={50}
-        windowSize={21}
      />
      <KeyboardTrackingView
        normalList={true}
@@ -12926,7 +12917,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
              }
            }
          >
-            <ForwardRef
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -12951,8 +12942,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -12975,8 +12966,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -12999,8 +12990,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -13023,8 +13014,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -13047,8 +13038,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -13071,8 +13062,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -13095,8 +13086,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -13119,8 +13110,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -13143,8 +13134,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
-            <ForwardRef
+            </TouchableOpacity>
+            <TouchableOpacity
              onPress={[Function]}
              style={
                Object {
@@ -13167,7 +13158,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
                  ]
                }
              />
-            </ForwardRef>
+            </TouchableOpacity>
          </View>
        </View>
      </KeyboardTrackingView>
--- a/app/components/emoji_picker/emoji_picker.test.js
+++ b/app/components/emoji_picker/emoji_picker.test.js
@@ -60,17 +60,17 @@ describe('components/emoji_picker/emoji_picker.ios', () => {
    ];

    testCases.forEach((testCase) => {
-        test(`'${testCase.input}' should return '${testCase.output}'`, async () => {
+        test(`'${testCase.input}' should return '${testCase.output}'`, () => {
            expect(filterEmojiSearchInput(testCase.input)).toEqual(testCase.output);
        });
    });

-    test('should match snapshot', async () => {
+    test('should match snapshot', () => {
        const wrapper = shallowWithIntl(<EmojiPicker {...baseProps}/>);
        expect(wrapper.getElement()).toMatchSnapshot();
    });

-    test('searchEmojis should return the right values on fuse', async () => {
+    test('searchEmojis should return the right values on fuse', () => {
        const input = '1';
        const output = ['100', '1234', '1st_place_medal', '+1', '-1', 'clock1', 'clock10', 'clock1030', 'clock11', 'clock1130', 'clock12', 'clock1230', 'clock130', 'u7121', 'u7981'];

@@ -79,7 +79,7 @@ describe('components/emoji_picker/emoji_picker.ios', () => {
        expect(result).toEqual(output);
    });

-    test('should rebuild emojis emojis when emojis change', async () => {
+    test('should rebuild emojis emojis when emojis change', () => {
        const wrapper = shallowWithIntl(<EmojiPicker {...baseProps}/>);
        const instance = wrapper.instance();
        const renderableEmojis = jest.spyOn(instance, 'renderableEmojis');
@@ -92,7 +92,7 @@ describe('components/emoji_picker/emoji_picker.ios', () => {
        expect(renderableEmojis).toHaveBeenCalledWith(baseProps.emojisBySection, baseProps.deviceWidth);
    });

-    test('should set rebuilt emojis when rebuildEmojis is true and searchBarAnimationComplete is true', async () => {
+    test('should set rebuilt emojis when rebuildEmojis is true and searchBarAnimationComplete is true', () => {
        const wrapper = shallowWithIntl(<EmojiPicker {...baseProps}/>);
        const instance = wrapper.instance();
        instance.setState = jest.fn();
@@ -107,7 +107,7 @@ describe('components/emoji_picker/emoji_picker.ios', () => {
        expect(instance.rebuildEmojis).toBe(false);
    });

-    test('should not set rebuilt emojis when rebuildEmojis is false and searchBarAnimationComplete is true', async () => {
+    test('should not set rebuilt emojis when rebuildEmojis is false and searchBarAnimationComplete is true', () => {
        const wrapper = shallowWithIntl(<EmojiPicker {...baseProps}/>);
        const instance = wrapper.instance();
        instance.setState = jest.fn();
@@ -120,7 +120,7 @@ describe('components/emoji_picker/emoji_picker.ios', () => {
        expect(instance.setState).not.toHaveBeenCalled();
    });

-    test('should not set rebuilt emojis when rebuildEmojis is true and searchBarAnimationComplete is false', async () => {
+    test('should not set rebuilt emojis when rebuildEmojis is true and searchBarAnimationComplete is false', () => {
        const wrapper = shallowWithIntl(<EmojiPicker {...baseProps}/>);
        const instance = wrapper.instance();
        instance.setState = jest.fn();
--- a/app/components/global_threads/thread_footer/snapshots/thread_footer.test.tsx.snap
+++ b/app/components/global_threads/thread_footer/snapshots/thread_footer.test.tsx.snap
@@ -51,7 +51,7 @@ exports[`Global Thread Footer Should render for channel view and unfollow the th
  >
    2 replies
  </Text>
-  <ForwardRef
+  <TouchableOpacity
    onPress={[Function]}
    style={
      Object {
@@ -75,7 +75,7 @@ exports[`Global Thread Footer Should render for channel view and unfollow the th
    >
      Following
    </Text>
-  </ForwardRef>
+  </TouchableOpacity>
 </View>
 `;

--- a/app/components/global_threads/thread_item/snapshots/thread_item.test.tsx.snap
+++ b/app/components/global_threads/thread_item/snapshots/thread_item.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`Global Thread Item Should render thread item with unread messages dot 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  testID="thread_item.post1.item"
  underlayColor="rgba(28,88,217,0.08)"
@@ -180,11 +180,11 @@ exports[`Global Thread Item Should render thread item with unread messages dot 1
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`Global Thread Item Should show unread mentions count 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  testID="thread_item.post1.item"
  underlayColor="rgba(28,88,217,0.08)"
@@ -378,5 +378,5 @@ exports[`Global Thread Item Should show unread mentions count 1`] = `
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;
--- a/app/components/global_threads/thread_list/snapshots/index.test.tsx.snap
+++ b/app/components/global_threads/thread_list/snapshots/index.test.tsx.snap
@@ -130,24 +130,18 @@ exports[`Global Thread List Should render threads with functional tabs & mark al
        "thread1",
      ]
    }
-    disableVirtualization={false}
-    horizontal={false}
    initialNumToRender={10}
    keyExtractor={[Function]}
-    maxToRenderPerBatch={10}
    numColumns={1}
    onEndReached={[Function]}
    onEndReachedThreshold={2}
    removeClippedSubviews={true}
    renderItem={[Function]}
-    scrollEventThrottle={50}
    scrollIndicatorInsets={
      Object {
        "right": 1,
      }
    }
-    updateCellsBatchingPeriod={50}
-    windowSize={21}
  />
 </View>
 `;
--- a/app/components/global_threads/thread_list/thread_list_header/snapshots/index.test.tsx.snap
+++ b/app/components/global_threads/thread_list/thread_list_header/snapshots/index.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`Global Thread List Header Should render threads with functional tabs &
  }
 >
  <View>
-    <ForwardRef
+    <TouchableOpacity
      onPress={[MockFunction]}
      testID="thread_list.all_threads"
    >
@@ -33,8 +33,8 @@ exports[`Global Thread List Header Should render threads with functional tabs &
          All Your Threads
        </Text>
      </View>
-    </ForwardRef>
-    <ForwardRef
+    </TouchableOpacity>
+    <TouchableOpacity
      onPress={[MockFunction]}
      testID="thread_list.unread_threads"
    >
@@ -62,10 +62,10 @@ exports[`Global Thread List Header Should render threads with functional tabs &
          />
        </View>
      </View>
-    </ForwardRef>
+    </TouchableOpacity>
  </View>
  <View>
-    <ForwardRef
+    <TouchableOpacity
      disabled={false}
      onPress={[MockFunction]}
      testID="thread_list.mark_all_read"
@@ -78,7 +78,7 @@ exports[`Global Thread List Header Should render threads with functional tabs &
          ]
        }
      />
-    </ForwardRef>
+    </TouchableOpacity>
  </View>
 </View>
 `;
--- a/app/components/image_viewport.tsx
+++ b/app/components/image_viewport.tsx
@@ -4,7 +4,7 @@
 import AsyncStorage from '@react-native-community/async-storage';

 import {PureComponent} from 'react';
-import {Dimensions} from 'react-native';
+import {Dimensions, EmitterSubscription} from 'react-native';

 import {DeviceTypes} from '@constants';
 import mattermostManaged from '@mattermost-managed';
@@ -12,6 +12,7 @@ import EventEmitter from '@mm-redux/utils/event_emitter';

 // TODO: Use permanentSidebar and splitView hooks instead
 export default class ImageViewPort extends PureComponent {
+    dimensionsListener: EmitterSubscription | undefined;
    mounted = false;
    state = {
        isSplitView: false,
@@ -23,13 +24,13 @@ export default class ImageViewPort extends PureComponent {
        this.handlePermanentSidebar();
        this.handleDimensions();
        EventEmitter.on(DeviceTypes.PERMANENT_SIDEBAR_SETTINGS, this.handlePermanentSidebar);
-        Dimensions.addEventListener('change', this.handleDimensions);
+        this.dimensionsListener = Dimensions.addEventListener('change', this.handleDimensions);
    }

    componentWillUnmount() {
        this.mounted = false;
        EventEmitter.off(DeviceTypes.PERMANENT_SIDEBAR_SETTINGS, this.handlePermanentSidebar);
-        Dimensions.removeEventListener('change', this.handleDimensions);
+        this.dimensionsListener?.remove();
    }

    handleDimensions = () => {
--- a/app/components/markdown/markdown_link/markdown_link.js
+++ b/app/components/markdown/markdown_link/markdown_link.js
@@ -9,7 +9,7 @@ import {intlShape} from 'react-intl';
 import {Alert, Text} from 'react-native';
 import urlParse from 'url-parse';

-import {dismissAllModals, popToRoot} from '@actions/navigation';
+import {dismissAllModals, popToRoot, showModal} from '@actions/navigation';
 import Config from '@assets/config';
 import {DeepLinkTypes} from '@constants';
 import {getCurrentServerUrl} from '@init/credentials';
@@ -59,13 +59,20 @@ export default class MarkdownLink extends PureComponent {
        const match = matchDeepLink(url, serverURL, siteURL);

        if (match) {
-            if (match.type === DeepLinkTypes.CHANNEL) {
+            switch (match.type) {
+            case DeepLinkTypes.CHANNEL:
                await handleSelectChannelByName(match.channelName, match.teamName, errorBadChannel, intl);
                await dismissAllModals();
                await popToRoot();
-            } else if (match.type === DeepLinkTypes.PERMALINK) {
+                break;
+            case DeepLinkTypes.PERMALINK: {
                const teamName = match.teamName === PERMALINK_GENERIC_TEAM_NAME_REDIRECT ? currentTeamName : match.teamName;
                showPermalink(intl, teamName, match.postId);
+                break;
+            }
+            case DeepLinkTypes.PLUGIN:
+                showModal('PluginInternal', match.id, {link: url});
+                break;
            }
        } else {
            const onError = () => {
--- a/app/components/markdown/markdown_table/markdown_table.js
+++ b/app/components/markdown/markdown_table/markdown_table.js
@@ -45,14 +45,14 @@ export default class MarkdownTable extends React.PureComponent {
    }

    componentDidMount() {
-        Dimensions.addEventListener('change', this.setMaxPreviewColumns);
+        this.dimensionsListener = Dimensions.addEventListener('change', this.setMaxPreviewColumns);

        const window = Dimensions.get('window');
        this.setMaxPreviewColumns({window});
    }

    componentWillUnmount() {
-        Dimensions.removeEventListener('change', this.setMaxPreviewColumns);
+        this.dimensionsListener?.remove();
    }

    setMaxPreviewColumns = ({window}) => {
--- a/app/components/network_indicator/network.tsx
+++ b/app/components/network_indicator/network.tsx
@@ -181,10 +181,10 @@ const NetworkIndicator = ({
            }
        });

-        AppState.addEventListener('change', handleAppStateChange);
+        const listener = AppState.addEventListener('change', handleAppStateChange);

        return () => {
-            AppState.removeEventListener('change', handleAppStateChange);
+            listener.remove();
            if (clearNotificationTimeout.current && AppState.currentState !== 'active') {
                clearTimeout(clearNotificationTimeout.current);
            }
--- a/app/components/pasteable_text_input/snapshots/index.test.js.snap
+++ b/app/components/pasteable_text_input/snapshots/index.test.js.snap
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PasteableTextInput should render pasteable text input 1`] = `
-<TextInput
-  allowFontScaling={true}
-  onPaste={[Function]}
-  rejectResponderTermination={true}
-  screenId="Channel"
-  underlineColorAndroid="transparent"
->
-  My Text
-</TextInput>
-`;
--- a/app/components/pasteable_text_input/index.js
+++ b/app/components/pasteable_text_input/index.js
@@ -1,77 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import PropTypes from 'prop-types';
-import React from 'react';
-import {NativeEventEmitter, NativeModules, Platform, TextInput} from 'react-native';
-
-import {PASTE_FILES} from '@constants/post_draft';
-import EventEmitter from '@mm-redux/utils/event_emitter';
-
-const {OnPasteEventManager} = NativeModules;
-const OnPasteEventEmitter = new NativeEventEmitter(OnPasteEventManager);
-
-export class PasteableTextInput extends React.PureComponent {
-    static propTypes = {
-        ...TextInput.PropTypes,
-        forwardRef: PropTypes.any,
-        screenId: PropTypes.string.isRequired,
-    }
-
-    componentDidMount() {
-        this.subscription = OnPasteEventEmitter.addListener('onPaste', this.onPaste);
-    }
-
-    componentWillUnmount() {
-        if (this.subscription) {
-            this.subscription.remove();
-        }
-    }
-
-    getLastSubscriptionKey = () => {
-        const subscriptions = OnPasteEventEmitter._subscriber._subscriptionsForType.onPaste?.filter((sub) => sub); // eslint-disable-line no-underscore-dangle
-        return subscriptions?.length && subscriptions[subscriptions.length - 1].key;
-    }
-
-    onPaste = (event) => {
-        const lastSubscriptionKey = this.getLastSubscriptionKey();
-        if (this.subscription.key !== lastSubscriptionKey) {
-            return;
-        }
-
-        let data = null;
-        let error = null;
-
-        if (Platform.OS === 'android') {
-            const {nativeEvent} = event;
-            data = nativeEvent.data;
-            error = nativeEvent.error;
-        } else {
-            data = event;
-        }
-
-        EventEmitter.emit(PASTE_FILES, error, data, this.props.screenId);
-    }
-
-    render() {
-        const {testID, forwardRef, ...props} = this.props;
-
-        return (
-            <TextInput
-                testID={testID}
-                {...props}
-                onPaste={this.onPaste}
-                ref={forwardRef}
-            />
-        );
-    }
-}
-
-const WrappedPasteableTextInput = (props, ref) => (
-    <PasteableTextInput
-        {...props}
-        forwardRef={ref}
-    />
-);
-
-export default React.forwardRef(WrappedPasteableTextInput);
--- a/app/components/pasteable_text_input/index.test.js
+++ b/app/components/pasteable_text_input/index.test.js
@@ -1,62 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
-import React from 'react';
-import {NativeEventEmitter} from 'react-native';
-
-import {PASTE_FILES} from '@constants/post_draft';
-import EventEmitter from '@mm-redux/utils/event_emitter';
-
-import {PasteableTextInput} from './index';
-
-const nativeEventEmitter = new NativeEventEmitter();
-
-describe('PasteableTextInput', () => {
-    const emit = jest.spyOn(EventEmitter, 'emit');
-
-    test('should render pasteable text input', () => {
-        const onPaste = jest.fn();
-        const text = 'My Text';
-        const component = shallow(
-            <PasteableTextInput
-                onPaste={onPaste}
-                screenId='Channel'
-            >{text}</PasteableTextInput>,
-        );
-        expect(component).toMatchSnapshot();
-    });
-
-    test('should call onPaste props if native onPaste trigger', () => {
-        const event = {someData: 'data'};
-        const text = 'My Text';
-        shallow(
-            <PasteableTextInput screenId='Channel'>{text}</PasteableTextInput>,
-        );
-        nativeEventEmitter.emit('onPaste', event);
-        expect(emit).toHaveBeenCalledWith(PASTE_FILES, null, event, 'Channel');
-    });
-
-    test('should remove onPaste listener when unmount', () => {
-        const mockRemove = jest.fn();
-        const text = 'My Text';
-        const component = shallow(
-            <PasteableTextInput screenId='Channel'>{text}</PasteableTextInput>,
-        );
-
-        component.instance().subscription.remove = mockRemove;
-        component.instance().componentWillUnmount();
-        expect(mockRemove).toHaveBeenCalled();
-    });
-
-    test('should emit PASTE_FILES event only for last subscription', () => {
-        const component1 = shallow(<PasteableTextInput screenId='Channel'/>);
-        const instance1 = component1.instance();
-        const component2 = shallow(<PasteableTextInput screenId='Thread'/>);
-        const instance2 = component2.instance();
-
-        instance1.onPaste();
-        expect(emit).not.toHaveBeenCalled();
-        instance2.onPaste();
-        expect(emit).toHaveBeenCalledTimes(1);
-    });
-});
--- a/app/components/post_draft/snapshots/post_draft.test.js.snap
+++ b/app/components/post_draft/snapshots/post_draft.test.js.snap
@@ -68,7 +68,9 @@ exports[`PostDraft Should render the Archived for channelIsArchived 1`] = `
  <View
    accessibilityRole="button"
    accessible={true}
+    collapsable={false}
    focusable={true}
+    nativeID="animatedComponent"
    onClick={[Function]}
    onResponderGrant={[Function]}
    onResponderMove={[Function]}
@@ -172,7 +174,9 @@ exports[`PostDraft Should render the Archived for deactivatedChannel 1`] = `
  <View
    accessibilityRole="button"
    accessible={true}
+    collapsable={false}
    focusable={true}
+    nativeID="animatedComponent"
    onClick={[Function]}
    onResponderGrant={[Function]}
    onResponderMove={[Function]}
@@ -213,6 +217,8 @@ exports[`PostDraft Should render the DraftInput 1`] = `
  inverted={false}
 >
  <View
+    collapsable={false}
+    nativeID="animatedComponent"
    style={
      Object {
        "bottom": 0,
@@ -278,33 +284,49 @@ exports[`PostDraft Should render the DraftInput 1`] = `
      }
    >
      <View>
-        <TextInput
-          allowFontScaling={true}
+        <PasteInput
+          accessible={true}
+          autoCapitalize="sentences"
          autoCompleteType="off"
          blurOnSubmit={false}
+          disableCopyPaste={false}
          disableFullscreenUI={true}
+          focusable={true}
          keyboardAppearance="light"
          keyboardType="default"
+          mostRecentEventCount={0}
          multiline={true}
+          onBlur={[Function]}
+          onChange={[Function]}
          onChangeText={[Function]}
+          onClick={[Function]}
          onEndEditing={[Function]}
+          onFocus={[Function]}
          onPaste={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onScroll={[Function]}
          onSelectionChange={[Function]}
+          onStartShouldSetResponder={[Function]}
          placeholder="Write to "
          placeholderTextColor="rgba(63,67,80,0.5)"
-          rejectResponderTermination={true}
          screenId="NavigationScreen1"
          style={
-            Object {
-              "color": "#3f4350",
-              "fontSize": 15,
-              "lineHeight": 20,
-              "maxHeight": 150,
-              "minHeight": 30,
-              "paddingBottom": 6,
-              "paddingHorizontal": 12,
-              "paddingTop": 6,
-            }
+            Array [
+              Object {
+                "color": "#3f4350",
+                "fontSize": 15,
+                "lineHeight": 20,
+                "maxHeight": 150,
+                "minHeight": 30,
+                "paddingBottom": 6,
+                "paddingHorizontal": 12,
+                "paddingTop": 6,
+              },
+            ]
          }
          testID="post_draft.post.input"
          textContentType="none"
@@ -319,8 +341,10 @@ exports[`PostDraft Should render the DraftInput 1`] = `
          }
        >
          <View
+            collapsable={false}
            forwardedRef={[Function]}
            isInteraction={true}
+            nativeID="animatedComponent"
            style={
              Object {
                "display": "flex",
@@ -349,8 +373,10 @@ exports[`PostDraft Should render the DraftInput 1`] = `
            </RCTScrollView>
          </View>
          <View
+            collapsable={false}
            forwardedRef={[Function]}
            isInteraction={true}
+            nativeID="animatedComponent"
            style={
              Object {
                "height": 0,
@@ -391,7 +417,9 @@ exports[`PostDraft Should render the DraftInput 1`] = `
          >
            <View
              accessible={true}
+              collapsable={false}
              focusable={true}
+              nativeID="animatedComponent"
              onClick={[Function]}
              onResponderGrant={[Function]}
              onResponderMove={[Function]}
@@ -417,7 +445,9 @@ exports[`PostDraft Should render the DraftInput 1`] = `
            </View>
            <View
              accessible={true}
+              collapsable={false}
              focusable={true}
+              nativeID="animatedComponent"
              onClick={[Function]}
              onResponderGrant={[Function]}
              onResponderMove={[Function]}
@@ -443,7 +473,9 @@ exports[`PostDraft Should render the DraftInput 1`] = `
            </View>
            <View
              accessible={true}
+              collapsable={false}
              focusable={true}
+              nativeID="animatedComponent"
              onClick={[Function]}
              onResponderGrant={[Function]}
              onResponderMove={[Function]}
@@ -469,7 +501,9 @@ exports[`PostDraft Should render the DraftInput 1`] = `
            </View>
            <View
              accessible={true}
+              collapsable={false}
              focusable={true}
+              nativeID="animatedComponent"
              onClick={[Function]}
              onResponderGrant={[Function]}
              onResponderMove={[Function]}
@@ -495,7 +529,9 @@ exports[`PostDraft Should render the DraftInput 1`] = `
            </View>
            <View
              accessible={true}
+              collapsable={false}
              focusable={true}
+              nativeID="animatedComponent"
              onClick={[Function]}
              onResponderGrant={[Function]}
              onResponderMove={[Function]}
--- a/app/components/post_draft/post_input/snapshots/post_input.test.js.snap
+++ b/app/components/post_draft/post_input/snapshots/post_input.test.js.snap
@@ -1,15 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`PostInput should match, full snapshot 1`] = `
-<ForwardRef(WrappedPasteableTextInput)
+<ForwardRef
  autoCompleteType="off"
  blurOnSubmit={false}
+  disableCopyPaste={false}
  disableFullscreenUI={true}
  keyboardAppearance="light"
  keyboardType="default"
  multiline={true}
  onChangeText={[Function]}
  onEndEditing={[Function]}
+  onPaste={[Function]}
  onSelectionChange={[Function]}
  placeholder="Write to Test Channel"
  placeholderTextColor="rgba(63,67,80,0.5)"
--- a/app/components/post_draft/post_input/post_input.js
+++ b/app/components/post_draft/post_input/post_input.js
@@ -6,10 +6,11 @@ import React, {PureComponent} from 'react';
 import {intlShape} from 'react-intl';
 import {Alert, AppState, findNodeHandle, Keyboard, NativeModules, Platform} from 'react-native';

-import PasteableTextInput from '@components/pasteable_text_input';
 import {NavigationTypes} from '@constants';
 import DEVICE from '@constants/device';
-import {INSERT_TO_COMMENT, INSERT_TO_DRAFT} from '@constants/post_draft';
+import {INSERT_TO_COMMENT, INSERT_TO_DRAFT, PASTE_FILES} from '@constants/post_draft';
+import mattermostManaged from '@mattermost-managed';
+import PasteableTextInput from '@mattermost/react-native-paste-input';
 import {debounce} from '@mm-redux/actions/helpers';
 import EventEmitter from '@mm-redux/utils/event_emitter';
 import {t} from '@utils/i18n';
@@ -55,6 +56,7 @@ export default class PostInput extends PureComponent {
        this.state = {
            keyboardType: 'default',
            longMessageAlertShown: false,
+            disableCopyAndPaste: mattermostManaged.getCachedConfig()?.copyAndPasteProtection === 'true',
        };
    }

@@ -62,10 +64,11 @@ export default class PostInput extends PureComponent {
        const event = this.props.rootId ? INSERT_TO_COMMENT : INSERT_TO_DRAFT;
        EventEmitter.on(event, this.handleInsertTextToDraft);
        EventEmitter.on(NavigationTypes.BLUR_POST_DRAFT, this.blur);
-        AppState.addEventListener('change', this.handleAppStateChange);
+        this.appStateListener = AppState.addEventListener('change', this.handleAppStateChange);
+        this.managedListener = mattermostManaged.addEventListener('managedConfigDidChange', this.onManagedConfigurationChange);

        if (Platform.OS === 'android') {
-            Keyboard.addListener('keyboardDidHide', this.handleAndroidKeyboard);
+            this.keyboardListener = Keyboard.addListener('keyboardDidHide', this.handleAndroidKeyboard);
        }
    }

@@ -73,10 +76,11 @@ export default class PostInput extends PureComponent {
        const event = this.props.rootId ? INSERT_TO_COMMENT : INSERT_TO_DRAFT;
        EventEmitter.off(NavigationTypes.BLUR_POST_DRAFT, this.blur);
        EventEmitter.off(event, this.handleInsertTextToDraft);
-        AppState.removeEventListener('change', this.handleAppStateChange);
+        mattermostManaged.removeEventListener(this.managedListener);
+        this.appStateListener.remove();

        if (Platform.OS === 'android') {
-            Keyboard.removeListener('keyboardDidHide', this.handleAndroidKeyboard);
+            this.keyboardListener?.remove();
        }

        this.changeDraft(this.getValue());
@@ -249,11 +253,20 @@ export default class PostInput extends PureComponent {
        }

        this.value = completed;
+
        this.input.current.setNativeProps({
            text: completed,
        });
    };

+    onManagedConfigurationChange = (config) => {
+        this.setState({disableCopyAndPaste: config.copyAndPasteProtection === 'true'});
+    }
+
+    onPaste = (error, files) => {
+        EventEmitter.emit(PASTE_FILES, error, files, this.props.screenId);
+    }
+
    resetTextInput = () => {
        if (this.input.current) {
            this.input.current.setNativeProps({
@@ -287,6 +300,7 @@ export default class PostInput extends PureComponent {
            <PasteableTextInput
                testID={testID}
                ref={this.input}
+                disableCopyPaste={this.state.disableCopyAndPaste}
                style={{...style.input, maxHeight}}
                onChangeText={this.handleTextChange}
                onSelectionChange={this.handlePostDraftSelectionChanged}
@@ -297,6 +311,7 @@ export default class PostInput extends PureComponent {
                underlineColorAndroid='transparent'
                keyboardType={this.state.keyboardType}
                onEndEditing={this.handleEndEditing}
+                onPaste={this.onPaste}
                disableFullscreenUI={true}
                textContentType='none'
                autoCompleteType='off'
--- a/app/components/post_draft/quick_actions/camera_quick_action/snapshots/camera_quick_action.test.js.snap
+++ b/app/components/post_draft/quick_actions/camera_quick_action/snapshots/camera_quick_action.test.js.snap
@@ -3,7 +3,9 @@
 exports[`CameraButton should match snapshot 1`] = `
 <View
  accessible={true}
+  collapsable={false}
  focusable={true}
+  nativeID="animatedComponent"
  onClick={[Function]}
  onResponderGrant={[Function]}
  onResponderMove={[Function]}
--- a/app/components/post_draft/quick_actions/file_quick_action/snapshots/file_quick_action.test.js.snap
+++ b/app/components/post_draft/quick_actions/file_quick_action/snapshots/file_quick_action.test.js.snap
@@ -3,7 +3,9 @@
 exports[`FileQuickAction should match snapshot 1`] = `
 <View
  accessible={true}
+  collapsable={false}
  focusable={true}
+  nativeID="animatedComponent"
  onClick={[Function]}
  onResponderGrant={[Function]}
  onResponderMove={[Function]}
--- a/app/components/post_draft/quick_actions/image_quick_action/snapshots/image_quick_action.test.js.snap
+++ b/app/components/post_draft/quick_actions/image_quick_action/snapshots/image_quick_action.test.js.snap
@@ -3,7 +3,9 @@
 exports[`ImageQuickAction should match snapshot 1`] = `
 <View
  accessible={true}
+  collapsable={false}
  focusable={true}
+  nativeID="animatedComponent"
  onClick={[Function]}
  onResponderGrant={[Function]}
  onResponderMove={[Function]}
--- a/app/components/post_draft/uploads/upload_item/snapshots/upload_item.test.js.snap
+++ b/app/components/post_draft/uploads/upload_item/snapshots/upload_item.test.js.snap
@@ -18,7 +18,7 @@ exports[`UploadItem downloadAndUploadFile should match, full snapshot 1`] = `
      }
    }
  >
-    <ForwardRef
+    <TouchableOpacity
      onPress={[Function]}
    >
      <View
@@ -68,7 +68,7 @@ exports[`UploadItem downloadAndUploadFile should match, full snapshot 1`] = `
          }
        />
      </View>
-    </ForwardRef>
+    </TouchableOpacity>
  </View>
  <UploadRemove
    channelId="channel-id"
--- a/app/components/post_draft/uploads/uploads.test.js
+++ b/app/components/post_draft/uploads/uploads.test.js
@@ -17,6 +17,7 @@ describe('Uploads', () => {
        handleRemoveLastFile: jest.fn(),
        initUploadFiles: jest.fn(),
        maxFileSize: 100,
+        maxFileCount: 10,
        screenId: 'Channel',
        theme: Preferences.THEMES.denim,
    };
--- a/app/components/post_list/more_messages_button/more_messages_button.test.js
+++ b/app/components/post_list/more_messages_button/more_messages_button.test.js
@@ -55,7 +55,6 @@ describe('MoreMessagesButton', () => {

    describe('lifecycle methods', () => {
        AppState.addEventListener = jest.fn();
-        AppState.removeEventListener = jest.fn();

        test('componentDidMount should register app state listener, indicator visibility listener, viewable items listener, and scroll end index listener', () => {
            EventEmitter.on = jest.fn();
@@ -94,7 +93,6 @@ describe('MoreMessagesButton', () => {
            instance.removeScrollEndIndexListener = jest.fn();

            instance.componentWillUnmount();
-            expect(AppState.removeEventListener).toHaveBeenCalledWith('change', instance.onAppStateChange);
            expect(EventEmitter.off).toHaveBeenCalledWith(ViewTypes.INDICATOR_BAR_VISIBLE, instance.onIndicatorBarVisible);
            expect(instance.removeViewableItemsListener).toHaveBeenCalled();
            expect(instance.removeScrollEndIndexListener).toHaveBeenCalled();
@@ -323,6 +321,8 @@ describe('MoreMessagesButton', () => {
                <MoreMessagesButton {...baseProps}/>,
            );
            const instance = wrapper.instance();
+            const clearTimeout = jest.spyOn(global, 'clearTimeout');
+
            wrapper.setProps({unreadCount: 10});
            instance.setState({moreText: '60+ new messages'});
            const autoCancelTimer = jest.fn();
@@ -517,6 +517,8 @@ describe('MoreMessagesButton', () => {
                <MoreMessagesButton {...baseProps}/>,
            );
            const instance = wrapper.instance();
+            const setTimeout = jest.spyOn(global, 'setTimeout');
+
            instance.componentDidUpdate = jest.fn();
            instance.canceled = false;
            instance.hide = jest.fn();
@@ -539,6 +541,8 @@ describe('MoreMessagesButton', () => {
                <MoreMessagesButton {...baseProps}/>,
            );
            const instance = wrapper.instance();
+            const setTimeout = jest.spyOn(global, 'setTimeout');
+
            instance.componentDidUpdate = jest.fn();
            instance.canceled = false;
            instance.hide = jest.fn();
@@ -564,7 +568,9 @@ describe('MoreMessagesButton', () => {
                <MoreMessagesButton {...baseProps}/>,
            );
            const instance = wrapper.instance();
+            const clearTimeout = jest.spyOn(global, 'clearTimeout');
            const autoCancelTimer = jest.fn();
+
            instance.autoCancelTimer = autoCancelTimer;
            instance.canceled = true;
            instance.disableViewableItems = true;
@@ -621,6 +627,7 @@ describe('MoreMessagesButton', () => {

        it('should return early when newMessageLineIndex <= 0', () => {
            const viewableItems = [{index: 0}, {index: 1}];
+            const clearTimeout = jest.spyOn(global, 'clearTimeout');

            wrapper.setProps({newMessageLineIndex: 0});
            instance.onViewableItemsChanged(viewableItems);
@@ -633,8 +640,9 @@ describe('MoreMessagesButton', () => {

        it('should return early when viewableItems length is 0', () => {
            const viewableItems = [];
-            wrapper.setProps({newMessageLineIndex: 1, unreadCount: 10});
+            const clearTimeout = jest.spyOn(global, 'clearTimeout');

+            wrapper.setProps({newMessageLineIndex: 1, unreadCount: 10});
            instance.onViewableItemsChanged(viewableItems);
            expect(clearTimeout).not.toHaveBeenCalled();
        });
@@ -643,6 +651,7 @@ describe('MoreMessagesButton', () => {
            const viewableItems = [{index: 0}];
            wrapper.setProps({newMessageLineIndex: 1, unreadCount: 10});
            instance.disableViewableItems = true;
+            const clearTimeout = jest.spyOn(global, 'clearTimeout');

            instance.onViewableItemsChanged(viewableItems);
            expect(clearTimeout).not.toHaveBeenCalled();
@@ -685,6 +694,7 @@ describe('MoreMessagesButton', () => {
            instance.disableViewableItems = false;
            instance.autoCancelTimer = null;
            instance.cancel = jest.fn();
+            const setTimeout = jest.spyOn(global, 'setTimeout');

            instance.onViewableItemsChanged(viewableItems);
            jest.runOnlyPendingTimers();
@@ -701,6 +711,7 @@ describe('MoreMessagesButton', () => {
            instance.disableViewableItems = false;
            instance.autoCancelTimer = null;
            instance.cancel = jest.fn();
+            const setTimeout = jest.spyOn(global, 'setTimeout');

            instance.onViewableItemsChanged(viewableItems);
            jest.runOnlyPendingTimers();
--- a/app/components/post_list/more_messages_button/more_messages_button.tsx
+++ b/app/components/post_list/more_messages_button/more_messages_button.tsx
@@ -3,7 +3,7 @@

 import React from 'react';
 import {intlShape} from 'react-intl';
-import {ActivityIndicator, Animated, AppState, AppStateStatus, Text, View, ViewToken} from 'react-native';
+import {ActivityIndicator, Animated, AppState, AppStateStatus, NativeEventSubscription, Text, View, ViewToken} from 'react-native';

 import CompassIcon from '@components/compass_icon';
 import TouchableWithFeedback from '@components/touchable_with_feedback';
@@ -64,6 +64,7 @@ export default class MoreMessageButton extends React.PureComponent<MoreMessagesB
        intl: intlShape.isRequired,
    };

+    appStateListener: NativeEventSubscription | undefined;
    autoCancelTimer: undefined | null | NodeJS.Timeout;
    buttonVisible = false;
    canceled = false;
@@ -78,14 +79,14 @@ export default class MoreMessageButton extends React.PureComponent<MoreMessagesB
    viewableItems: ViewToken[] = [];

    componentDidMount() {
-        AppState.addEventListener('change', this.onAppStateChange);
+        this.appStateListener = AppState.addEventListener('change', this.onAppStateChange);
        EventEmitter.on(ViewTypes.INDICATOR_BAR_VISIBLE, this.onIndicatorBarVisible);
        this.removeViewableItemsListener = this.props.registerViewableItemsListener(this.onViewableItemsChanged);
        this.removeScrollEndIndexListener = this.props.registerScrollEndIndexListener(this.onScrollEndIndex);
    }

    componentWillUnmount() {
-        AppState.removeEventListener('change', this.onAppStateChange);
+        this.appStateListener?.remove();
        EventEmitter.off(ViewTypes.INDICATOR_BAR_VISIBLE, this.onIndicatorBarVisible);
        if (this.removeViewableItemsListener) {
            this.removeViewableItemsListener();
--- a/app/components/post_list/post/body/body.tsx
+++ b/app/components/post_list/post/body/body.tsx
@@ -178,6 +178,8 @@ const Body = ({
            {body}
            {post.failed &&
            <Failed
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
                post={post}
                theme={theme}
            />
--- a/app/components/post_list/post/body/content/embedded_bindings/button_binding/button_binding.tsx
+++ b/app/components/post_list/post/body/content/embedded_bindings/button_binding/button_binding.tsx
@@ -58,11 +58,15 @@ const ButtonBinding = ({binding, doAppCall, intl, post, postEphemeralCallRespons
    const style = getStyleSheet(theme);

    const onPress = useCallback(preventDoubleTap(async () => {
-        if (!binding.call || pressed.current) {
+        if (pressed.current) {
            return;
        }

-        pressed.current = true;
+        const call = binding.form?.call || binding.call;
+
+        if (!call) {
+            return;
+        }

        const context = createCallContext(
            binding.app_id,
@@ -72,13 +76,20 @@ const ButtonBinding = ({binding, doAppCall, intl, post, postEphemeralCallRespons
            post.id,
        );

-        const call = createCallRequest(
-            binding.call,
+        const callRequest = createCallRequest(
+            call,
            context,
            {post: AppExpandLevels.EXPAND_ALL},
        );

-        const res = await doAppCall(call, AppCallTypes.SUBMIT, intl);
+        if (binding.form) {
+            showAppForm(binding.form, callRequest, theme);
+            return;
+        }
+
+        pressed.current = true;
+
+        const res = await doAppCall(callRequest, AppCallTypes.SUBMIT, intl);
        pressed.current = false;

        if (res.error) {
--- a/app/components/post_list/post/body/content/embedded_bindings/menu_binding/menu_binding.tsx
+++ b/app/components/post_list/post/body/content/embedded_bindings/menu_binding/menu_binding.tsx
@@ -42,7 +42,9 @@ const MenuBinding = ({binding, doAppCall, intl, post, postEphemeralCallResponseF
            return;
        }

-        if (!bind.call) {
+        const call = bind.form?.call || bind.call;
+
+        if (!call) {
            return;
        }

@@ -54,13 +56,18 @@ const MenuBinding = ({binding, doAppCall, intl, post, postEphemeralCallResponseF
            post.id,
        );

-        const call = createCallRequest(
-            bind.call,
+        const callRequest = createCallRequest(
+            call,
            context,
            {post: AppExpandLevels.EXPAND_ALL},
        );

-        const res = await doAppCall(call, AppCallTypes.SUBMIT, intl);
+        if (bind.form) {
+            showAppForm(bind.form, callRequest);
+            return;
+        }
+
+        const res = await doAppCall(callRequest, AppCallTypes.SUBMIT, intl);
        if (res.error) {
            const errorResponse = res.error;
            const errorMessage = errorResponse.error || intl.formatMessage({
--- a/app/components/post_list/post/body/failed/failed.tsx
+++ b/app/components/post_list/post/body/failed/failed.tsx
@@ -2,20 +2,21 @@
 // See LICENSE.txt for license information.

 import React, {useCallback} from 'react';
-import {StyleSheet} from 'react-native';
+import {intlShape, injectIntl} from 'react-intl';
+import {Keyboard, StyleSheet} from 'react-native';

 import {showModalOverCurrentContext} from '@actions/navigation';
 import CompassIcon from '@components/compass_icon';
 import TouchableWithFeedback from '@components/touchable_with_feedback';
 import NavigationTypes from '@constants/navigation';
 import EventEmitter from '@mm-redux/utils/event_emitter';
-import {t} from '@utils/i18n';

 import type {Post} from '@mm-redux/types/posts';
 import type {Theme} from '@mm-redux/types/theme';

 type FailedProps = {
    createPost: (post: Post) => void;
+    intl: typeof intlShape;
    post: Post;
    removePost: (post: Post) => void;
    theme: Theme;
@@ -28,38 +29,39 @@ const styles = StyleSheet.create({
    },
 });

-const Failed = ({createPost, post, removePost, theme}: FailedProps) => {
+const Failed = ({createPost, intl, post, removePost, theme}: FailedProps) => {
    const onPress = useCallback(() => {
        const screen = 'OptionsModal';
        const passProps = {
-            title: {
-                id: t('mobile.post.failed_title'),
+            title: intl.formatMessage({
+                id: 'mobile.post.failed_title',
                defaultMessage: 'Unable to send your message:',
-            },
+            }),
            items: [{
                action: () => {
                    EventEmitter.emit(NavigationTypes.NAVIGATION_CLOSE_MODAL);
                    createPost(post);
                },
-                text: {
-                    id: t('mobile.post.failed_retry'),
+                text: intl.formatMessage({
+                    id: 'mobile.post.failed_retry',
                    defaultMessage: 'Try Again',
-                },
+                }),
            }, {
                action: () => {
                    EventEmitter.emit(NavigationTypes.NAVIGATION_CLOSE_MODAL);
                    removePost(post);
                },
-                text: {
-                    id: t('mobile.post.failed_delete'),
+                text: intl.formatMessage({
+                    id: 'mobile.post.failed_delete',
                    defaultMessage: 'Delete Message',
-                },
+                }),
                textStyle: {
                    color: '#CC3239',
                },
            }],
        };

+        Keyboard.dismiss();
        showModalOverCurrentContext(screen, passProps);
    }, []);

@@ -77,5 +79,4 @@ const Failed = ({createPost, post, removePost, theme}: FailedProps) => {
        </TouchableWithFeedback>
    );
 };
-
-export default Failed;
+export default injectIntl(Failed);
--- a/app/components/post_list/post_list.tsx
+++ b/app/components/post_list/post_list.tsx
@@ -297,10 +297,10 @@ const PostList = ({

            if (match) {
                if (match.type === DeepLinkTypes.CHANNEL) {
-                    handleSelectChannelByName(match.channelName!, match.teamName, errorBadChannel, intl);
+                    handleSelectChannelByName(match.channelName!, match.teamName!, errorBadChannel, intl);
                } else if (match.type === DeepLinkTypes.PERMALINK) {
                    const teamName = match.teamName === PERMALINK_GENERIC_TEAM_NAME_REDIRECT ? currentTeamName : match.teamName;
-                    onPermalinkPress(match.postId!, teamName);
+                    onPermalinkPress(match.postId!, teamName!);
                }
            } else {
                badDeepLink(intl);
--- a/app/components/sidebars/drawer_layout/drawer_layout.js
+++ b/app/components/sidebars/drawer_layout/drawer_layout.js
@@ -82,14 +82,14 @@ export default class DrawerLayout extends Component {
    }

    componentDidMount() {
-        Dimensions.addEventListener('change', this.handleDimensionsChange);
+        this.dimensionsListener = Dimensions.addEventListener('change', this.handleDimensionsChange);
    }

    componentWillUnmount() {
        if (this.openValue) {
            this.openValue.removeListener(this.handleOpenValueChanged);
        }
-        Dimensions.removeEventListener('change', this.handleDimensionsChange);
+        this.dimensionsListener?.remove();
    }

    handleDimensionsChange = ({window}) => {
--- a/app/components/sidebars/main/channels_list/channel_item/snapshots/channel_item.test.js.snap
+++ b/app/components/sidebars/main/channels_list/channel_item/snapshots/channel_item.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`ChannelItem should match snapshot 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -108,11 +108,11 @@ exports[`ChannelItem should match snapshot 1`] = `
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot for current user i.e currentUser (you) 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -228,11 +228,11 @@ exports[`ChannelItem should match snapshot for current user i.e currentUser (you
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot for current user i.e currentUser (you) when isSearchResult 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -348,11 +348,11 @@ exports[`ChannelItem should match snapshot for current user i.e currentUser (you
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot for deactivated user and is currentChannel 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -468,11 +468,11 @@ exports[`ChannelItem should match snapshot for deactivated user and is currentCh
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot for deactivated user and is searchResult 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -579,11 +579,11 @@ exports[`ChannelItem should match snapshot for deactivated user and is searchRes
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot for deactivated user and not searchResults or currentChannel 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -690,11 +690,11 @@ exports[`ChannelItem should match snapshot for deactivated user and not searchRe
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot for isManualUnread 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -801,7 +801,7 @@ exports[`ChannelItem should match snapshot for isManualUnread 1`] = `
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot for no displayName 1`] = `null`;
@@ -809,7 +809,7 @@ exports[`ChannelItem should match snapshot for no displayName 1`] = `null`;
 exports[`ChannelItem should match snapshot for showUnreadForMsgs 1`] = `null`;

 exports[`ChannelItem should match snapshot with custom status emoji 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -936,11 +936,11 @@ exports[`ChannelItem should match snapshot with custom status emoji 1`] = `
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot with draft 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -1047,11 +1047,11 @@ exports[`ChannelItem should match snapshot with draft 1`] = `
      </Text>
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;

 exports[`ChannelItem should match snapshot with mentions and muted 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[Function]}
  underlayColor="rgba(40,66,123,0.5)"
 >
@@ -1194,5 +1194,5 @@ exports[`ChannelItem should match snapshot with mentions and muted 1`] = `
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;
--- a/app/components/sidebars/main/channels_list/list/snapshots/list.test.js.snap
+++ b/app/components/sidebars/main/channels_list/list/snapshots/list.test.js.snap
@@ -10,32 +10,23 @@ exports[`ChannelsList List should match snapshot 1`] = `
        "paddingBottom": 44,
      }
    }
-    data={Array []}
-    disableVirtualization={false}
-    horizontal={false}
-    initialNumToRender={10}
    keyExtractor={[Function]}
    keyboardDismissMode="interactive"
    keyboardShouldPersistTaps="always"
    maxToRenderPerBatch={10}
-    onEndReachedThreshold={2}
    onScrollBeginDrag={[Function]}
    onViewableItemsChanged={[Function]}
-    removeClippedSubviews={false}
    renderItem={[Function]}
    renderSectionHeader={[Function]}
-    scrollEventThrottle={50}
    sections={Array []}
    stickySectionHeadersEnabled={true}
    testID="main.sidebar.channels_list.list"
-    updateCellsBatchingPeriod={50}
    viewabilityConfig={
      Object {
        "itemVisiblePercentThreshold": 100,
        "waitForInteraction": true,
      }
    }
-    windowSize={21}
  />
 </View>
 `;
@@ -51,32 +42,23 @@ exports[`ChannelsList List should match snapshot with collapsed threads enabled
        "paddingBottom": 44,
      }
    }
-    data={Array []}
-    disableVirtualization={false}
-    horizontal={false}
-    initialNumToRender={10}
    keyExtractor={[Function]}
    keyboardDismissMode="interactive"
    keyboardShouldPersistTaps="always"
    maxToRenderPerBatch={10}
-    onEndReachedThreshold={2}
    onScrollBeginDrag={[Function]}
    onViewableItemsChanged={[Function]}
-    removeClippedSubviews={false}
    renderItem={[Function]}
    renderSectionHeader={[Function]}
-    scrollEventThrottle={50}
    sections={Array []}
    stickySectionHeadersEnabled={true}
    testID="main.sidebar.channels_list.list"
-    updateCellsBatchingPeriod={50}
    viewabilityConfig={
      Object {
        "itemVisiblePercentThreshold": 100,
        "waitForInteraction": true,
      }
    }
-    windowSize={21}
  />
  <UnreadIndicatorIOS
    onPress={[Function]}
@@ -132,32 +114,23 @@ exports[`ChannelsList List should match snapshot with unreads not on top 1`] = `
        "paddingBottom": 44,
      }
    }
-    data={Array []}
-    disableVirtualization={false}
-    horizontal={false}
-    initialNumToRender={10}
    keyExtractor={[Function]}
    keyboardDismissMode="interactive"
    keyboardShouldPersistTaps="always"
    maxToRenderPerBatch={10}
-    onEndReachedThreshold={2}
    onScrollBeginDrag={[Function]}
    onViewableItemsChanged={[Function]}
-    removeClippedSubviews={false}
    renderItem={[Function]}
    renderSectionHeader={[Function]}
-    scrollEventThrottle={50}
    sections={Array []}
    stickySectionHeadersEnabled={true}
    testID="main.sidebar.channels_list.list"
-    updateCellsBatchingPeriod={50}
    viewabilityConfig={
      Object {
        "itemVisiblePercentThreshold": 100,
        "waitForInteraction": true,
      }
    }
-    windowSize={21}
  />
  <UnreadIndicatorIOS
    onPress={[Function]}
--- a/app/components/sidebars/main/channels_list/list/list.js
+++ b/app/components/sidebars/main/channels_list/list/list.js
@@ -557,7 +557,6 @@ export default class List extends PureComponent {
                    ref={this.setListRef}
                    sections={showLegacySidebar ? sections : categorySections}
                    contentContainerStyle={{paddingBottom}}
-                    removeClippedSubviews={Platform.OS === 'android'}
                    renderItem={showLegacySidebar ? this.renderItem : this.renderCategoryItem}
                    renderSectionHeader={showLegacySidebar ? this.renderSectionHeader : this.renderCategoryHeader}
                    keyboardShouldPersistTaps={'always'}
--- a/app/components/sidebars/main/channels_list/switch_teams_button/snapshots/switch_teams_button.test.js.snap
+++ b/app/components/sidebars/main/channels_list/switch_teams_button/snapshots/switch_teams_button.test.js.snap
@@ -4,7 +4,7 @@ exports[`SwitchTeamsButton should match snapshot 1`] = `
 <View
  testID="main.sidebar.channels_list.switch_teams.button"
 >
-  <ForwardRef
+  <TouchableHighlight
    onPress={[Function]}
    underlayColor="rgba(25,42,77,0.5)"
  >
@@ -59,7 +59,7 @@ exports[`SwitchTeamsButton should match snapshot 1`] = `
        testID="main.sidebar.channels_list.switch_teams.button.team_icon"
      />
    </View>
-  </ForwardRef>
+  </TouchableHighlight>
  <Badge
    containerStyle={
      Object {
--- a/app/components/sidebars/main/main_sidebar_base.js
+++ b/app/components/sidebars/main/main_sidebar_base.js
@@ -56,7 +56,7 @@ export default class MainSidebarBase extends Component {
        this.props.actions.getTeams();
        EventEmitter.on(NavigationTypes.CLOSE_MAIN_SIDEBAR, this.closeMainSidebar);
        EventEmitter.on(WebsocketEvents.CHANNEL_UPDATED, this.handleUpdateTitle);
-        Dimensions.addEventListener('change', this.handleDimensions);
+        this.dimensionsListener = Dimensions.addEventListener('change', this.handleDimensions);
    }

    shouldComponentUpdate(nextProps, nextState) {
@@ -91,7 +91,7 @@ export default class MainSidebarBase extends Component {
        this.mounted = false;
        EventEmitter.off(NavigationTypes.CLOSE_MAIN_SIDEBAR, this.closeMainSidebar);
        EventEmitter.off(WebsocketEvents.CHANNEL_UPDATED, this.handleUpdateTitle);
-        Dimensions.removeEventListener('change', this.handleDimensions);
+        this.dimensionsListener?.remove();
    }

    drawerSwiperRef = (ref) => {
--- a/app/components/sidebars/main/teams_list/teams_list_item/snapshots/teams_list_item.test.js.snap
+++ b/app/components/sidebars/main/teams_list/teams_list_item/snapshots/teams_list_item.test.js.snap
@@ -9,7 +9,7 @@ exports[`TeamsListItem should match snapshot 1`] = `
  }
  testID="main.sidebar.teams_list.flat_list.teams_list_item"
 >
-  <ForwardRef
+  <TouchableHighlight
    onPress={[Function]}
    underlayColor="rgba(40,66,123,0.5)"
  >
@@ -110,6 +110,6 @@ exports[`TeamsListItem should match snapshot 1`] = `
        </Text>
      </View>
    </View>
-  </ForwardRef>
+  </TouchableHighlight>
 </View>
 `;
--- a/app/components/sidebars/settings/snapshots/drawer_item.test.js.snap
+++ b/app/components/sidebars/settings/snapshots/drawer_item.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`DrawerItem should match snapshot 1`] = `
-<ForwardRef
+<TouchableOpacity
  onPress={[MockFunction]}
  testID="test-id"
 >
@@ -89,11 +89,11 @@ exports[`DrawerItem should match snapshot 1`] = `
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`DrawerItem should match snapshot without separator and centered false 1`] = `
-<ForwardRef
+<TouchableOpacity
  onPress={[MockFunction]}
  testID="test-id"
 >
@@ -170,5 +170,5 @@ exports[`DrawerItem should match snapshot without separator and centered false 1
      </View>
    </View>
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;
--- a/app/components/sidebars/settings/settings_sidebar.ios.js
+++ b/app/components/sidebars/settings/settings_sidebar.ios.js
@@ -36,13 +36,13 @@ export default class SettingsDrawer extends SettingsSidebarBase {
        super.componentDidMount();

        this.handleDimensions({window: Dimensions.get('window')});
-        Dimensions.addEventListener('change', this.handleDimensions);
+        this.dimensionsListener = Dimensions.addEventListener('change', this.handleDimensions);
    }

    componentWillUnmount() {
        super.componentWillUnmount();

-        Dimensions.removeEventListener('change', this.handleDimensions);
+        this.dimensionsListener?.remove();
    }

    confirmReset = (status) => {
--- a/app/components/widgets/settings/snapshots/radio_setting.test.js.snap
+++ b/app/components/widgets/settings/snapshots/radio_setting.test.js.snap
@@ -44,7 +44,7 @@ exports[`components/widgets/settings/RadioSetting should match snapshot when err
      }
    }
  >
-    <ForwardRef
+    <TouchableOpacity
      onPress={[Function]}
    >
      <View
@@ -81,8 +81,8 @@ exports[`components/widgets/settings/RadioSetting should match snapshot when err
          }
        }
      />
-    </ForwardRef>
-    <ForwardRef
+    </TouchableOpacity>
+    <TouchableOpacity
      onPress={[Function]}
    >
      <View
@@ -119,8 +119,8 @@ exports[`components/widgets/settings/RadioSetting should match snapshot when err
          }
        }
      />
-    </ForwardRef>
-    <ForwardRef
+    </TouchableOpacity>
+    <TouchableOpacity
      onPress={[Function]}
    >
      <View
@@ -156,7 +156,7 @@ exports[`components/widgets/settings/RadioSetting should match snapshot when err
          }
        />
      </View>
-    </ForwardRef>
+    </TouchableOpacity>
  </View>
  <View>
    <Text
--- a/app/constants/deep_linking.js
+++ b/app/constants/deep_linking.js
@@ -7,4 +7,5 @@ export default {
    GROUPCHANNEL: 'groupchannel',
    PERMALINK: 'permalink',
    OTHER: 'other',
+    PLUGIN: 'plugin',
 };
--- a/app/mm-redux/action_types/apps.ts
+++ b/app/mm-redux/action_types/apps.ts
@@ -4,4 +4,9 @@ import keyMirror from '@mm-redux/utils/key_mirror';

 export default keyMirror({
    RECEIVED_APP_BINDINGS: null,
+    RECEIVED_THREAD_APP_BINDINGS: null,
+    CLEAR_APP_BINDINGS: null,
+    CLEAR_THREAD_APP_BINDINGS: null,
+    RECEIVED_APP_COMMAND_FORM: null,
+    RECEIVED_APP_RHS_COMMAND_FORM: null,
 });
--- a/app/mm-redux/actions/apps.ts
+++ b/app/mm-redux/actions/apps.ts
@@ -16,6 +16,30 @@ export function fetchAppBindings(userID: string, channelID: string): ActionFunc
        return dispatch(bindClientFunc({
            clientFunc: () => Client4.getAppsBindings(userID, channelID, teamID),
            onSuccess: AppsTypes.RECEIVED_APP_BINDINGS,
+            onFailure: AppsTypes.CLEAR_APP_BINDINGS,
        }));
    };
 }
+
+export function fetchThreadAppBindings(userID: string, channelID: string): ActionFunc {
+    return async (dispatch: DispatchFunc, getState: GetStateFunc) => {
+        const channel = getChannel(getState(), channelID);
+        const teamID = channel?.team_id || '';
+
+        return dispatch(bindClientFunc({
+            clientFunc: async () => {
+                const bindings = await Client4.getAppsBindings(userID, channelID, teamID);
+                return {bindings, channelID};
+            },
+            onSuccess: AppsTypes.RECEIVED_THREAD_APP_BINDINGS,
+            onRequest: AppsTypes.CLEAR_THREAD_APP_BINDINGS,
+        }));
+    };
+}
+
+export function clearThreadAppBindings() {
+    return {
+        type: AppsTypes.CLEAR_THREAD_APP_BINDINGS,
+        data: true,
+    };
+}
--- a/app/mm-redux/actions/integrations.ts
+++ b/app/mm-redux/actions/integrations.ts
@@ -4,6 +4,7 @@
 import {intlShape} from 'react-intl';
 import {Alert} from 'react-native';

+import {showModal} from '@actions/navigation';
 import {handleSelectChannel, handleSelectChannelByName, loadChannelsByTeamName} from '@actions/views/channel';
 import {makeDirectChannel} from '@actions/views/more_dms';
 import {showPermalink} from '@actions/views/permalink';
@@ -146,6 +147,9 @@ export function handleGotoLocation(href: string, intl: typeof intlShape): Action
                dispatch(makeGroupMessageVisibleIfNecessary(match.id));
                dispatch(handleSelectChannel(match.id));
                break;
+            case DeepLinkTypes.PLUGIN:
+                showModal('PluginInternal', match.id, {link: url});
+                break;
            }
        } else {
            const {formatMessage} = intl;
--- a/app/mm-redux/actions/search.ts
+++ b/app/mm-redux/actions/search.ts
@@ -114,13 +114,12 @@ export function getFlaggedPosts(): ActionFunc {
    return async (dispatch: DispatchFunc, getState: GetStateFunc) => {
        const state = getState();
        const userId = getCurrentUserId(state);
-        const teamId = getCurrentTeamId(state);

        dispatch({type: SearchTypes.SEARCH_FLAGGED_POSTS_REQUEST});

        let posts;
        try {
-            posts = await Client4.getFlaggedPosts(userId, '', teamId);
+            posts = await Client4.getFlaggedPosts(userId);

            await Promise.all([getProfilesAndStatusesForPosts(posts.posts, dispatch, getState) as any, dispatch(getMissingChannelsFromPosts(posts.posts)) as any]);
        } catch (error) {
@@ -202,7 +201,6 @@ export function clearPinnedPosts(channelId: string): ActionFunc {
 export function getRecentMentions(): ActionFunc {
    return async (dispatch: DispatchFunc, getState: GetStateFunc) => {
        const state = getState();
-        const teamId = getCurrentTeamId(state);

        let posts;
        try {
@@ -213,7 +211,7 @@ export function getRecentMentions(): ActionFunc {
            const terms = termKeys.map(({key}) => key).join(' ').trim() + ' ';

            analytics.trackAPI('api_posts_search_mention');
-            posts = await Client4.searchPosts(teamId, terms, true);
+            posts = await Client4.searchPosts('', terms, true);

            const profilesAndStatuses = getProfilesAndStatusesForPosts(posts.posts, dispatch, getState);
            const missingChannels = dispatch(getMissingChannelsFromPosts(posts.posts));
--- a/app/mm-redux/reducers/entities/apps.ts
+++ b/app/mm-redux/reducers/entities/apps.ts
@@ -5,7 +5,7 @@ import {combineReducers} from 'redux';

 import {AppsTypes} from '@mm-redux/action_types';
 import {GenericAction} from '@mm-redux/types/actions';
-import {AppBinding, AppsState} from '@mm-redux/types/apps';
+import {AppBinding, AppCommandFormMap, AppsState} from '@mm-redux/types/apps';
 import {validateBindings} from '@utils/apps';

 export function bindings(state: AppBinding[] = [], action: GenericAction): AppBinding[] {
@@ -17,6 +17,92 @@ export function bindings(state: AppBinding[] = [], action: GenericAction): AppBi
        }
        return newBindings;
    }
+    case AppsTypes.CLEAR_APP_BINDINGS:
+        if (state.length > 0) {
+            return [];
+        }
+        return state;
+    default:
+        return state;
+    }
+}
+
+export function bindingsForms(state: AppCommandFormMap = {}, action: GenericAction): AppCommandFormMap {
+    switch (action.type) {
+    case AppsTypes.RECEIVED_APP_BINDINGS:
+        if (Object.keys(state).length) {
+            return {};
+        }
+        return state;
+    case AppsTypes.RECEIVED_APP_COMMAND_FORM: {
+        const {form, location} = action.data;
+        const newState = {
+            ...state,
+            [location]: form,
+        };
+        return newState;
+    }
+    case AppsTypes.CLEAR_APP_BINDINGS: {
+        if (Object.keys(state).length) {
+            return {};
+        }
+        return state;
+    }
+    default:
+        return state;
+    }
+}
+
+export function threadBindings(state: AppBinding[] = [], action: GenericAction): AppBinding[] {
+    switch (action.type) {
+    case AppsTypes.RECEIVED_THREAD_APP_BINDINGS: {
+        return validateBindings(action.data.bindings) || [];
+    }
+    case AppsTypes.CLEAR_THREAD_APP_BINDINGS:
+        if (state.length > 0) {
+            return [];
+        }
+        return state;
+    default:
+        return state;
+    }
+}
+
+export function threadBindingsChannelId(state = '', action: GenericAction): string {
+    switch (action.type) {
+    case AppsTypes.RECEIVED_THREAD_APP_BINDINGS: {
+        return action.data.channelID || '';
+    }
+    case AppsTypes.CLEAR_THREAD_APP_BINDINGS:
+        if (state.length > 0) {
+            return '';
+        }
+        return state;
+    default:
+        return state;
+    }
+}
+
+export function threadBindingsForms(state: AppCommandFormMap = {}, action: GenericAction): AppCommandFormMap {
+    switch (action.type) {
+    case AppsTypes.RECEIVED_THREAD_APP_BINDINGS:
+        if (Object.keys(state).length) {
+            return {};
+        }
+        return state;
+    case AppsTypes.RECEIVED_APP_RHS_COMMAND_FORM: {
+        const {form, location} = action.data;
+        const newState = {
+            ...state,
+            [location]: form,
+        };
+        return newState;
+    }
+    case AppsTypes.CLEAR_THREAD_APP_BINDINGS:
+        if (Object.keys(state).length) {
+            return {};
+        }
+        return state;
    default:
        return state;
    }
@@ -24,4 +110,8 @@ export function bindings(state: AppBinding[] = [], action: GenericAction): AppBi

 export default (combineReducers({
    bindings,
+    bindingsForms,
+    threadBindings,
+    threadBindingsForms,
+    threadBindingsChannelId,
 }) as (b: AppsState, a: GenericAction) => AppsState);
--- a/app/mm-redux/selectors/entities/apps.ts
+++ b/app/mm-redux/selectors/entities/apps.ts
@@ -7,16 +7,8 @@ import {AppBinding} from '@mm-redux/types/apps';
 import {GlobalState} from '@mm-redux/types/store';
 import {appsEnabled} from '@utils/apps';

-export function getAppsBindings(state: GlobalState, location?: string): AppBinding[] {
-    if (!state.entities.apps.bindings) {
-        return [];
-    }
-
-    if (location) {
-        const bindings = state.entities.apps.bindings.filter((b) => b.location === location);
-        return bindings.reduce((accum: AppBinding[], current: AppBinding) => accum.concat(current.bindings || []), []);
-    }
-    return state.entities.apps.bindings;
+export function getThreadAppsBindingsChannelId(state: GlobalState): string {
+    return state.entities.apps.threadBindingsChannelId;
 }

 export const makeAppBindingsSelector = (location: string) => {
@@ -33,3 +25,26 @@ export const makeAppBindingsSelector = (location: string) => {
        },
    );
 };
+
+export const makeRHSAppBindingSelector = (location: string) => {
+    return createSelector(
+        (state: GlobalState) => state.entities.apps.threadBindings,
+        (state: GlobalState) => appsEnabled(state),
+        (bindings: AppBinding[], areAppsEnabled: boolean) => {
+            if (!areAppsEnabled || !bindings) {
+                return [];
+            }
+
+            const headerBindings = bindings.filter((b) => b.location === location);
+            return headerBindings.reduce((accum: AppBinding[], current: AppBinding) => accum.concat(current.bindings || []), []);
+        },
+    );
+};
+
+export const getAppCommandForm = (state: GlobalState, location: string) => {
+    return state.entities.apps.bindingsForms[location];
+};
+
+export const getAppRHSCommandForm = (state: GlobalState, location: string) => {
+    return state.entities.apps.threadBindingsForms[location];
+};
--- a/app/mm-redux/types/apps.ts
+++ b/app/mm-redux/types/apps.ts
@@ -18,6 +18,10 @@ export type AppModalState = {

 export type AppsState = {
    bindings: AppBinding[];
+    bindingsForms: AppCommandFormMap;
+    threadBindings: AppBinding[];
+    threadBindingsForms: AppCommandFormMap;
+    threadBindingsChannelId: string;
 };

 export type AppBinding = {
@@ -219,3 +223,5 @@ export type FormResponseData = {
 export type AppLookupResponse = {
    items: AppSelectOption[];
 }
+
+export type AppCommandFormMap = {[location: string]: AppForm}
--- a/app/screens/apps_form/apps_form_component.tsx
+++ b/app/screens/apps_form/apps_form_component.tsx
@@ -168,6 +168,8 @@ export default class AppsFormComponent extends PureComponent<Props, State> {
        const callResponse = res.data!;
        switch (callResponse.type) {
        case AppCallResponseTypes.OK:
+            await this.handleHide();
+            return;
        case AppCallResponseTypes.NAVIGATE:
            await this.handleHide();
            this.props.actions.handleGotoLocation(callResponse.navigate_to_url!, this.context.intl);
--- a/app/screens/channel/channel_nav_bar/snapshots/settings_sidebar_drawer_button.test.js.snap
+++ b/app/screens/channel/channel_nav_bar/snapshots/settings_sidebar_drawer_button.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`SettingsSidebarDrawerButton should match, full snapshot 1`] = `
-<ForwardRef
+<TouchableOpacity
  accessibilityHint="Opens the more options right hand sidebar"
  accessibilityLabel="More Options"
  accessibilityRole="button"
@@ -31,5 +31,5 @@ exports[`SettingsSidebarDrawerButton should match, full snapshot 1`] = `
      size={25}
    />
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;
--- a/app/screens/channel/channel_nav_bar/channel_nav_bar.js
+++ b/app/screens/channel/channel_nav_bar/channel_nav_bar.js
@@ -111,11 +111,11 @@ const ChannelNavBar = (props) => {
    useEffect(() => {
        handleDimensions();
        handlePermanentSidebar();
-        Dimensions.addEventListener('change', handleDimensions);
+        const dimensionsListener = Dimensions.addEventListener('change', handleDimensions);
        EventEmitter.on(DeviceTypes.PERMANENT_SIDEBAR_SETTINGS, handlePermanentSidebar);

        return () => {
-            Dimensions.removeEventListener('change', handleDimensions);
+            dimensionsListener.remove();
            EventEmitter.off(DeviceTypes.PERMANENT_SIDEBAR_SETTINGS, handlePermanentSidebar);
        };
    }, []);
--- a/app/screens/channel/channel_nav_bar/channel_search_button/snapshots/channel_search_button.test.js.snap
+++ b/app/screens/channel/channel_nav_bar/channel_search_button/snapshots/channel_search_button.test.js.snap
@@ -8,7 +8,7 @@ exports[`ChannelSearchButton should match, full snapshot 1`] = `
    }
  }
 >
-  <ForwardRef
+  <TouchableOpacity
    accessibilityHint="Opens the channel search modal"
    accessibilityLabel="Search"
    accessibilityRole="button"
@@ -43,6 +43,6 @@ exports[`ChannelSearchButton should match, full snapshot 1`] = `
        }
      />
    </View>
-  </ForwardRef>
+  </TouchableOpacity>
 </View>
 `;
--- a/app/screens/channel/channel_nav_bar/channel_title/snapshots/channel_title.test.js.snap
+++ b/app/screens/channel/channel_nav_bar/channel_title/snapshots/channel_title.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`ChannelTitle should match snapshot 1`] = `
-<ForwardRef
+<TouchableOpacity
  style={
    Object {
      "flex": 1,
@@ -54,11 +54,11 @@ exports[`ChannelTitle should match snapshot 1`] = `
      }
    />
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`ChannelTitle should match snapshot when is DM and has guests and the teammate is the guest (when can show subtitles) 1`] = `
-<ForwardRef
+<TouchableOpacity
  style={
    Object {
      "flex": 1,
@@ -150,11 +150,11 @@ exports[`ChannelTitle should match snapshot when is DM and has guests and the te
      }
    />
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`ChannelTitle should match snapshot when is DM and has guests but the teammate is not the guest (when can show subtitles) 1`] = `
-<ForwardRef
+<TouchableOpacity
  style={
    Object {
      "flex": 1,
@@ -221,11 +221,11 @@ exports[`ChannelTitle should match snapshot when is DM and has guests but the te
      }
    />
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`ChannelTitle should match snapshot when isChannelShared is true 1`] = `
-<ForwardRef
+<TouchableOpacity
  style={
    Object {
      "flex": 1,
@@ -297,11 +297,11 @@ exports[`ChannelTitle should match snapshot when isChannelShared is true 1`] = `
      }
    />
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`ChannelTitle should match snapshot when isSelfDMChannel is true 1`] = `
-<ForwardRef
+<TouchableOpacity
  style={
    Object {
      "flex": 1,
@@ -362,11 +362,11 @@ exports[`ChannelTitle should match snapshot when isSelfDMChannel is true 1`] = `
      }
    />
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`ChannelTitle should match snapshot with custom status emoji 1`] = `
-<ForwardRef
+<TouchableOpacity
  style={
    Object {
      "flex": 1,
@@ -433,5 +433,5 @@ exports[`ChannelTitle should match snapshot with custom status emoji 1`] = `
      }
    />
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;
--- a/app/screens/channel/channel_nav_bar/main_sidebar_drawer_button/snapshots/main_sidebar_drawer_button.test.js.snap
+++ b/app/screens/channel/channel_nav_bar/main_sidebar_drawer_button/snapshots/main_sidebar_drawer_button.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`MainSidebarDrawerButton should match, full snapshot 1`] = `
-<ForwardRef
+<TouchableOpacity
  accessibilityHint="Opens the channels and teams drawer"
  accessibilityLabel="Channels and teams"
  accessibilityRole="button"
@@ -37,11 +37,11 @@ exports[`MainSidebarDrawerButton should match, full snapshot 1`] = `
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`MainSidebarDrawerButton should match, full snapshot 2`] = `
-<ForwardRef
+<TouchableOpacity
  accessibilityHint="Opens the channels and teams drawer"
  accessibilityLabel="Channels and teams"
  accessibilityRole="button"
@@ -107,5 +107,5 @@ exports[`MainSidebarDrawerButton should match, full snapshot 2`] = `
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;
--- a/app/screens/channel_info/snapshots/channel_info_header.test.js.snap
+++ b/app/screens/channel_info/snapshots/channel_info_header.test.js.snap
@@ -90,7 +90,7 @@ exports[`channel_info_header should match snapshot 1`] = `
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -125,7 +125,7 @@ exports[`channel_info_header should match snapshot 1`] = `
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -134,7 +134,7 @@ exports[`channel_info_header should match snapshot 1`] = `
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -271,7 +271,7 @@ exports[`channel_info_header should match snapshot 1`] = `
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
@@ -424,7 +424,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -459,7 +459,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -468,7 +468,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -605,7 +605,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
@@ -730,7 +730,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -765,7 +765,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -774,7 +774,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -911,7 +911,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
@@ -1064,7 +1064,7 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = `
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -1099,7 +1099,7 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = `
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -1108,7 +1108,7 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = `
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -1245,7 +1245,7 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = `
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
@@ -1370,7 +1370,7 @@ exports[`channel_info_header should match snapshot when is group constrained 1`]
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -1405,7 +1405,7 @@ exports[`channel_info_header should match snapshot when is group constrained 1`]
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -1414,7 +1414,7 @@ exports[`channel_info_header should match snapshot when is group constrained 1`]
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -1551,7 +1551,7 @@ exports[`channel_info_header should match snapshot when is group constrained 1`]
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
@@ -1725,7 +1725,7 @@ exports[`channel_info_header should match snapshot when public channel and hasGu
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -1760,7 +1760,7 @@ exports[`channel_info_header should match snapshot when public channel and hasGu
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -1769,7 +1769,7 @@ exports[`channel_info_header should match snapshot when public channel and hasGu
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -1906,7 +1906,7 @@ exports[`channel_info_header should match snapshot when public channel and hasGu
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
@@ -2113,7 +2113,7 @@ exports[`channel_info_header should match snapshot with custom status enabled 1`
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -2148,7 +2148,7 @@ exports[`channel_info_header should match snapshot with custom status enabled 1`
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -2157,7 +2157,7 @@ exports[`channel_info_header should match snapshot with custom status enabled 1`
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -2294,7 +2294,7 @@ exports[`channel_info_header should match snapshot with custom status enabled 1`
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
@@ -2540,7 +2540,7 @@ exports[`channel_info_header should match snapshot with custom status expiry 1`]
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -2575,7 +2575,7 @@ exports[`channel_info_header should match snapshot with custom status expiry 1`]
          Purpose string
        </Text>
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <View
    style={
@@ -2584,7 +2584,7 @@ exports[`channel_info_header should match snapshot with custom status expiry 1`]
      }
    }
  >
-    <ForwardRef
+    <TouchableHighlight
      onLongPress={[Function]}
    >
      <View
@@ -2721,7 +2721,7 @@ exports[`channel_info_header should match snapshot with custom status expiry 1`]
          value="Header string"
        />
      </View>
-    </ForwardRef>
+    </TouchableHighlight>
  </View>
  <Text
    style={
--- a/app/screens/channel_info/snapshots/channel_info_row.test.js.snap
+++ b/app/screens/channel_info/snapshots/channel_info_row.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`ChannelInfoRow should match snapshot 1`] = `
-<ForwardRef
+<TouchableHighlight
  onPress={[MockFunction]}
 >
  <View
@@ -64,5 +64,5 @@ exports[`ChannelInfoRow should match snapshot 1`] = `
      }
    />
  </View>
-</ForwardRef>
+</TouchableHighlight>
 `;
--- a/app/screens/channel_info/bindings/bindings.tsx
+++ b/app/screens/channel_info/bindings/bindings.tsx
@@ -20,7 +20,7 @@ import ChannelInfoRow from '../channel_info_row';
 type Props = {
    bindings: AppBinding[];
    theme: Theme;
-    currentChannel: Channel;
+    currentChannel?: Channel;
    appsEnabled: boolean;
    intl: typeof intlShape;
    currentTeamId: string;
@@ -32,11 +32,15 @@ type Props = {
 }

 const Bindings: React.FC<Props> = injectIntl((props: Props) => {
-    if (!props.appsEnabled) {
+    const {bindings, currentChannel, appsEnabled, ...optionProps} = props;
+    if (!appsEnabled) {
+        return null;
+    }
+
+    if (!currentChannel) {
        return null;
    }

-    const {bindings, ...optionProps} = props;
    if (bindings.length === 0) {
        return null;
    }
@@ -45,6 +49,7 @@ const Bindings: React.FC<Props> = injectIntl((props: Props) => {
        <Option
            key={b.app_id + b.location}
            binding={b}
+            currentChannel={currentChannel}
            {...optionProps}
        />
    ));
@@ -88,7 +93,9 @@ class Option extends React.PureComponent<OptionProps, OptionState> {
            return;
        }

-        if (!binding.call) {
+        const call = binding.form?.call || binding.call;
+
+        if (!call) {
            return;
        }

@@ -98,14 +105,20 @@ class Option extends React.PureComponent<OptionProps, OptionState> {
            currentChannel.id,
            currentChannel.team_id || currentTeamId,
        );
-        const call = createCallRequest(
-            binding.call,
+        const callRequest = createCallRequest(
+            call,
            context,
        );

+        if (binding.form) {
+            await dismissModal();
+            showAppForm(binding.form, callRequest, theme);
+            return;
+        }
+
        this.setState({submitting: true});

-        const res = await doAppCall(call, AppCallTypes.SUBMIT, intl);
+        const res = await doAppCall(callRequest, AppCallTypes.SUBMIT, intl);

        this.setState({submitting: false});

@@ -169,7 +182,6 @@ class Option extends React.PureComponent<OptionProps, OptionState> {
                    action={this.onPress}
                    defaultMessage={binding.label}
                    theme={theme}
-                    textId={binding.app_id + binding.location}
                    image={binding.icon ? {uri: binding.icon} : null}
                />
            </>
--- a/app/screens/channel_info/bindings/index.ts
+++ b/app/screens/channel_info/bindings/index.ts
@@ -7,20 +7,24 @@ import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux';
 import {doAppCall, postEphemeralCallResponseForChannel} from '@actions/apps';
 import {handleGotoLocation} from '@mm-redux/actions/integrations';
 import {AppBindingLocations} from '@mm-redux/constants/apps';
-import {getAppsBindings} from '@mm-redux/selectors/entities/apps';
+import {makeAppBindingsSelector} from '@mm-redux/selectors/entities/apps';
 import {getCurrentChannel} from '@mm-redux/selectors/entities/channels';
 import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
 import {GenericAction, ActionFunc} from '@mm-redux/types/actions';
+import {AppBinding} from '@mm-redux/types/apps';
 import {GlobalState} from '@mm-redux/types/store';
 import {DoAppCall, PostEphemeralCallResponseForChannel} from '@mm-types/actions/apps';
 import {appsEnabled} from '@utils/apps';

 import Bindings from './bindings';

+const getChannelHeaderBindings = makeAppBindingsSelector(AppBindingLocations.CHANNEL_HEADER_ICON);
+const emptyBindingsList: AppBinding[] = [];
+
 function mapStateToProps(state: GlobalState) {
    const apps = appsEnabled(state);
-    const currentChannel = getCurrentChannel(state) || {};
-    const bindings = apps ? getAppsBindings(state, AppBindingLocations.CHANNEL_HEADER_ICON) : [];
+    const currentChannel = getCurrentChannel(state);
+    const bindings = apps ? getChannelHeaderBindings(state) : emptyBindingsList;

    return {
        bindings,
--- a/app/screens/channel_info/channel_info_row.js
+++ b/app/screens/channel_info/channel_info_row.js
@@ -79,17 +79,24 @@ function channelInfoRow(props) {
        );
    }

+    const labelStyle = [style.label, {color: textColor || theme.centerChannelColor}];
+    let label = <Text style={labelStyle}>{defaultMessage}</Text>;
+    if (textId) {
+        label = (
+            <FormattedText
+                style={labelStyle}
+                id={textId}
+                defaultMessage={defaultMessage}
+            />
+        );
+    }
    const RowComponent = (
        <View
            testID={testID}
            style={style.container}
        >
            {iconElement}
-            <FormattedText
-                style={[style.label, {color: textColor || theme.centerChannelColor}]}
-                id={textId}
-                defaultMessage={defaultMessage}
-            />
+            {label}
            <Text style={style.detail}>{detail}</Text>
            {actionElement}
        </View>
@@ -120,7 +127,7 @@ channelInfoRow.propTypes = {
    imageTintColor: PropTypes.string,
    isLandscape: PropTypes.bool,
    rightArrow: PropTypes.bool,
-    textId: PropTypes.string.isRequired,
+    textId: PropTypes.string,
    togglable: PropTypes.bool,
    textColor: PropTypes.string,
    theme: PropTypes.object.isRequired,
--- a/app/screens/custom_status/snapshots/custom_status_suggestion.test.tsx.snap
+++ b/app/screens/custom_status/snapshots/custom_status_suggestion.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`screens/custom_status_suggestion should match snapshot 1`] = `
-<ForwardRef
+<TouchableOpacity
  onPress={[Function]}
  testID="custom_status_suggestion.In a meeting"
 >
@@ -91,11 +91,11 @@ exports[`screens/custom_status_suggestion should match snapshot 1`] = `
      </View>
    </View>
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;

 exports[`screens/custom_status_suggestion should match snapshot with separator and clear button 1`] = `
-<ForwardRef
+<TouchableOpacity
  onPress={[Function]}
  testID="custom_status_suggestion.In a meeting"
 >
@@ -194,5 +194,5 @@ exports[`screens/custom_status_suggestion should match snapshot with separator a
      />
    </View>
  </View>
-</ForwardRef>
+</TouchableOpacity>
 `;
--- a/app/screens/custom_status_clear_after/snapshots/clear_after_menu_item.test.tsx.snap
+++ b/app/screens/custom_status_clear_after/snapshots/clear_after_menu_item.test.tsx.snap
@@ -2,7 +2,7 @@

 exports[`screens/clear_after_menu_item should match snapshot 1`] = `
 <View>
-  <ForwardRef
+  <TouchableOpacity
    onPress={[Function]}
    testID="clear_after.menu_item."
  >
@@ -68,13 +68,13 @@ exports[`screens/clear_after_menu_item should match snapshot 1`] = `
        />
      </View>
    </View>
-  </ForwardRef>
+  </TouchableOpacity>
 </View>
 `;

 exports[`screens/clear_after_menu_item should match snapshot with separator and selected check 1`] = `
 <View>
-  <ForwardRef
+  <TouchableOpacity
    onPress={[Function]}
    testID="clear_after.menu_item."
  >
@@ -168,6 +168,6 @@ exports[`screens/clear_after_menu_item should match snapshot with separator and
        }
      }
    />
-  </ForwardRef>
+  </TouchableOpacity>
 </View>
 `;
--- a/app/screens/custom_status_clear_after/snapshots/date_time_selector.test.tsx.snap
+++ b/app/screens/custom_status_clear_after/snapshots/date_time_selector.test.tsx.snap
@@ -23,9 +23,10 @@ exports[`screens/date_time_selector should match snapshot 1`] = `
  >
    <View
      accessibilityRole="button"
-      accessibilityState={Object {}}
      accessible={true}
+      collapsable={false}
      focusable={true}
+      nativeID="animatedComponent"
      onClick={[Function]}
      onResponderGrant={[Function]}
      onResponderMove={[Function]}
@@ -68,9 +69,10 @@ exports[`screens/date_time_selector should match snapshot 1`] = `
    </View>
    <View
      accessibilityRole="button"
-      accessibilityState={Object {}}
      accessible={true}
+      collapsable={false}
      focusable={true}
+      nativeID="animatedComponent"
      onClick={[Function]}
      onResponderGrant={[Function]}
      onResponderMove={[Function]}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Elias Nahum	86508004cf	update fastlane	2022-01-13 11:54:00 -03:00
Elias Nahum	4f5bcdcb59	match type	2021-10-01 21:14:18 -03:00
Elias Nahum	e25e179e42	Merge branch 'master' into match	2021-10-01 21:00:04 -03:00
Weblate (bot)	8447d7feea	Translations update from Weblate (#5694 ) * Translated using Weblate (German) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/de/ * Translated using Weblate (French) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/nl/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/zh_Hans/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/hu/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/en_AU/ * Translated using Weblate (Japanese) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/ja/ * Translated using Weblate (Polish) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/pl/ * Translated using Weblate (Turkish) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/ Translated using Weblate (Turkish) Currently translated at 100.0% (771 of 771 strings) Translation: mattermost-languages-shipped/mattermost-mobile Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile_master/tr/ Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Nathanaël <contact@nathanaelhoun.fr> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: master7 <marcin.karkosz@rajska.info> Co-authored-by: Kaya Zeren <kayazeren@gmail.com>	2021-09-30 09:50:44 -03:00
Elias Nahum	523777a207	Use @mattermost/react-native-paste-input to allow pasting of images & files (#5703 ) * Use @mattermost/react-native-paste-input to allow pasting of images & files * upgrade @mattermost/react-native-paste-input	2021-09-30 09:34:57 -03:00
Elias Nahum	d9e8b3e08e	Bump app build number to 370 (#5700 )	2021-09-28 11:38:35 -03:00
Shaz Amjad	b36dbf9b34	[MM-38683] Android Initialisation Bug + BottomSheet Correction (#5685 ) * Fixes various init bugs for android * Ignores Type Error * MM-38683: Removes 'cancel' button. * MM-38683: Removes some 'hideCancel' props. * Android bottom margin * Update options modal style Co-authored-by: Martin Kraft <martin@upspin.org> Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2021-09-28 11:28:20 -03:00
Elias Nahum	7e9c574c3f	Fix android extension crash (#5696 )	2021-09-28 11:27:46 -03:00
Daniel Espino García	3668cb62d3	MM-34811 Add plugin oauth support (#5395 ) * Add plugin oauth support * Fix types * Switch go to screen by show modal * Add content width metadata to show correctly the sites * Remove unneeded metadata * Fix tsc * Fix lint Co-authored-by: Mattermod <mattermod@users.noreply.github.com>	2021-09-27 18:17:56 +02:00
Daniel Espino García	a2ed6ba3bd	Sync with App Command Parser with Webapp (#5631 ) * Sync with App Command Parser with Webapp * Add i18n * Patch flaky test	2021-09-27 14:54:32 +02:00
Daniel Espino García	dd36545079	[MM-36041] Ensure post options and app commands always have the bindings for its channel (#5563 ) * Ensure post options always have the bindings for its channel * Mimic webapp model * Address feedback * Add return to validate bindings * Address feedback * Use empty bindings constant to avoid rerenderings Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com>	2021-09-24 10:32:58 -04:00
Daniel Espino García	edfd743699	[MM-38216] Add multiteam mentions and saved posts (#5677 ) * Add multiteam mentions and saved posts * Minor fix * Fix long names * Add tests, improve separation styling, revert changes on the flagged posts client, and omit the team name when the user only belongs to one team * Fix separator on iOS * Update snapshot * Fix separator * Fix snapshot * Differentiate styling between iOS and Android * Change channelTeamName to teamName	2021-09-24 09:35:01 -03:00
Daniel Espino García	6dbb537f22	Open forms in bindings on all locations (#5665 )	2021-09-24 09:34:40 -03:00
Daniel Espino García	aa776e4ae6	Fix warnings on channel info row Formatted Text (#5644 )	2021-09-23 21:55:34 +02:00
Amy Blais	1287357e7c	Update NOTICE.txt (#5688 )	2021-09-22 15:35:30 -03:00
Elias Nahum	ada6be9b7a	Update dependencies (#5686 ) * Update dependencies * Fix unsigned builds	2021-09-22 13:54:12 -03:00
Elias Nahum	62e1fdac7d	Get Apple API key for match adhoc lane	2021-07-06 13:58:35 -04:00