diff --git a/.editorconfig b/.editorconfig
index be3c34776..8496df79f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,7 +7,7 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 
-[*.{js,jsx,json,html}]
+[*.{js,jsx,json,html,ts,tsx}]
 indent_style = space
 indent_size = 4
 
diff --git a/.eslintrc.json b/.eslintrc.json
index b7d9dbed4..191b60b9a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -2,7 +2,8 @@
   "extends": [
     "plugin:mattermost/react",
     "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react-hooks/recommended"
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": [
diff --git a/.gitignore b/.gitignore
index 8871c6170..7be23d51e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,4 @@ detox/artifacts
 
 #editor-settings
 .vscode
+.scannerwork
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2bcc4148f..8e49c43b2 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattermost.rnbeta">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mattermost.rnbeta">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -44,17 +43,16 @@
           <category android:name="android.intent.category.BROWSABLE" />
           <data android:scheme="mattermost" />
         </intent-filter>
+          <intent-filter>
+              <action android:name="android.intent.action.VIEW" />
+              <category android:name="android.intent.category.DEFAULT" />
+              <category android:name="android.intent.category.BROWSABLE" />
+              <data android:scheme="mmauthbeta" />
+          </intent-filter>
       </activity>
-      <service android:name=".NotificationDismissService"
-                android:enabled="true"
-                android:exported="false" />
-      <receiver android:name=".NotificationReplyBroadcastReceiver"
-               android:enabled="true"
-               android:exported="false" />
-        <activity
-                android:name="com.reactnativenavigation.controllers.NavigationActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-                android:resizeableActivity="true"/>
+      <service android:name=".NotificationDismissService" android:enabled="true" android:exported="false" />
+      <receiver android:name=".NotificationReplyBroadcastReceiver" android:enabled="true" android:exported="false" />
+        <activity android:name="com.reactnativenavigation.controllers.NavigationActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:resizeableActivity="true"/>
         <activity
                 android:name="com.mattermost.share.ShareActivity"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
diff --git a/android/app/src/main/java/com/mattermost/helpers/Credentials.java b/android/app/src/main/java/com/mattermost/helpers/Credentials.java
index 48a574a8e..7f3ee7572 100644
--- a/android/app/src/main/java/com/mattermost/helpers/Credentials.java
+++ b/android/app/src/main/java/com/mattermost/helpers/Credentials.java
@@ -1,8 +1,5 @@
 package com.mattermost.helpers;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
@@ -10,27 +7,9 @@ import com.oblador.keychain.KeychainModule;
 
 
 public class Credentials {
-    static final String CURRENT_SERVER_URL = "@currentServerUrl";
-
-    public static void getCredentialsForCurrentServer(ReactApplicationContext context, ResolvePromise promise) {
+    public static void getCredentialsForServer(ReactApplicationContext context, String serverUrl, ResolvePromise promise) {
         final KeychainModule keychainModule = new KeychainModule(context);
-        final AsyncStorage asyncStorage = new AsyncStorage(context);
-        final ArrayList<String> keys = new ArrayList<String>(1);
-        keys.add(CURRENT_SERVER_URL);
-        KeysReadableArray asyncStorageKeys = new KeysReadableArray() {
-            @Override
-            public int size() {
-                return keys.size();
-            }
 
-            @Override
-            public String getString(int index) {
-                return keys.get(index);
-            }
-        };
-
-        HashMap<String, String> asyncStorageResults = asyncStorage.multiGet(asyncStorageKeys);
-        String serverUrl = asyncStorageResults.get(CURRENT_SERVER_URL);
         final WritableMap options = Arguments.createMap();
         // KeyChain module fails if `authenticationPrompt` is not set
         final WritableMap authPrompt = Arguments.createMap();
diff --git a/android/app/src/main/java/com/mattermost/helpers/DatabaseHelper.java b/android/app/src/main/java/com/mattermost/helpers/DatabaseHelper.java
new file mode 100644
index 000000000..cf3b07338
--- /dev/null
+++ b/android/app/src/main/java/com/mattermost/helpers/DatabaseHelper.java
@@ -0,0 +1,34 @@
+package com.mattermost.helpers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+
+import com.nozbe.watermelondb.Database;
+
+public class DatabaseHelper {
+    private static final String DEFAULT_DATABASE_NAME = "default.db";
+    private static Database defaultDatabase;
+
+    private static void setDefaultDatabase(Context context) {
+        String databaseName = Uri.fromFile(context.getFilesDir()).toString() + "/" + DEFAULT_DATABASE_NAME;
+        defaultDatabase = new Database(databaseName, context);
+    }
+
+    public static String getOnlyServerUrl(Context context) {
+        if (defaultDatabase == null) {
+            setDefaultDatabase(context);
+        }
+
+        String emptyArray[] = {};
+        String query = "SELECT url FROM servers";
+        Cursor cursor = defaultDatabase.rawQuery(query, emptyArray);
+
+        if (cursor.getCount() == 1) {
+            cursor.moveToFirst();
+            return cursor.getString(0);
+        }
+
+        return null;
+    }
+}
diff --git a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
index f5b713096..ebe9cc987 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -27,6 +27,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.mattermost.helpers.DatabaseHelper;
+import com.mattermost.helpers.ResolvePromise;
 import com.wix.reactnativenotifications.core.notification.PushNotification;
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
@@ -35,11 +37,10 @@ import com.wix.reactnativenotifications.core.JsIOHelper;
 
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 
-import com.mattermost.helpers.ResolvePromise;
-
 public class CustomPushNotification extends PushNotification {
     public static final int MESSAGE_NOTIFICATION_ID = 435345;
     public static final String GROUP_KEY_MESSAGES = "mm_group_key_messages";
+    public static final String NOTIFICATION = "notification";
     public static final String NOTIFICATION_ID = "notificationId";
     public static final String KEY_TEXT_REPLY = "CAN_REPLY";
     public static final String NOTIFICATION_REPLIED_EVENT_NAME = "notificationReplied";
@@ -61,6 +62,7 @@ public class CustomPushNotification extends PushNotification {
     public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade appLifecycleFacade, AppLaunchHelper appLaunchHelper, JsIOHelper jsIoHelper) {
         super(context, bundle, appLifecycleFacade, appLaunchHelper, jsIoHelper);
         this.context = context;
+
         createNotificationChannels();
     }
 
@@ -106,8 +108,10 @@ public class CustomPushNotification extends PushNotification {
         final boolean isIdLoaded = initialData.getString("id_loaded") != null ? initialData.getString("id_loaded").equals("true") : false;
         int notificationId = MESSAGE_NOTIFICATION_ID;
 
-        if (ackId != null) {
-            notificationReceiptDelivery(ackId, postId, type, isIdLoaded, new ResolvePromise() {
+        String serverUrl = initialData.getString("server_url", DatabaseHelper.getOnlyServerUrl(context));
+
+        if (ackId != null && serverUrl != null) {
+            notificationReceiptDelivery(ackId, serverUrl, postId, type, isIdLoaded, new ResolvePromise() {
                 @Override
                 public void resolve(@Nullable Object value) {
                     if (isIdLoaded) {
@@ -127,6 +131,11 @@ public class CustomPushNotification extends PushNotification {
         // so we fetch the bundle again
         final Bundle data = mNotificationProps.asBundle();
 
+        if (serverUrl == null) {
+            String message = data.getString("message");
+            data.putString("message", "Unknown Server\n" + message);
+        }
+
         if (channelId != null) {
             notificationId = channelId.hashCode();
 
@@ -465,15 +474,18 @@ public class CustomPushNotification extends PushNotification {
 
     private void addNotificationReplyAction(Notification.Builder notification, int notificationId, Bundle bundle) {
         String postId = bundle.getString("post_id");
+        String serverUrl = bundle.getString("server_url", DatabaseHelper.getOnlyServerUrl(context));
 
-        if (android.text.TextUtils.isEmpty(postId) || Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+        if (android.text.TextUtils.isEmpty(postId) ||
+                serverUrl == null ||
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             return;
         }
 
         Intent replyIntent = new Intent(mContext, NotificationReplyBroadcastReceiver.class);
         replyIntent.setAction(KEY_TEXT_REPLY);
         replyIntent.putExtra(NOTIFICATION_ID, notificationId);
-        replyIntent.putExtra("pushNotification", bundle);
+        replyIntent.putExtra(NOTIFICATION, bundle);
 
         PendingIntent replyPendingIntent = PendingIntent.getBroadcast(
             mContext,
@@ -540,8 +552,8 @@ public class CustomPushNotification extends PushNotification {
         return message.replaceFirst(": ", "").trim();
     }
 
-    private void notificationReceiptDelivery(String ackId, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
-        ReceiptDelivery.send(context, ackId, postId, type, isIdLoaded, promise);
+    private void notificationReceiptDelivery(String ackId, String serverUrl, String postId, String type, boolean isIdLoaded, ResolvePromise promise) {
+        ReceiptDelivery.send(context, ackId, serverUrl, postId, type, isIdLoaded, promise);
     }
 
     private void createNotificationChannels() {
diff --git a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
index 6452d4c02..fc2884bd8 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -46,7 +46,6 @@ import com.facebook.soloader.SoLoader;
 
 import org.unimodules.adapters.react.ModuleRegistryAdapter;
 import org.unimodules.adapters.react.ReactModuleRegistryProvider;
-import org.unimodules.core.interfaces.SingletonModule;
 
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 
diff --git a/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java b/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
index f630fb4af..e81e46622 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java
@@ -48,9 +48,11 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver {
 
             final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
             final int notificationId = intent.getIntExtra(CustomPushNotification.NOTIFICATION_ID, -1);
+            final Bundle notification = intent.getBundleExtra(CustomPushNotification.NOTIFICATION);
+            final String serverUrl = notification.getString("serverUrl");
 
 
-            Credentials.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+            Credentials.getCredentialsForServer(reactApplicationContext, serverUrl, new ResolvePromise() {
                 @Override
                 public void resolve(@Nullable Object value) {
                     if (value instanceof Boolean && !(Boolean)value) {
diff --git a/android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java b/android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java
index 2e8ab101a..256d81fa2 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/ReceiptDelivery.java
@@ -22,14 +22,12 @@ import com.facebook.react.bridge.WritableMap;
 import com.mattermost.helpers.*;
 
 public class ReceiptDelivery {
-    static final String CURRENT_SERVER_URL = "@currentServerUrl";
-
     private static final int[] FIBONACCI_BACKOFFS = new int[] { 0, 1, 2, 3, 5, 8 };
 
-    public static void send(Context context, final String ackId, final String postId, final String type, final boolean isIdLoaded, ResolvePromise promise) {
+    public static void send(Context context, final String ackId, final String serverUrl, final String postId, final String type, final boolean isIdLoaded, ResolvePromise promise) {
         final ReactApplicationContext reactApplicationContext = new ReactApplicationContext(context);
 
-        Credentials.getCredentialsForCurrentServer(reactApplicationContext, new ResolvePromise() {
+        Credentials.getCredentialsForServer(reactApplicationContext, serverUrl, new ResolvePromise() {
             @Override
             public void resolve(@Nullable Object value) {
                 if (value instanceof Boolean && !(Boolean)value) {
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 140b05030..166843b94 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,10 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">    
     </style>
 
     <style name="LightTheme" parent="Theme.AppCompat.Light.NoActionBar">
diff --git a/app/client/rest/apps.ts b/app/client/rest/apps.ts
new file mode 100644
index 000000000..08eb32d75
--- /dev/null
+++ b/app/client/rest/apps.ts
@@ -0,0 +1,43 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+export interface ClientAppsMix {
+    executeAppCall: (call: AppCallRequest, type: AppCallType) => Promise<AppCallResponse>;
+    getAppsBindings: (userID: string, channelID: string, teamID: string) => Promise<AppBinding[]>;
+}
+
+const ClientApps = (superclass: any) => class extends superclass {
+    executeAppCall = async (call: AppCallRequest, type: AppCallType) => {
+        const callCopy = {
+            ...call,
+            path: `${call.path}/${type}`,
+            context: {
+                ...call.context,
+                user_agent: 'mobile',
+            },
+        };
+
+        return this.doFetch(
+            `${this.getAppsProxyRoute()}/api/v1/call`,
+            {method: 'post', body: JSON.stringify(callCopy)},
+        );
+    }
+
+    getAppsBindings = async (userID: string, channelID: string, teamID: string) => {
+        const params = {
+            user_id: userID,
+            channel_id: channelID,
+            team_id: teamID,
+            user_agent: 'mobile',
+        };
+
+        return this.doFetch(
+            `${this.getAppsProxyRoute()}/api/v1/bindings${buildQueryString(params)}`,
+            {method: 'get'},
+        );
+    }
+};
+
+export default ClientApps;
diff --git a/app/client/rest/base.ts b/app/client/rest/base.ts
new file mode 100644
index 000000000..14c4125e9
--- /dev/null
+++ b/app/client/rest/base.ts
@@ -0,0 +1,375 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {ClientOptions} from '@typings/api/client4';
+import urlParse from 'url-parse';
+
+import {Analytics, create} from '@init/analytics';
+
+import * as ClientConstants from './constants';
+import ClientError from './error';
+
+export default class ClientBase {
+    analytics: Analytics|undefined;
+    clusterId = '';
+    csrf = '';
+    defaultHeaders: {[x: string]: string} = {};
+    diagnosticId = '';
+    enableLogging = false;
+    includeCookies = true;
+    logToConsole = false;
+    managedConfig: any = null;
+    serverVersion = '';
+    token = '';
+    translations = {
+        connectionError: 'There appears to be a problem with your internet connection.',
+        unknownError: 'We received an unexpected status code from the server.',
+    };
+    userAgent: string|null = null;
+    url = '';
+    urlVersion = '/api/v4';
+
+    getAbsoluteUrl(baseUrl: string) {
+        if (typeof baseUrl !== 'string' || !baseUrl.startsWith('/')) {
+            return baseUrl;
+        }
+        return this.getUrl() + baseUrl;
+    }
+
+    getOptions(options: ClientOptions) {
+        const newOptions: ClientOptions = {...options};
+
+        const headers: {[x: string]: string} = {
+            [ClientConstants.HEADER_REQUESTED_WITH]: 'XMLHttpRequest',
+            ...this.defaultHeaders,
+        };
+
+        if (this.token) {
+            headers[ClientConstants.HEADER_AUTH] = `${ClientConstants.HEADER_BEARER} ${this.token}`;
+        }
+
+        const csrfToken = this.csrf || '';
+        if (options.method && options.method.toLowerCase() !== 'get' && csrfToken) {
+            headers[ClientConstants.HEADER_X_CSRF_TOKEN] = csrfToken;
+        }
+
+        if (this.includeCookies) {
+            newOptions.credentials = 'include';
+        }
+
+        if (this.userAgent) {
+            headers[ClientConstants.HEADER_USER_AGENT] = this.userAgent;
+        }
+
+        if (newOptions.headers) {
+            Object.assign(headers, newOptions.headers);
+        }
+
+        return {
+            ...newOptions,
+            headers,
+        };
+    }
+
+    getServerVersion() {
+        return this.serverVersion;
+    }
+
+    getToken() {
+        return this.token;
+    }
+
+    getUrl() {
+        return this.url;
+    }
+
+    getUrlVersion() {
+        return this.urlVersion;
+    }
+
+    getWebSocketUrl = () => {
+        return `${this.getBaseRoute()}/websocket`;
+    }
+
+    setAcceptLanguage(locale: string) {
+        this.defaultHeaders['Accept-Language'] = locale;
+    }
+
+    setCSRF(csrfToken: string) {
+        this.csrf = csrfToken;
+    }
+
+    setDiagnosticId(diagnosticId: string) {
+        this.diagnosticId = diagnosticId;
+    }
+
+    setEnableLogging(enable: boolean) {
+        this.enableLogging = enable;
+    }
+
+    setIncludeCookies(include: boolean) {
+        this.includeCookies = include;
+    }
+
+    setManagedConfig(config: any) {
+        this.managedConfig = config;
+    }
+
+    setUserAgent(userAgent: string) {
+        this.userAgent = userAgent;
+    }
+
+    setToken(token: string) {
+        this.token = token;
+    }
+
+    setUrl(url: string) {
+        this.url = url.replace(/\/+$/, '');
+        this.analytics = create(this.url);
+    }
+
+    // Routes
+    getBaseRoute() {
+        return `${this.url}${this.urlVersion}`;
+    }
+
+    getUsersRoute() {
+        return `${this.getBaseRoute()}/users`;
+    }
+
+    getUserRoute(userId: string) {
+        return `${this.getUsersRoute()}/${userId}`;
+    }
+
+    getTeamsRoute() {
+        return `${this.getBaseRoute()}/teams`;
+    }
+
+    getTeamRoute(teamId: string) {
+        return `${this.getTeamsRoute()}/${teamId}`;
+    }
+
+    getTeamNameRoute(teamName: string) {
+        return `${this.getTeamsRoute()}/name/${teamName}`;
+    }
+
+    getTeamMembersRoute(teamId: string) {
+        return `${this.getTeamRoute(teamId)}/members`;
+    }
+
+    getTeamMemberRoute(teamId: string, userId: string) {
+        return `${this.getTeamMembersRoute(teamId)}/${userId}`;
+    }
+
+    getChannelsRoute() {
+        return `${this.getBaseRoute()}/channels`;
+    }
+
+    getChannelRoute(channelId: string) {
+        return `${this.getChannelsRoute()}/${channelId}`;
+    }
+
+    getChannelMembersRoute(channelId: string) {
+        return `${this.getChannelRoute(channelId)}/members`;
+    }
+
+    getChannelMemberRoute(channelId: string, userId: string) {
+        return `${this.getChannelMembersRoute(channelId)}/${userId}`;
+    }
+
+    getPostsRoute() {
+        return `${this.getBaseRoute()}/posts`;
+    }
+
+    getPostRoute(postId: string) {
+        return `${this.getPostsRoute()}/${postId}`;
+    }
+
+    getReactionsRoute() {
+        return `${this.getBaseRoute()}/reactions`;
+    }
+
+    getCommandsRoute() {
+        return `${this.getBaseRoute()}/commands`;
+    }
+
+    getFilesRoute() {
+        return `${this.getBaseRoute()}/files`;
+    }
+
+    getFileRoute(fileId: string) {
+        return `${this.getFilesRoute()}/${fileId}`;
+    }
+
+    getPreferencesRoute(userId: string) {
+        return `${this.getUserRoute(userId)}/preferences`;
+    }
+
+    getIncomingHooksRoute() {
+        return `${this.getBaseRoute()}/hooks/incoming`;
+    }
+
+    getIncomingHookRoute(hookId: string) {
+        return `${this.getBaseRoute()}/hooks/incoming/${hookId}`;
+    }
+
+    getOutgoingHooksRoute() {
+        return `${this.getBaseRoute()}/hooks/outgoing`;
+    }
+
+    getOutgoingHookRoute(hookId: string) {
+        return `${this.getBaseRoute()}/hooks/outgoing/${hookId}`;
+    }
+
+    getOAuthRoute() {
+        return `${this.url}/oauth`;
+    }
+
+    getOAuthAppsRoute() {
+        return `${this.getBaseRoute()}/oauth/apps`;
+    }
+
+    getOAuthAppRoute(appId: string) {
+        return `${this.getOAuthAppsRoute()}/${appId}`;
+    }
+
+    getEmojisRoute() {
+        return `${this.getBaseRoute()}/emoji`;
+    }
+
+    getEmojiRoute(emojiId: string) {
+        return `${this.getEmojisRoute()}/${emojiId}`;
+    }
+
+    getBrandRoute() {
+        return `${this.getBaseRoute()}/brand`;
+    }
+
+    getBrandImageUrl(timestamp: string) {
+        return `${this.getBrandRoute()}/image?t=${timestamp}`;
+    }
+
+    getDataRetentionRoute() {
+        return `${this.getBaseRoute()}/data_retention`;
+    }
+
+    getRolesRoute() {
+        return `${this.getBaseRoute()}/roles`;
+    }
+
+    getTimezonesRoute() {
+        return `${this.getBaseRoute()}/system/timezones`;
+    }
+
+    getRedirectLocationRoute() {
+        return `${this.getBaseRoute()}/redirect_location`;
+    }
+
+    getBotsRoute() {
+        return `${this.getBaseRoute()}/bots`;
+    }
+
+    getBotRoute(botUserId: string) {
+        return `${this.getBotsRoute()}/${botUserId}`;
+    }
+
+    getAppsProxyRoute() {
+        return `${this.url}/plugins/com.mattermost.apps`;
+    }
+
+    // Client Helpers
+    handleRedirectProtocol = (url: string, response: Response) => {
+        const serverUrl = this.getUrl();
+        const parsed = urlParse(url);
+
+        if (response.redirected) {
+            const redirectUrl = urlParse(response.url);
+
+            if (serverUrl === parsed.origin && parsed.host === redirectUrl.host && parsed.protocol !== redirectUrl.protocol) {
+                this.setUrl(serverUrl.replace(parsed.protocol, redirectUrl.protocol));
+            }
+        }
+    };
+
+    doFetch = async (url: string, options: ClientOptions) => {
+        const {data} = await this.doFetchWithResponse(url, options);
+
+        return data;
+    };
+
+    doFetchWithResponse = async (url: string, options: ClientOptions) => {
+        const response = await fetch(url, this.getOptions(options));
+        const headers = parseAndMergeNestedHeaders(response.headers);
+
+        let data;
+        try {
+            data = await response.json();
+        } catch (err) {
+            throw new ClientError(this.getUrl(), {
+                message: 'Received invalid response from the server.',
+                intl: {
+                    id: 'mobile.request.invalid_response',
+                    defaultMessage: 'Received invalid response from the server.',
+                },
+                url,
+            });
+        }
+
+        if (headers.has(ClientConstants.HEADER_X_VERSION_ID) && !headers.get('Cache-Control')) {
+            const serverVersion = headers.get(ClientConstants.HEADER_X_VERSION_ID);
+            if (serverVersion && this.serverVersion !== serverVersion) {
+                this.serverVersion = serverVersion;
+            }
+        }
+
+        if (headers.has(ClientConstants.HEADER_X_CLUSTER_ID)) {
+            const clusterId = headers.get(ClientConstants.HEADER_X_CLUSTER_ID);
+            if (clusterId && this.clusterId !== clusterId) {
+                this.clusterId = clusterId;
+            }
+        }
+
+        if (response.ok) {
+            return {
+                response,
+                headers,
+                data,
+            };
+        }
+
+        const msg = data.message || '';
+
+        if (this.logToConsole) {
+            console.error(msg); // eslint-disable-line no-console
+        }
+
+        throw new ClientError(this.getUrl(), {
+            message: msg,
+            server_error_id: data.id,
+            status_code: data.status_code,
+            url,
+        });
+    };
+}
+
+function parseAndMergeNestedHeaders(originalHeaders: any) {
+    const headers = new Map();
+    let nestedHeaders = new Map();
+    originalHeaders.forEach((val: string, key: string) => {
+        const capitalizedKey = key.replace(/\b[a-z]/g, (l) => l.toUpperCase());
+        let realVal = val;
+        if (val && val.match(/\n\S+:\s\S+/)) {
+            const nestedHeaderStrings = val.split('\n');
+            realVal = nestedHeaderStrings.shift() as string;
+            const moreNestedHeaders = new Map(
+                nestedHeaderStrings.map((h: any) => h.split(/:\s/)),
+            );
+            nestedHeaders = new Map([...nestedHeaders, ...moreNestedHeaders]);
+        }
+        headers.set(capitalizedKey, realVal);
+    });
+    return new Map([...headers, ...nestedHeaders]);
+}
diff --git a/app/client/rest/bots.ts b/app/client/rest/bots.ts
new file mode 100644
index 000000000..b0636e10e
--- /dev/null
+++ b/app/client/rest/bots.ts
@@ -0,0 +1,37 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+export interface ClientBotsMix {
+    getBot: (botUserId: string) => Promise<Bot>;
+    getBots: (page?: number, perPage?: number) => Promise<Bot[]>;
+    getBotsIncludeDeleted: (page?: number, perPage?: number) => Promise<Bot[]>;
+}
+
+const PER_PAGE_DEFAULT = 60;
+
+const ClientBots = (superclass: any) => class extends superclass {
+    getBot = async (botUserId: string) => {
+        return this.doFetch(
+            `${this.getBotRoute(botUserId)}`,
+            {method: 'get'},
+        );
+    }
+
+    getBots = async (page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getBotsRoute()}${buildQueryString({page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    }
+
+    getBotsIncludeDeleted = async (page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getBotsRoute()}${buildQueryString({include_deleted: true, page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    }
+};
+
+export default ClientBots;
diff --git a/app/client/rest/channels.ts b/app/client/rest/channels.ts
new file mode 100644
index 000000000..5c99a771d
--- /dev/null
+++ b/app/client/rest/channels.ts
@@ -0,0 +1,309 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+import {PER_PAGE_DEFAULT} from './constants';
+
+export interface ClientChannelsMix {
+    getAllChannels: (page?: number, perPage?: number, notAssociatedToGroup?: string, excludeDefaultChannels?: boolean, includeTotalCount?: boolean) => Promise<any>;
+    createChannel: (channel: Channel) => Promise<Channel>;
+    createDirectChannel: (userIds: string[]) => Promise<Channel>;
+    createGroupChannel: (userIds: string[]) => Promise<Channel>;
+    deleteChannel: (channelId: string) => Promise<any>;
+    unarchiveChannel: (channelId: string) => Promise<Channel>;
+    updateChannel: (channel: Channel) => Promise<Channel>;
+    convertChannelToPrivate: (channelId: string) => Promise<Channel>;
+    updateChannelPrivacy: (channelId: string, privacy: any) => Promise<Channel>;
+    patchChannel: (channelId: string, channelPatch: Partial<Channel>) => Promise<Channel>;
+    updateChannelNotifyProps: (props: ChannelNotifyProps & {channel_id: string, user_id: string}) => Promise<any>;
+    getChannel: (channelId: string) => Promise<Channel>;
+    getChannelByName: (teamId: string, channelName: string, includeDeleted?: boolean) => Promise<Channel>;
+    getChannelByNameAndTeamName: (teamName: string, channelName: string, includeDeleted?: boolean) => Promise<Channel>;
+    getChannels: (teamId: string, page?: number, perPage?: number) => Promise<Channel[]>;
+    getArchivedChannels: (teamId: string, page?: number, perPage?: number) => Promise<Channel[]>;
+    getMyChannels: (teamId: string, includeDeleted?: boolean, lastDeleteAt?: number) => Promise<Channel[]>;
+    getMyChannelMember: (channelId: string) => Promise<ChannelMembership>;
+    getMyChannelMembers: (teamId: string) => Promise<ChannelMembership[]>;
+    getChannelMembers: (channelId: string, page?: number, perPage?: number) => Promise<ChannelMembership[]>;
+    getChannelTimezones: (channelId: string) => Promise<string[]>;
+    getChannelMember: (channelId: string, userId: string) => Promise<ChannelMembership>;
+    getChannelMembersByIds: (channelId: string, userIds: string[]) => Promise<ChannelMembership[]>;
+    addToChannel: (userId: string, channelId: string, postRootId?: string) => Promise<ChannelMembership>;
+    removeFromChannel: (userId: string, channelId: string) => Promise<any>;
+    getChannelStats: (channelId: string) => Promise<ChannelStats>;
+    getChannelMemberCountsByGroup: (channelId: string, includeTimezones: boolean) => Promise<ChannelMemberCountByGroup[]>;
+    viewMyChannel: (channelId: string, prevChannelId?: string) => Promise<any>;
+    autocompleteChannels: (teamId: string, name: string) => Promise<Channel[]>;
+    autocompleteChannelsForSearch: (teamId: string, name: string) => Promise<Channel[]>;
+    searchChannels: (teamId: string, term: string) => Promise<Channel[]>;
+    searchArchivedChannels: (teamId: string, term: string) => Promise<Channel[]>;
+}
+
+const ClientChannels = (superclass: any) => class extends superclass {
+    getAllChannels = async (page = 0, perPage = PER_PAGE_DEFAULT, notAssociatedToGroup = '', excludeDefaultChannels = false, includeTotalCount = false) => {
+        const queryData = {
+            page,
+            per_page: perPage,
+            not_associated_to_group: notAssociatedToGroup,
+            exclude_default_channels: excludeDefaultChannels,
+            include_total_count: includeTotalCount,
+        };
+        return this.doFetch(
+            `${this.getChannelsRoute()}${buildQueryString(queryData)}`,
+            {method: 'get'},
+        );
+    };
+
+    createChannel = async (channel: Channel) => {
+        this.analytics.trackAPI('api_channels_create', {team_id: channel.team_id});
+
+        return this.doFetch(
+            `${this.getChannelsRoute()}`,
+            {method: 'post', body: JSON.stringify(channel)},
+        );
+    };
+
+    createDirectChannel = async (userIds: string[]) => {
+        this.analytics.trackAPI('api_channels_create_direct');
+
+        return this.doFetch(
+            `${this.getChannelsRoute()}/direct`,
+            {method: 'post', body: JSON.stringify(userIds)},
+        );
+    };
+
+    createGroupChannel = async (userIds: string[]) => {
+        this.analytics.trackAPI('api_channels_create_group');
+
+        return this.doFetch(
+            `${this.getChannelsRoute()}/group`,
+            {method: 'post', body: JSON.stringify(userIds)},
+        );
+    };
+
+    deleteChannel = async (channelId: string) => {
+        this.analytics.trackAPI('api_channels_delete', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}`,
+            {method: 'delete'},
+        );
+    };
+
+    unarchiveChannel = async (channelId: string) => {
+        this.analytics.trackAPI('api_channels_unarchive', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/restore`,
+            {method: 'post'},
+        );
+    };
+
+    updateChannel = async (channel: Channel) => {
+        this.analytics.trackAPI('api_channels_update', {channel_id: channel.id});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channel.id)}`,
+            {method: 'put', body: JSON.stringify(channel)},
+        );
+    };
+
+    convertChannelToPrivate = async (channelId: string) => {
+        this.analytics.trackAPI('api_channels_convert_to_private', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/convert`,
+            {method: 'post'},
+        );
+    };
+
+    updateChannelPrivacy = async (channelId: string, privacy: any) => {
+        this.analytics.trackAPI('api_channels_update_privacy', {channel_id: channelId, privacy});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/privacy`,
+            {method: 'put', body: JSON.stringify({privacy})},
+        );
+    };
+
+    patchChannel = async (channelId: string, channelPatch: Partial<Channel>) => {
+        this.analytics.trackAPI('api_channels_patch', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/patch`,
+            {method: 'put', body: JSON.stringify(channelPatch)},
+        );
+    };
+
+    updateChannelNotifyProps = async (props: ChannelNotifyProps & {channel_id: string, user_id: string}) => {
+        this.analytics.trackAPI('api_users_update_channel_notifications', {channel_id: props.channel_id});
+
+        return this.doFetch(
+            `${this.getChannelMemberRoute(props.channel_id, props.user_id)}/notify_props`,
+            {method: 'put', body: JSON.stringify(props)},
+        );
+    };
+
+    getChannel = async (channelId: string) => {
+        this.analytics.trackAPI('api_channel_get', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}`,
+            {method: 'get'},
+        );
+    };
+
+    getChannelByName = async (teamId: string, channelName: string, includeDeleted = false) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/channels/name/${channelName}?include_deleted=${includeDeleted}`,
+            {method: 'get'},
+        );
+    };
+
+    getChannelByNameAndTeamName = async (teamName: string, channelName: string, includeDeleted = false) => {
+        this.analytics.trackAPI('api_channel_get_by_name_and_teamName', {channel_name: channelName, team_name: teamName, include_deleted: includeDeleted});
+
+        return this.doFetch(
+            `${this.getTeamNameRoute(teamName)}/channels/name/${channelName}?include_deleted=${includeDeleted}`,
+            {method: 'get'},
+        );
+    };
+
+    getChannels = async (teamId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/channels${buildQueryString({page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getArchivedChannels = async (teamId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/channels/deleted${buildQueryString({page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getMyChannels = async (teamId: string, includeDeleted = false, lastDeleteAt = 0) => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}/teams/${teamId}/channels${buildQueryString({
+                include_deleted: includeDeleted,
+                last_delete_at: lastDeleteAt,
+            })}`,
+            {method: 'get'},
+        );
+    };
+
+    getMyChannelMember = async (channelId: string) => {
+        return this.doFetch(
+            `${this.getChannelMemberRoute(channelId, 'me')}`,
+            {method: 'get'},
+        );
+    };
+
+    getMyChannelMembers = async (teamId: string) => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}/teams/${teamId}/channels/members`,
+            {method: 'get'},
+        );
+    };
+
+    getChannelMembers = async (channelId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getChannelMembersRoute(channelId)}${buildQueryString({page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getChannelTimezones = async (channelId: string) => {
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/timezones`,
+            {method: 'get'},
+        );
+    };
+
+    getChannelMember = async (channelId: string, userId: string) => {
+        return this.doFetch(
+            `${this.getChannelMemberRoute(channelId, userId)}`,
+            {method: 'get'},
+        );
+    };
+
+    getChannelMembersByIds = async (channelId: string, userIds: string[]) => {
+        return this.doFetch(
+            `${this.getChannelMembersRoute(channelId)}/ids`,
+            {method: 'post', body: JSON.stringify(userIds)},
+        );
+    };
+
+    addToChannel = async (userId: string, channelId: string, postRootId = '') => {
+        this.analytics.trackAPI('api_channels_add_member', {channel_id: channelId});
+
+        const member = {user_id: userId, channel_id: channelId, post_root_id: postRootId};
+        return this.doFetch(
+            `${this.getChannelMembersRoute(channelId)}`,
+            {method: 'post', body: JSON.stringify(member)},
+        );
+    };
+
+    removeFromChannel = async (userId: string, channelId: string) => {
+        this.analytics.trackAPI('api_channels_remove_member', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelMemberRoute(channelId, userId)}`,
+            {method: 'delete'},
+        );
+    };
+
+    getChannelStats = async (channelId: string) => {
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/stats`,
+            {method: 'get'},
+        );
+    };
+
+    getChannelMemberCountsByGroup = async (channelId: string, includeTimezones: boolean) => {
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/member_counts_by_group?include_timezones=${includeTimezones}`,
+            {method: 'get'},
+        );
+    };
+
+    viewMyChannel = async (channelId: string, prevChannelId?: string) => {
+        const data = {channel_id: channelId, prev_channel_id: prevChannelId};
+        return this.doFetch(
+            `${this.getChannelsRoute()}/members/me/view`,
+            {method: 'post', body: JSON.stringify(data)},
+        );
+    };
+
+    autocompleteChannels = async (teamId: string, name: string) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/channels/autocomplete${buildQueryString({name})}`,
+            {method: 'get'},
+        );
+    };
+
+    autocompleteChannelsForSearch = async (teamId: string, name: string) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/channels/search_autocomplete${buildQueryString({name})}`,
+            {method: 'get'},
+        );
+    };
+
+    searchChannels = async (teamId: string, term: string) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/channels/search`,
+            {method: 'post', body: JSON.stringify({term})},
+        );
+    };
+
+    searchArchivedChannels = async (teamId: string, term: string) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/channels/search_archived`,
+            {method: 'post', body: JSON.stringify({term})},
+        );
+    };
+};
+
+export default ClientChannels;
diff --git a/app/client/rest/constants.ts b/app/client/rest/constants.ts
new file mode 100644
index 000000000..c1b260485
--- /dev/null
+++ b/app/client/rest/constants.ts
@@ -0,0 +1,14 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export const HEADER_AUTH = 'Authorization';
+export const HEADER_BEARER = 'BEARER';
+export const HEADER_REQUESTED_WITH = 'X-Requested-With';
+export const HEADER_USER_AGENT = 'User-Agent';
+export const HEADER_X_CLUSTER_ID = 'X-Cluster-Id';
+export const HEADER_X_CSRF_TOKEN = 'X-CSRF-Token';
+export const HEADER_TOKEN = 'Token';
+export const HEADER_X_VERSION_ID = 'X-Version-Id';
+export const DEFAULT_LIMIT_BEFORE = 30;
+export const DEFAULT_LIMIT_AFTER = 30;
+export const PER_PAGE_DEFAULT = 60;
diff --git a/app/client/rest/emojis.ts b/app/client/rest/emojis.ts
new file mode 100644
index 000000000..170ca63e1
--- /dev/null
+++ b/app/client/rest/emojis.ts
@@ -0,0 +1,99 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+import {PER_PAGE_DEFAULT} from './constants';
+
+export interface ClientEmojisMix {
+    createCustomEmoji: (emoji: CustomEmoji, imageData: any) => Promise<CustomEmoji>;
+    getCustomEmoji: (id: string) => Promise<CustomEmoji>;
+    getCustomEmojiByName: (name: string) => Promise<CustomEmoji>;
+    getCustomEmojis: (page?: number, perPage?: number, sort?: string) => Promise<CustomEmoji[]>;
+    deleteCustomEmoji: (emojiId: string) => Promise<any>;
+    getSystemEmojiImageUrl: (filename: string) => string;
+    getCustomEmojiImageUrl: (id: string) => string;
+    searchCustomEmoji: (term: string, options?: Record<string, any>) => Promise<CustomEmoji[]>;
+    autocompleteCustomEmoji: (name: string) => Promise<CustomEmoji[]>;
+}
+
+const ClientEmojis = (superclass: any) => class extends superclass {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    createCustomEmoji = async (emoji: CustomEmoji, imageData: any) => {
+        this.analytics.trackAPI('api_emoji_custom_add');
+
+        // FIXME: Multipart upload with client
+        // const formData = new FormData();
+        // formData.append('image', imageData);
+        // formData.append('emoji', JSON.stringify(emoji));
+        // const request: any = {
+        //     method: 'post',
+        //     body: formData,
+        // };
+
+        // if (formData.getBoundary) {
+        //     request.headers = {
+        //         'Content-Type': `multipart/form-data; boundary=${formData.getBoundary()}`,
+        //     };
+        // }
+
+        // return this.doFetch(
+        //     `${this.getEmojisRoute()}`,
+        //     request,
+        // );
+    };
+
+    getCustomEmoji = async (id: string) => {
+        return this.doFetch(
+            `${this.getEmojisRoute()}/${id}`,
+            {method: 'get'},
+        );
+    };
+
+    getCustomEmojiByName = async (name: string) => {
+        return this.doFetch(
+            `${this.getEmojisRoute()}/name/${name}`,
+            {method: 'get'},
+        );
+    };
+
+    getCustomEmojis = async (page = 0, perPage = PER_PAGE_DEFAULT, sort = '') => {
+        return this.doFetch(
+            `${this.getEmojisRoute()}${buildQueryString({page, per_page: perPage, sort})}`,
+            {method: 'get'},
+        );
+    };
+
+    deleteCustomEmoji = async (emojiId: string) => {
+        this.analytics.trackAPI('api_emoji_custom_delete');
+
+        return this.doFetch(
+            `${this.getEmojiRoute(emojiId)}`,
+            {method: 'delete'},
+        );
+    };
+
+    getSystemEmojiImageUrl = (filename: string) => {
+        return `${this.url}/static/emoji/${filename}.png`;
+    };
+
+    getCustomEmojiImageUrl = (id: string) => {
+        return `${this.getEmojiRoute(id)}/image`;
+    };
+
+    searchCustomEmoji = async (term: string, options = {}) => {
+        return this.doFetch(
+            `${this.getEmojisRoute()}/search`,
+            {method: 'post', body: JSON.stringify({term, ...options})},
+        );
+    };
+
+    autocompleteCustomEmoji = async (name: string) => {
+        return this.doFetch(
+            `${this.getEmojisRoute()}/autocomplete${buildQueryString({name})}`,
+            {method: 'get'},
+        );
+    };
+};
+
+export default ClientEmojis;
diff --git a/app/client/rest/error.ts b/app/client/rest/error.ts
new file mode 100644
index 000000000..d367c0970
--- /dev/null
+++ b/app/client/rest/error.ts
@@ -0,0 +1,26 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {cleanUrlForLogging} from '@utils/url';
+
+export default class ClientError extends Error {
+    url: string;
+    intl: { defaultMessage: string; id: string } | { defaultMessage: string; id: string } | { id: string; defaultMessage: string; values: any } | { id: string; defaultMessage: string };
+    server_error_id: any;
+    status_code: any;
+    details: Error;
+    constructor(baseUrl: string, data: any) {
+        super(data.message + ': ' + cleanUrlForLogging(baseUrl, data.url));
+
+        this.message = data.message;
+        this.url = data.url;
+        this.intl = data.intl;
+        this.server_error_id = data.server_error_id;
+        this.status_code = data.status_code;
+        this.details = data.details;
+
+        // Ensure message is treated as a property of this class when object spreading. Without this,
+        // copying the object by using `{...error}` would not include the message.
+        Object.defineProperty(this, 'message', {enumerable: true});
+    }
+}
diff --git a/app/client/rest/files.ts b/app/client/rest/files.ts
new file mode 100644
index 000000000..7bb120f08
--- /dev/null
+++ b/app/client/rest/files.ts
@@ -0,0 +1,47 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export interface ClientFilesMix {
+    getFileUrl: (fileId: string, timestamp: number) => string;
+    getFileThumbnailUrl: (fileId: string, timestamp: number) => string;
+    getFilePreviewUrl: (fileId: string, timestamp: number) => string;
+    getFilePublicLink: (fileId: string) => Promise<any>;
+}
+
+const ClientFiles = (superclass: any) => class extends superclass {
+    getFileUrl(fileId: string, timestamp: number) {
+        let url = `${this.getFileRoute(fileId)}`;
+        if (timestamp) {
+            url += `?${timestamp}`;
+        }
+
+        return url;
+    }
+
+    getFileThumbnailUrl(fileId: string, timestamp: number) {
+        let url = `${this.getFileRoute(fileId)}/thumbnail`;
+        if (timestamp) {
+            url += `?${timestamp}`;
+        }
+
+        return url;
+    }
+
+    getFilePreviewUrl(fileId: string, timestamp: number) {
+        let url = `${this.getFileRoute(fileId)}/preview`;
+        if (timestamp) {
+            url += `?${timestamp}`;
+        }
+
+        return url;
+    }
+
+    getFilePublicLink = async (fileId: string) => {
+        return this.doFetch(
+            `${this.getFileRoute(fileId)}/link`,
+            {method: 'get'},
+        );
+    }
+};
+
+export default ClientFiles;
diff --git a/app/client/rest/general.ts b/app/client/rest/general.ts
new file mode 100644
index 000000000..307781711
--- /dev/null
+++ b/app/client/rest/general.ts
@@ -0,0 +1,95 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+import ClientError from './error';
+
+export interface ClientGeneralMix {
+    getOpenGraphMetadata: (url: string) => Promise<any>;
+    ping: () => Promise<any>;
+    logClientError: (message: string, level?: string) => Promise<any>;
+    getClientConfigOld: () => Promise<ClientConfig>;
+    getClientLicenseOld: () => Promise<any>;
+    getTimezones: () => Promise<string[]>;
+    getDataRetentionPolicy: () => Promise<any>;
+    getRolesByNames: (rolesNames: string[]) => Promise<Role[]>;
+    getRedirectLocation: (urlParam: string) => Promise<Record<string, string>>;
+}
+
+const ClientGeneral = (superclass: any) => class extends superclass {
+    getOpenGraphMetadata = async (url: string) => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/opengraph`,
+            {method: 'post', body: JSON.stringify({url})},
+        );
+    };
+
+    ping = async () => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/system/ping?time=${Date.now()}`,
+            {method: 'get'},
+        );
+    };
+
+    logClientError = async (message: string, level = 'ERROR') => {
+        const url = `${this.getBaseRoute()}/logs`;
+
+        if (!this.enableLogging) {
+            throw new ClientError(this.getUrl(), {
+                message: 'Logging disabled.',
+                url,
+            });
+        }
+
+        return this.doFetch(
+            url,
+            {method: 'post', body: JSON.stringify({message, level})},
+        );
+    };
+
+    getClientConfigOld = async () => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/config/client?format=old`,
+            {method: 'get'},
+        );
+    };
+
+    getClientLicenseOld = async () => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/license/client?format=old`,
+            {method: 'get'},
+        );
+    };
+
+    getTimezones = async () => {
+        return this.doFetch(
+            `${this.getTimezonesRoute()}`,
+            {method: 'get'},
+        );
+    };
+
+    getDataRetentionPolicy = () => {
+        return this.doFetch(
+            `${this.getDataRetentionRoute()}/policy`,
+            {method: 'get'},
+        );
+    };
+
+    getRolesByNames = async (rolesNames: string[]) => {
+        return this.doFetch(
+            `${this.getRolesRoute()}/names`,
+            {method: 'post', body: JSON.stringify(rolesNames)},
+        );
+    };
+
+    getRedirectLocation = async (urlParam: string) => {
+        if (!urlParam.length) {
+            return Promise.resolve();
+        }
+        const url = `${this.getRedirectLocationRoute()}${buildQueryString({url: urlParam})}`;
+        return this.doFetch(url, {method: 'get'});
+    };
+};
+
+export default ClientGeneral;
diff --git a/app/client/rest/groups.ts b/app/client/rest/groups.ts
new file mode 100644
index 000000000..324791602
--- /dev/null
+++ b/app/client/rest/groups.ts
@@ -0,0 +1,52 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+import {PER_PAGE_DEFAULT} from './constants';
+
+export interface ClientGroupsMix {
+    getGroups: (filterAllowReference?: boolean, page?: number, perPage?: number) => Promise<Group[]>;
+    getGroupsByUserId: (userID: string) => Promise<Group[]>;
+    getAllGroupsAssociatedToTeam: (teamID: string, filterAllowReference?: boolean) => Promise<Group[]>;
+    getAllGroupsAssociatedToChannelsInTeam: (teamID: string, filterAllowReference?: boolean) => Promise<Group[]>;
+    getAllGroupsAssociatedToChannel: (channelID: string, filterAllowReference?: boolean) => Promise<Group[]>;
+}
+
+const ClientGroups = (superclass: any) => class extends superclass {
+    getGroups = async (filterAllowReference = false, page = 0, perPage = PER_PAGE_DEFAULT, since = 0) => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/groups${buildQueryString({filter_allow_reference: filterAllowReference, page, per_page: perPage, since})}`,
+            {method: 'get'},
+        );
+    };
+
+    getGroupsByUserId = async (userID: string) => {
+        return this.doFetch(
+            `${this.getUsersRoute()}/${userID}/groups`,
+            {method: 'get'},
+        );
+    }
+    getAllGroupsAssociatedToTeam = async (teamID: string, filterAllowReference = false) => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/teams/${teamID}/groups${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
+            {method: 'get'},
+        );
+    };
+
+    getAllGroupsAssociatedToChannelsInTeam = async (teamID: string, filterAllowReference = false) => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/teams/${teamID}/groups_by_channels${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
+            {method: 'get'},
+        );
+    };
+
+    getAllGroupsAssociatedToChannel = async (channelID: string, filterAllowReference = false) => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/channels/${channelID}/groups${buildQueryString({paginate: false, filter_allow_reference: filterAllowReference})}`,
+            {method: 'get'},
+        );
+    };
+};
+
+export default ClientGroups;
diff --git a/app/client/rest/index.test.js b/app/client/rest/index.test.js
new file mode 100644
index 000000000..fc9b65565
--- /dev/null
+++ b/app/client/rest/index.test.js
@@ -0,0 +1,83 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import assert from 'assert';
+import nock from 'nock';
+
+import {HEADER_X_VERSION_ID} from '@client/rest/constants';
+import ClientError from '@client/rest/error';
+import TestHelper from '@test/test_helper';
+import {isMinimumServerVersion} from '@utils/helpers';
+
+describe('Client4', () => {
+    beforeAll(() => {
+        if (!nock.isActive()) {
+            nock.activate();
+        }
+    });
+
+    afterAll(() => {
+        nock.restore();
+    });
+
+    it('should remove trailing slash while trying to setUrl', () => {
+        const client = TestHelper.createClient();
+
+        client.setUrl('http://localhost:8065/');
+        expect(client.url).toBe('http://localhost:8065');
+
+        client.setUrl('http://localhost:8065/company/mattermost/');
+        expect(client.url).toBe('http://localhost:8065/company/mattermost');
+    });
+
+    describe('doFetchWithResponse', () => {
+        it('serverVersion should be set from response header', async () => {
+            const client = TestHelper.createClient();
+
+            assert.equal(client.serverVersion, '');
+
+            nock(client.getBaseRoute()).
+                get('/users/me').
+                reply(200, '{}', {[HEADER_X_VERSION_ID]: '5.0.0.5.0.0.abc123'});
+
+            await client.getMe();
+
+            assert.equal(client.serverVersion, '5.0.0.5.0.0.abc123');
+            assert.equal(isMinimumServerVersion(client.serverVersion, 5, 0, 0), true);
+            assert.equal(isMinimumServerVersion(client.serverVersion, 5, 1, 0), false);
+
+            nock(client.getBaseRoute()).
+                get('/users/me').
+                reply(200, '{}', {[HEADER_X_VERSION_ID]: '5.3.0.5.3.0.abc123'});
+
+            await client.getMe();
+
+            assert.equal(client.serverVersion, '5.3.0.5.3.0.abc123');
+            assert.equal(isMinimumServerVersion(client.serverVersion, 5, 0, 0), true);
+            assert.equal(isMinimumServerVersion(client.serverVersion, 5, 1, 0), true);
+        });
+    });
+});
+
+describe('ClientError', () => {
+    it('standard fields should be enumerable', () => {
+        const error = new ClientError('https://example.com', {
+            message: 'This is a message',
+            intl: {
+                id: 'test.error',
+                defaultMessage: 'This is a message with a translation',
+            },
+            server_error_id: 'test.app_error',
+            status_code: 418,
+            url: 'https://example.com/api/v4/error',
+        });
+
+        const copy = {...error};
+
+        assert.strictEqual(copy.message, error.message);
+        assert.strictEqual(copy.intl, error.intl);
+        assert.strictEqual(copy.server_error_id, error.server_error_id);
+        assert.strictEqual(copy.status_code, error.status_code);
+        assert.strictEqual(copy.url, error.url);
+    });
+});
diff --git a/app/client/rest/index.ts b/app/client/rest/index.ts
new file mode 100644
index 000000000..611648c4e
--- /dev/null
+++ b/app/client/rest/index.ts
@@ -0,0 +1,56 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import mix from '@utils/mix';
+
+import {DEFAULT_LIMIT_AFTER, DEFAULT_LIMIT_BEFORE, HEADER_X_VERSION_ID} from './constants';
+import ClientApps, {ClientAppsMix} from './apps';
+import ClientBase from './base';
+import ClientBots, {ClientBotsMix} from './bots';
+import ClientChannels, {ClientChannelsMix} from './channels';
+import ClientEmojis, {ClientEmojisMix} from './emojis';
+import ClientFiles, {ClientFilesMix} from './files';
+import ClientGeneral, {ClientGeneralMix} from './general';
+import ClientGroups, {ClientGroupsMix} from './groups';
+import ClientIntegrations, {ClientIntegrationsMix} from './integrations';
+import ClientPosts, {ClientPostsMix} from './posts';
+import ClientPreferences, {ClientPreferencesMix} from './preferences';
+import ClientTeams, {ClientTeamsMix} from './teams';
+import ClientTos, {ClientTosMix} from './tos';
+import ClientUsers, {ClientUsersMix} from './users';
+
+interface Client extends ClientBase,
+    ClientAppsMix,
+    ClientBotsMix,
+    ClientChannelsMix,
+    ClientEmojisMix,
+    ClientFilesMix,
+    ClientGeneralMix,
+    ClientGroupsMix,
+    ClientIntegrationsMix,
+    ClientPostsMix,
+    ClientPreferencesMix,
+    ClientTeamsMix,
+    ClientTosMix,
+    ClientUsersMix
+{}
+
+class Client extends mix(ClientBase).with(
+    ClientApps,
+    ClientBots,
+    ClientChannels,
+    ClientEmojis,
+    ClientFiles,
+    ClientGeneral,
+    ClientGroups,
+    ClientIntegrations,
+    ClientPosts,
+    ClientPreferences,
+    ClientTeams,
+    ClientTos,
+    ClientUsers,
+) {}
+
+const Client4 = new Client();
+
+export {Client4, Client, DEFAULT_LIMIT_AFTER, DEFAULT_LIMIT_BEFORE, HEADER_X_VERSION_ID};
diff --git a/app/client/rest/integrations.ts b/app/client/rest/integrations.ts
new file mode 100644
index 000000000..003c2f530
--- /dev/null
+++ b/app/client/rest/integrations.ts
@@ -0,0 +1,66 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+import {PER_PAGE_DEFAULT} from './constants';
+
+export interface ClientIntegrationsMix {
+    getCommandsList: (teamId: string) => Promise<Command[]>;
+    getCommandAutocompleteSuggestionsList: (userInput: string, teamId: string, commandArgs?: Record<string, any>) => Promise<Command[]>;
+    getAutocompleteCommandsList: (teamId: string, page?: number, perPage?: number) => Promise<Command[]>;
+    executeCommand: (command: Command, commandArgs?: Record<string, any>) => Promise<any>;
+    addCommand: (command: Command) => Promise<Command>;
+    submitInteractiveDialog: (data: DialogSubmission) => Promise<any>;
+}
+
+const ClientIntegrations = (superclass: any) => class extends superclass {
+    getCommandsList = async (teamId: string) => {
+        return this.doFetch(
+            `${this.getCommandsRoute()}?team_id=${teamId}`,
+            {method: 'get'},
+        );
+    };
+
+    getCommandAutocompleteSuggestionsList = async (userInput: string, teamId: string, commandArgs: {}) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/commands/autocomplete_suggestions${buildQueryString({...commandArgs, user_input: userInput})}`,
+            {method: 'get'},
+        );
+    };
+
+    getAutocompleteCommandsList = async (teamId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/commands/autocomplete${buildQueryString({page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    executeCommand = async (command: Command, commandArgs = {}) => {
+        this.analytics.trackAPI('api_integrations_used');
+
+        return this.doFetch(
+            `${this.getCommandsRoute()}/execute`,
+            {method: 'post', body: JSON.stringify({command, ...commandArgs})},
+        );
+    };
+
+    addCommand = async (command: Command) => {
+        this.analytics.trackAPI('api_integrations_created');
+
+        return this.doFetch(
+            `${this.getCommandsRoute()}`,
+            {method: 'post', body: JSON.stringify(command)},
+        );
+    };
+
+    submitInteractiveDialog = async (data: DialogSubmission) => {
+        this.analytics.trackAPI('api_interactive_messages_dialog_submitted');
+        return this.doFetch(
+            `${this.getBaseRoute()}/actions/dialogs/submit`,
+            {method: 'post', body: JSON.stringify(data)},
+        );
+    };
+};
+
+export default ClientIntegrations;
diff --git a/app/client/rest/posts.ts b/app/client/rest/posts.ts
new file mode 100644
index 000000000..bc4026e44
--- /dev/null
+++ b/app/client/rest/posts.ts
@@ -0,0 +1,234 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+import {PER_PAGE_DEFAULT} from './constants';
+
+export interface ClientPostsMix {
+    createPost: (post: Post) => Promise<Post>;
+    updatePost: (post: Post) => Promise<Post>;
+    getPost: (postId: string) => Promise<Post>;
+    patchPost: (postPatch: Partial<Post> & {id: string}) => Promise<Post>;
+    deletePost: (postId: string) => Promise<any>;
+    getPostThread: (postId: string) => Promise<any>;
+    getPosts: (channelId: string, page?: number, perPage?: number) => Promise<any>;
+    getPostsSince: (channelId: string, since: number) => Promise<any>;
+    getPostsBefore: (channelId: string, postId: string, page?: number, perPage?: number) => Promise<any>;
+    getPostsAfter: (channelId: string, postId: string, page?: number, perPage?: number) => Promise<any>;
+    getFileInfosForPost: (postId: string) => Promise<FileInfo[]>;
+    getFlaggedPosts: (userId: string, channelId?: string, teamId?: string, page?: number, perPage?: number) => Promise<any>;
+    getPinnedPosts: (channelId: string) => Promise<any>;
+    markPostAsUnread: (userId: string, postId: string) => Promise<any>;
+    pinPost: (postId: string) => Promise<any>;
+    unpinPost: (postId: string) => Promise<any>;
+    addReaction: (userId: string, postId: string, emojiName: string) => Promise<any>;
+    removeReaction: (userId: string, postId: string, emojiName: string) => Promise<any>;
+    getReactionsForPost: (postId: string) => Promise<any>;
+    searchPostsWithParams: (teamId: string, params: any) => Promise<any>;
+    searchPosts: (teamId: string, terms: string, isOrSearch: boolean) => Promise<any>;
+    doPostAction: (postId: string, actionId: string, selectedOption?: string) => Promise<any>;
+    doPostActionWithCookie: (postId: string, actionId: string, actionCookie: string, selectedOption?: string) => Promise<any>;
+}
+
+const ClientPosts = (superclass: any) => class extends superclass {
+    createPost = async (post: Post) => {
+        this.analytics.trackAPI('api_posts_create', {channel_id: post.channel_id});
+
+        if (post.root_id != null && post.root_id !== '') {
+            this.analytics.trackAPI('api_posts_replied', {channel_id: post.channel_id});
+        }
+
+        return this.doFetch(
+            `${this.getPostsRoute()}`,
+            {method: 'post', body: JSON.stringify(post)},
+        );
+    };
+
+    updatePost = async (post: Post) => {
+        this.analytics.trackAPI('api_posts_update', {channel_id: post.channel_id});
+
+        return this.doFetch(
+            `${this.getPostRoute(post.id)}`,
+            {method: 'put', body: JSON.stringify(post)},
+        );
+    };
+
+    getPost = async (postId: string) => {
+        return this.doFetch(
+            `${this.getPostRoute(postId)}`,
+            {method: 'get'},
+        );
+    };
+
+    patchPost = async (postPatch: Partial<Post> & {id: string}) => {
+        this.analytics.trackAPI('api_posts_patch', {channel_id: postPatch.channel_id});
+
+        return this.doFetch(
+            `${this.getPostRoute(postPatch.id)}/patch`,
+            {method: 'put', body: JSON.stringify(postPatch)},
+        );
+    };
+
+    deletePost = async (postId: string) => {
+        this.analytics.trackAPI('api_posts_delete');
+
+        return this.doFetch(
+            `${this.getPostRoute(postId)}`,
+            {method: 'delete'},
+        );
+    };
+
+    getPostThread = async (postId: string) => {
+        return this.doFetch(
+            `${this.getPostRoute(postId)}/thread`,
+            {method: 'get'},
+        );
+    };
+
+    getPosts = async (channelId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/posts${buildQueryString({page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getPostsSince = async (channelId: string, since: number) => {
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/posts${buildQueryString({since})}`,
+            {method: 'get'},
+        );
+    };
+
+    getPostsBefore = async (channelId: string, postId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        this.analytics.trackAPI('api_posts_get_before', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/posts${buildQueryString({before: postId, page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getPostsAfter = async (channelId: string, postId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        this.analytics.trackAPI('api_posts_get_after', {channel_id: channelId});
+
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/posts${buildQueryString({after: postId, page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getFileInfosForPost = async (postId: string) => {
+        return this.doFetch(
+            `${this.getPostRoute(postId)}/files/info`,
+            {method: 'get'},
+        );
+    };
+
+    getFlaggedPosts = async (userId: string, channelId = '', teamId = '', page = 0, perPage = PER_PAGE_DEFAULT) => {
+        this.analytics.trackAPI('api_posts_get_flagged', {team_id: teamId});
+
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/posts/flagged${buildQueryString({channel_id: channelId, team_id: teamId, page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getPinnedPosts = async (channelId: string) => {
+        this.analytics.trackAPI('api_posts_get_pinned', {channel_id: channelId});
+        return this.doFetch(
+            `${this.getChannelRoute(channelId)}/pinned`,
+            {method: 'get'},
+        );
+    };
+
+    markPostAsUnread = async (userId: string, postId: string) => {
+        this.analytics.trackAPI('api_post_set_unread_post');
+
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/posts/${postId}/set_unread`,
+            {method: 'post'},
+        );
+    }
+
+    pinPost = async (postId: string) => {
+        this.analytics.trackAPI('api_posts_pin');
+
+        return this.doFetch(
+            `${this.getPostRoute(postId)}/pin`,
+            {method: 'post'},
+        );
+    };
+
+    unpinPost = async (postId: string) => {
+        this.analytics.trackAPI('api_posts_unpin');
+
+        return this.doFetch(
+            `${this.getPostRoute(postId)}/unpin`,
+            {method: 'post'},
+        );
+    };
+
+    addReaction = async (userId: string, postId: string, emojiName: string) => {
+        this.analytics.trackAPI('api_reactions_save', {post_id: postId});
+
+        return this.doFetch(
+            `${this.getReactionsRoute()}`,
+            {method: 'post', body: JSON.stringify({user_id: userId, post_id: postId, emoji_name: emojiName})},
+        );
+    };
+
+    removeReaction = async (userId: string, postId: string, emojiName: string) => {
+        this.analytics.trackAPI('api_reactions_delete', {post_id: postId});
+
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/posts/${postId}/reactions/${emojiName}`,
+            {method: 'delete'},
+        );
+    };
+
+    getReactionsForPost = async (postId: string) => {
+        return this.doFetch(
+            `${this.getPostRoute(postId)}/reactions`,
+            {method: 'get'},
+        );
+    };
+
+    searchPostsWithParams = async (teamId: string, params: any) => {
+        this.analytics.trackAPI('api_posts_search', {team_id: teamId});
+
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/posts/search`,
+            {method: 'post', body: JSON.stringify(params)},
+        );
+    };
+
+    searchPosts = async (teamId: string, terms: string, isOrSearch: boolean) => {
+        return this.searchPostsWithParams(teamId, {terms, is_or_search: isOrSearch});
+    };
+
+    doPostAction = async (postId: string, actionId: string, selectedOption = '') => {
+        return this.doPostActionWithCookie(postId, actionId, '', selectedOption);
+    };
+
+    doPostActionWithCookie = async (postId: string, actionId: string, actionCookie: string, selectedOption = '') => {
+        if (selectedOption) {
+            this.analytics.trackAPI('api_interactive_messages_menu_selected');
+        } else {
+            this.analytics.trackAPI('api_interactive_messages_button_clicked');
+        }
+
+        const msg: any = {
+            selected_option: selectedOption,
+        };
+        if (actionCookie !== '') {
+            msg.cookie = actionCookie;
+        }
+        return this.doFetch(
+            `${this.getPostRoute(postId)}/actions/${encodeURIComponent(actionId)}`,
+            {method: 'post', body: JSON.stringify(msg)},
+        );
+    };
+};
+
+export default ClientPosts;
diff --git a/app/client/rest/preferences.ts b/app/client/rest/preferences.ts
new file mode 100644
index 000000000..450bd9414
--- /dev/null
+++ b/app/client/rest/preferences.ts
@@ -0,0 +1,33 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export interface ClientPreferencesMix {
+    savePreferences: (userId: string, preferences: PreferenceType[]) => Promise<any>;
+    deletePreferences: (userId: string, preferences: PreferenceType[]) => Promise<any>;
+    getMyPreferences: () => Promise<PreferenceType>;
+}
+
+const ClientPreferences = (superclass: any) => class extends superclass {
+    savePreferences = async (userId: string, preferences: PreferenceType[]) => {
+        return this.doFetch(
+            `${this.getPreferencesRoute(userId)}`,
+            {method: 'put', body: JSON.stringify(preferences)},
+        );
+    };
+
+    getMyPreferences = async () => {
+        return this.doFetch(
+            `${this.getPreferencesRoute('me')}`,
+            {method: 'get'},
+        );
+    };
+
+    deletePreferences = async (userId: string, preferences: PreferenceType[]) => {
+        return this.doFetch(
+            `${this.getPreferencesRoute(userId)}/delete`,
+            {method: 'post', body: JSON.stringify(preferences)},
+        );
+    };
+};
+
+export default ClientPreferences;
diff --git a/app/client/rest/teams.ts b/app/client/rest/teams.ts
new file mode 100644
index 000000000..4cc4fc79e
--- /dev/null
+++ b/app/client/rest/teams.ts
@@ -0,0 +1,175 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {buildQueryString} from '@utils/helpers';
+
+import {PER_PAGE_DEFAULT} from './constants';
+
+export interface ClientTeamsMix {
+    createTeam: (team: Team) => Promise<Team>;
+    deleteTeam: (teamId: string) => Promise<any>;
+    updateTeam: (team: Team) => Promise<Team>;
+    patchTeam: (team: Partial<Team> & {id: string}) => Promise<Team>;
+    getTeams: (page?: number, perPage?: number, includeTotalCount?: boolean) => Promise<any>;
+    getTeam: (teamId: string) => Promise<Team>;
+    getTeamByName: (teamName: string) => Promise<Team>;
+    getMyTeams: () => Promise<Team[]>;
+    getTeamsForUser: (userId: string) => Promise<Team[]>;
+    getMyTeamMembers: () => Promise<TeamMembership[]>;
+    getMyTeamUnreads: () => Promise<TeamUnread[]>;
+    getTeamMembers: (teamId: string, page?: number, perPage?: number) => Promise<TeamMembership[]>;
+    getTeamMember: (teamId: string, userId: string) => Promise<TeamMembership>;
+    addToTeam: (teamId: string, userId: string) => Promise<TeamMembership>;
+    joinTeam: (inviteId: string) => Promise<TeamMembership>;
+    removeFromTeam: (teamId: string, userId: string) => Promise<any>;
+    getTeamStats: (teamId: string) => Promise<any>;
+    getTeamIconUrl: (teamId: string, lastTeamIconUpdate: number) => string;
+}
+
+const ClientTeams = (superclass: any) => class extends superclass {
+    createTeam = async (team: Team) => {
+        this.analytics.trackAPI('api_teams_create');
+
+        return this.doFetch(
+            `${this.getTeamsRoute()}`,
+            {method: 'post', body: JSON.stringify(team)},
+        );
+    };
+
+    deleteTeam = async (teamId: string) => {
+        this.analytics.trackAPI('api_teams_delete');
+
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}`,
+            {method: 'delete'},
+        );
+    };
+
+    updateTeam = async (team: Team) => {
+        this.analytics.trackAPI('api_teams_update_name', {team_id: team.id});
+
+        return this.doFetch(
+            `${this.getTeamRoute(team.id)}`,
+            {method: 'put', body: JSON.stringify(team)},
+        );
+    };
+
+    patchTeam = async (team: Partial<Team> & {id: string}) => {
+        this.analytics.trackAPI('api_teams_patch_name', {team_id: team.id});
+
+        return this.doFetch(
+            `${this.getTeamRoute(team.id)}/patch`,
+            {method: 'put', body: JSON.stringify(team)},
+        );
+    };
+
+    getTeams = async (page = 0, perPage = PER_PAGE_DEFAULT, includeTotalCount = false) => {
+        return this.doFetch(
+            `${this.getTeamsRoute()}${buildQueryString({page, per_page: perPage, include_total_count: includeTotalCount})}`,
+            {method: 'get'},
+        );
+    };
+
+    getTeam = async (teamId: string) => {
+        return this.doFetch(
+            this.getTeamRoute(teamId),
+            {method: 'get'},
+        );
+    };
+
+    getTeamByName = async (teamName: string) => {
+        this.analytics.trackAPI('api_teams_get_team_by_name');
+
+        return this.doFetch(
+            this.getTeamNameRoute(teamName),
+            {method: 'get'},
+        );
+    };
+
+    getMyTeams = async () => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}/teams`,
+            {method: 'get'},
+        );
+    };
+
+    getTeamsForUser = async (userId: string) => {
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/teams`,
+            {method: 'get'},
+        );
+    };
+
+    getMyTeamMembers = async () => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}/teams/members`,
+            {method: 'get'},
+        );
+    };
+
+    getMyTeamUnreads = async () => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}/teams/unread`,
+            {method: 'get'},
+        );
+    };
+
+    getTeamMembers = async (teamId: string, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        return this.doFetch(
+            `${this.getTeamMembersRoute(teamId)}${buildQueryString({page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getTeamMember = async (teamId: string, userId: string) => {
+        return this.doFetch(
+            `${this.getTeamMemberRoute(teamId, userId)}`,
+            {method: 'get'},
+        );
+    };
+
+    addToTeam = async (teamId: string, userId: string) => {
+        this.analytics.trackAPI('api_teams_invite_members', {team_id: teamId});
+
+        const member = {user_id: userId, team_id: teamId};
+        return this.doFetch(
+            `${this.getTeamMembersRoute(teamId)}`,
+            {method: 'post', body: JSON.stringify(member)},
+        );
+    };
+
+    joinTeam = async (inviteId: string) => {
+        const query = buildQueryString({invite_id: inviteId});
+        return this.doFetch(
+            `${this.getTeamsRoute()}/members/invite${query}`,
+            {method: 'post'},
+        );
+    };
+
+    removeFromTeam = async (teamId: string, userId: string) => {
+        this.analytics.trackAPI('api_teams_remove_members', {team_id: teamId});
+
+        return this.doFetch(
+            `${this.getTeamMemberRoute(teamId, userId)}`,
+            {method: 'delete'},
+        );
+    };
+
+    getTeamStats = async (teamId: string) => {
+        return this.doFetch(
+            `${this.getTeamRoute(teamId)}/stats`,
+            {method: 'get'},
+        );
+    };
+
+    getTeamIconUrl = (teamId: string, lastTeamIconUpdate: number) => {
+        const params: any = {};
+        if (lastTeamIconUpdate) {
+            params._ = lastTeamIconUpdate;
+        }
+
+        return `${this.getTeamRoute(teamId)}/image${buildQueryString(params)}`;
+    };
+};
+
+export default ClientTeams;
diff --git a/app/client/rest/tos.ts b/app/client/rest/tos.ts
new file mode 100644
index 000000000..997080bcf
--- /dev/null
+++ b/app/client/rest/tos.ts
@@ -0,0 +1,25 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export interface ClientTosMix {
+    updateMyTermsOfServiceStatus: (termsOfServiceId: string, accepted: boolean) => Promise<any>;
+    getTermsOfService: () => Promise<any>;
+}
+
+const ClientTos = (superclass: any) => class extends superclass {
+    updateMyTermsOfServiceStatus = async (termsOfServiceId: string, accepted: boolean) => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}/terms_of_service`,
+            {method: 'post', body: JSON.stringify({termsOfServiceId, accepted})},
+        );
+    }
+
+    getTermsOfService = async () => {
+        return this.doFetch(
+            `${this.getBaseRoute()}/terms_of_service`,
+            {method: 'get'},
+        );
+    }
+};
+
+export default ClientTos;
diff --git a/app/client/rest/users.ts b/app/client/rest/users.ts
new file mode 100644
index 000000000..bef25f181
--- /dev/null
+++ b/app/client/rest/users.ts
@@ -0,0 +1,396 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {General} from '@constants';
+import {buildQueryString, isMinimumServerVersion} from '@utils/helpers';
+
+import {PER_PAGE_DEFAULT} from './constants';
+
+export interface ClientUsersMix {
+    createUser: (user: UserProfile, token: string, inviteId: string) => Promise<UserProfile>;
+    patchMe: (userPatch: Partial<UserProfile>) => Promise<UserProfile>;
+    patchUser: (userPatch: Partial<UserProfile> & {id: string}) => Promise<UserProfile>;
+    updateUser: (user: UserProfile) => Promise<UserProfile>;
+    demoteUserToGuest: (userId: string) => Promise<any>;
+    getKnownUsers: () => Promise<string[]>;
+    sendPasswordResetEmail: (email: string) => Promise<any>;
+    setDefaultProfileImage: (userId: string) => Promise<any>;
+    login: (loginId: string, password: string, token?: string, deviceId?: string, ldapOnly?: boolean) => Promise<UserProfile>;
+    loginById: (id: string, password: string, token?: string, deviceId?: string) => Promise<UserProfile>;
+    logout: () => Promise<any>;
+    getProfiles: (page?: number, perPage?: number, options?: Record<string, any>) => Promise<UserProfile[]>;
+    getProfilesByIds: (userIds: string[], options?: Record<string, any>) => Promise<UserProfile[]>;
+    getProfilesByUsernames: (usernames: string[]) => Promise<UserProfile[]>;
+    getProfilesInTeam: (teamId: string, page?: number, perPage?: number, sort?: string, options?: Record<string, any>) => Promise<UserProfile[]>;
+    getProfilesNotInTeam: (teamId: string, groupConstrained: boolean, page?: number, perPage?: number) => Promise<UserProfile[]>;
+    getProfilesWithoutTeam: (page?: number, perPage?: number, options?: Record<string, any>) => Promise<UserProfile[]>;
+    getProfilesInChannel: (channelId: string, page?: number, perPage?: number, sort?: string) => Promise<UserProfile[]>;
+    getProfilesInGroupChannels: (channelsIds: string[]) => Promise<{[x: string]: UserProfile[]}>;
+    getProfilesNotInChannel: (teamId: string, channelId: string, groupConstrained: boolean, page?: number, perPage?: number) => Promise<UserProfile[]>;
+    getMe: () => Promise<UserProfile>;
+    getUser: (userId: string) => Promise<UserProfile>;
+    getUserByUsername: (username: string) => Promise<UserProfile>;
+    getUserByEmail: (email: string) => Promise<UserProfile>;
+    getProfilePictureUrl: (userId: string, lastPictureUpdate: number) => string;
+    getDefaultProfilePictureUrl: (userId: string) => string;
+    autocompleteUsers: (name: string, teamId: string, channelId: string, options?: Record<string, any>) => Promise<{users: UserProfile[], out_of_channel?: UserProfile[]}>;
+    getSessions: (userId: string) => Promise<any>;
+    checkUserMfa: (loginId: string) => Promise<{mfa_required: boolean}>;
+    attachDevice: (deviceId: string) => Promise<any>;
+    searchUsers: (term: string, options: any) => Promise<UserProfile[]>;
+    getStatusesByIds: (userIds: string[]) => Promise<UserStatus[]>;
+    getStatus: (userId: string) => Promise<UserStatus>;
+    updateStatus: (status: UserStatus) => Promise<UserStatus>;
+}
+
+const ClientUsers = (superclass: any) => class extends superclass {
+    createUser = async (user: UserProfile, token: string, inviteId: string) => {
+        this.analytics.trackAPI('api_users_create');
+
+        const queryParams: any = {};
+
+        if (token) {
+            queryParams.t = token;
+        }
+
+        if (inviteId) {
+            queryParams.iid = inviteId;
+        }
+
+        return this.doFetch(
+            `${this.getUsersRoute()}${buildQueryString(queryParams)}`,
+            {method: 'post', body: JSON.stringify(user)},
+        );
+    }
+
+    patchMe = async (userPatch: Partial<UserProfile>) => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}/patch`,
+            {method: 'put', body: JSON.stringify(userPatch)},
+        );
+    }
+
+    patchUser = async (userPatch: Partial<UserProfile> & {id: string}) => {
+        this.analytics.trackAPI('api_users_patch');
+
+        return this.doFetch(
+            `${this.getUserRoute(userPatch.id)}/patch`,
+            {method: 'put', body: JSON.stringify(userPatch)},
+        );
+    }
+
+    updateUser = async (user: UserProfile) => {
+        this.analytics.trackAPI('api_users_update');
+
+        return this.doFetch(
+            `${this.getUserRoute(user.id)}`,
+            {method: 'put', body: JSON.stringify(user)},
+        );
+    }
+
+    demoteUserToGuest = async (userId: string) => {
+        this.analytics.trackAPI('api_users_demote_user_to_guest');
+
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/demote`,
+            {method: 'post'},
+        );
+    }
+
+    getKnownUsers = async () => {
+        this.analytics.trackAPI('api_get_known_users');
+
+        return this.doFetch(
+            `${this.getUsersRoute()}/known`,
+            {method: 'get'},
+        );
+    }
+
+    sendPasswordResetEmail = async (email: string) => {
+        this.analytics.trackAPI('api_users_send_password_reset');
+
+        return this.doFetch(
+            `${this.getUsersRoute()}/password/reset/send`,
+            {method: 'post', body: JSON.stringify({email})},
+        );
+    }
+
+    setDefaultProfileImage = async (userId: string) => {
+        this.analytics.trackAPI('api_users_set_default_profile_picture');
+
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/image`,
+            {method: 'delete'},
+        );
+    };
+
+    login = async (loginId: string, password: string, token = '', deviceId = '', ldapOnly = false) => {
+        this.analytics.trackAPI('api_users_login');
+
+        if (ldapOnly) {
+            this.analytics.trackAPI('api_users_login_ldap');
+        }
+
+        const body: any = {
+            device_id: deviceId,
+            login_id: loginId,
+            password,
+            token,
+        };
+
+        if (ldapOnly) {
+            body.ldap_only = 'true';
+        }
+
+        const {data} = await this.doFetchWithResponse(
+            `${this.getUsersRoute()}/login`,
+            {
+                method: 'post',
+                body: JSON.stringify(body),
+                headers: {'Cache-Control': 'no-store'},
+            },
+        );
+
+        return data;
+    };
+
+    loginById = async (id: string, password: string, token = '', deviceId = '') => {
+        this.analytics.trackAPI('api_users_login');
+        const body: any = {
+            device_id: deviceId,
+            id,
+            password,
+            token,
+        };
+
+        const {data} = await this.doFetchWithResponse(
+            `${this.getUsersRoute()}/login`,
+            {method: 'post', body: JSON.stringify(body)},
+        );
+
+        return data;
+    };
+
+    logout = async () => {
+        this.analytics.trackAPI('api_users_logout');
+
+        const {response} = await this.doFetchWithResponse(
+            `${this.getUsersRoute()}/logout`,
+            {method: 'post'},
+        );
+
+        if (response.ok) {
+            this.token = '';
+        }
+
+        this.serverVersion = '';
+
+        return response;
+    };
+
+    getProfiles = async (page = 0, perPage = PER_PAGE_DEFAULT, options = {}) => {
+        this.analytics.trackAPI('api_profiles_get');
+
+        return this.doFetch(
+            `${this.getUsersRoute()}${buildQueryString({page, per_page: perPage, ...options})}`,
+            {method: 'get'},
+        );
+    };
+
+    getProfilesByIds = async (userIds: string[], options = {}) => {
+        this.analytics.trackAPI('api_profiles_get_by_ids');
+
+        return this.doFetch(
+            `${this.getUsersRoute()}/ids${buildQueryString(options)}`,
+            {method: 'post', body: JSON.stringify(userIds)},
+        );
+    };
+
+    getProfilesByUsernames = async (usernames: string[]) => {
+        this.analytics.trackAPI('api_profiles_get_by_usernames');
+
+        return this.doFetch(
+            `${this.getUsersRoute()}/usernames`,
+            {method: 'post', body: JSON.stringify(usernames)},
+        );
+    };
+
+    getProfilesInTeam = async (teamId: string, page = 0, perPage = PER_PAGE_DEFAULT, sort = '', options = {}) => {
+        this.analytics.trackAPI('api_profiles_get_in_team', {team_id: teamId, sort});
+
+        return this.doFetch(
+            `${this.getUsersRoute()}${buildQueryString({...options, in_team: teamId, page, per_page: perPage, sort})}`,
+            {method: 'get'},
+        );
+    };
+
+    getProfilesNotInTeam = async (teamId: string, groupConstrained: boolean, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        this.analytics.trackAPI('api_profiles_get_not_in_team', {team_id: teamId, group_constrained: groupConstrained});
+
+        const queryStringObj: any = {not_in_team: teamId, page, per_page: perPage};
+        if (groupConstrained) {
+            queryStringObj.group_constrained = true;
+        }
+
+        return this.doFetch(
+            `${this.getUsersRoute()}${buildQueryString(queryStringObj)}`,
+            {method: 'get'},
+        );
+    };
+
+    getProfilesWithoutTeam = async (page = 0, perPage = PER_PAGE_DEFAULT, options = {}) => {
+        this.analytics.trackAPI('api_profiles_get_without_team');
+
+        return this.doFetch(
+            `${this.getUsersRoute()}${buildQueryString({...options, without_team: 1, page, per_page: perPage})}`,
+            {method: 'get'},
+        );
+    };
+
+    getProfilesInChannel = async (channelId: string, page = 0, perPage = PER_PAGE_DEFAULT, sort = '') => {
+        this.analytics.trackAPI('api_profiles_get_in_channel', {channel_id: channelId});
+
+        const serverVersion = this.getServerVersion();
+        let queryStringObj;
+        if (isMinimumServerVersion(serverVersion, 4, 7)) {
+            queryStringObj = {in_channel: channelId, page, per_page: perPage, sort};
+        } else {
+            queryStringObj = {in_channel: channelId, page, per_page: perPage};
+        }
+        return this.doFetch(
+            `${this.getUsersRoute()}${buildQueryString(queryStringObj)}`,
+            {method: 'get'},
+        );
+    };
+
+    getProfilesInGroupChannels = async (channelsIds: string[]) => {
+        this.analytics.trackAPI('api_profiles_get_in_group_channels', {channelsIds});
+
+        return this.doFetch(
+            `${this.getUsersRoute()}/group_channels`,
+            {method: 'post', body: JSON.stringify(channelsIds)},
+        );
+    };
+
+    getProfilesNotInChannel = async (teamId: string, channelId: string, groupConstrained: boolean, page = 0, perPage = PER_PAGE_DEFAULT) => {
+        this.analytics.trackAPI('api_profiles_get_not_in_channel', {team_id: teamId, channel_id: channelId, group_constrained: groupConstrained});
+
+        const queryStringObj: any = {in_team: teamId, not_in_channel: channelId, page, per_page: perPage};
+        if (groupConstrained) {
+            queryStringObj.group_constrained = true;
+        }
+
+        return this.doFetch(
+            `${this.getUsersRoute()}${buildQueryString(queryStringObj)}`,
+            {method: 'get'},
+        );
+    };
+
+    getMe = async () => {
+        return this.doFetch(
+            `${this.getUserRoute('me')}`,
+            {method: 'get'},
+        );
+    };
+
+    getUser = async (userId: string) => {
+        return this.doFetch(
+            `${this.getUserRoute(userId)}`,
+            {method: 'get'},
+        );
+    };
+
+    getUserByUsername = async (username: string) => {
+        return this.doFetch(
+            `${this.getUsersRoute()}/username/${username}`,
+            {method: 'get'},
+        );
+    };
+
+    getUserByEmail = async (email: string) => {
+        return this.doFetch(
+            `${this.getUsersRoute()}/email/${email}`,
+            {method: 'get'},
+        );
+    };
+
+    getProfilePictureUrl = (userId: string, lastPictureUpdate: number) => {
+        const params: any = {};
+
+        if (lastPictureUpdate) {
+            params._ = lastPictureUpdate;
+        }
+
+        return `${this.getUserRoute(userId)}/image${buildQueryString(params)}`;
+    };
+
+    getDefaultProfilePictureUrl = (userId: string) => {
+        return `${this.getUserRoute(userId)}/image/default`;
+    };
+
+    autocompleteUsers = async (name: string, teamId: string, channelId: string, options = {
+        limit: General.AUTOCOMPLETE_LIMIT_DEFAULT,
+    }) => {
+        return this.doFetch(`${this.getUsersRoute()}/autocomplete${buildQueryString({
+            in_team: teamId,
+            in_channel: channelId,
+            name,
+            limit: options.limit,
+        })}`, {
+            method: 'get',
+        });
+    };
+
+    getSessions = async (userId: string) => {
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/sessions`,
+            {method: 'get'},
+        );
+    };
+
+    checkUserMfa = async (loginId: string) => {
+        return this.doFetch(
+            `${this.getUsersRoute()}/mfa`,
+            {method: 'post', body: JSON.stringify({login_id: loginId})},
+        );
+    };
+
+    attachDevice = async (deviceId: string) => {
+        return this.doFetch(
+            `${this.getUsersRoute()}/sessions/device`,
+            {method: 'put', body: JSON.stringify({device_id: deviceId})},
+        );
+    };
+
+    searchUsers = async (term: string, options: any) => {
+        this.analytics.trackAPI('api_search_users');
+
+        return this.doFetch(
+            `${this.getUsersRoute()}/search`,
+            {method: 'post', body: JSON.stringify({term, ...options})},
+        );
+    };
+
+    getStatusesByIds = async (userIds: string[]) => {
+        return this.doFetch(
+            `${this.getUsersRoute()}/status/ids`,
+            {method: 'post', body: JSON.stringify(userIds)},
+        );
+    };
+
+    getStatus = async (userId: string) => {
+        return this.doFetch(
+            `${this.getUserRoute(userId)}/status`,
+            {method: 'get'},
+        );
+    };
+
+    updateStatus = async (status: UserStatus) => {
+        return this.doFetch(
+            `${this.getUserRoute(status.user_id)}/status`,
+            {method: 'put', body: JSON.stringify(status)},
+        );
+    };
+};
+
+export default ClientUsers;
diff --git a/app/client/websocket/index.ts b/app/client/websocket/index.ts
new file mode 100644
index 000000000..b8ddb3ce1
--- /dev/null
+++ b/app/client/websocket/index.ts
@@ -0,0 +1,247 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Platform} from 'react-native';
+
+const MAX_WEBSOCKET_FAILS = 7;
+const MIN_WEBSOCKET_RETRY_TIME = 3000; // 3 sec
+
+const MAX_WEBSOCKET_RETRY_TIME = 300000; // 5 mins
+
+class WebSocketClient {
+    conn?: WebSocket;
+    connectionUrl: string;
+    token: string|null;
+    sequence: number;
+    connectFailCount: number;
+    eventCallback?: Function;
+    firstConnectCallback?: Function;
+    reconnectCallback?: Function;
+    errorCallback?: Function;
+    closeCallback?: Function;
+    connectingCallback?: Function;
+    stop: boolean;
+    connectionTimeout: any;
+
+    constructor() {
+        this.connectionUrl = '';
+        this.token = null;
+        this.sequence = 1;
+        this.connectFailCount = 0;
+        this.stop = false;
+    }
+
+    initialize(token: string|null, opts = {}) {
+        const defaults = {
+            forceConnection: true,
+            connectionUrl: this.connectionUrl,
+        };
+
+        const {connectionUrl, forceConnection, ...additionalOptions} = Object.assign({}, defaults, opts);
+
+        if (forceConnection) {
+            this.stop = false;
+        }
+
+        return new Promise((resolve, reject) => {
+            if (this.conn) {
+                resolve(null);
+                return;
+            }
+
+            if (connectionUrl == null) {
+                console.log('websocket must have connection url'); //eslint-disable-line no-console
+                reject(new Error('websocket must have connection url'));
+                return;
+            }
+
+            if (this.connectFailCount === 0) {
+                console.log('websocket connecting to ' + connectionUrl); //eslint-disable-line no-console
+            }
+
+            if (this.connectingCallback) {
+                this.connectingCallback();
+            }
+
+            const regex = /^(?:https?|wss?):(?:\/\/)?[^/]*/;
+            const captured = (regex).exec(connectionUrl);
+
+            let origin;
+            if (captured) {
+                origin = captured[0];
+
+                if (Platform.OS === 'android') {
+                    // this is done cause for android having the port 80 or 443 will fail the connection
+                    // the websocket will append them
+                    const split = origin.split(':');
+                    const port = split[2];
+                    if (port === '80' || port === '443') {
+                        origin = `${split[0]}:${split[1]}`;
+                    }
+                }
+            } else {
+                // If we're unable to set the origin header, the websocket won't connect, but the URL is likely malformed anyway
+                const errorMessage = 'websocket failed to parse origin from ' + connectionUrl;
+                console.warn(errorMessage); // eslint-disable-line no-console
+                reject(new Error(errorMessage));
+                return;
+            }
+
+            this.conn = new WebSocket(connectionUrl, [], {headers: {origin}, ...(additionalOptions || {})});
+            this.connectionUrl = connectionUrl;
+            this.token = token;
+
+            this.conn!.onopen = () => {
+                if (token) {
+                    // we check for the platform as a workaround until we fix on the server that further authentications
+                    // are ignored
+                    this.sendMessage('authentication_challenge', {token});
+                }
+
+                if (this.connectFailCount > 0) {
+                    console.log('websocket re-established connection'); //eslint-disable-line no-console
+                    if (this.reconnectCallback) {
+                        this.reconnectCallback();
+                    }
+                } else if (this.firstConnectCallback) {
+                    this.firstConnectCallback();
+                }
+
+                this.connectFailCount = 0;
+                resolve(null);
+            };
+
+            this.conn!.onclose = () => {
+                this.conn = undefined;
+                this.sequence = 1;
+
+                if (this.connectFailCount === 0) {
+                    console.log('websocket closed'); //eslint-disable-line no-console
+                }
+
+                this.connectFailCount++;
+
+                if (this.closeCallback) {
+                    this.closeCallback(this.connectFailCount);
+                }
+
+                let retryTime = MIN_WEBSOCKET_RETRY_TIME;
+
+                // If we've failed a bunch of connections then start backing off
+                if (this.connectFailCount > MAX_WEBSOCKET_FAILS) {
+                    retryTime = MIN_WEBSOCKET_RETRY_TIME * this.connectFailCount;
+                    if (retryTime > MAX_WEBSOCKET_RETRY_TIME) {
+                        retryTime = MAX_WEBSOCKET_RETRY_TIME;
+                    }
+                }
+
+                if (this.connectionTimeout) {
+                    clearTimeout(this.connectionTimeout);
+                }
+
+                this.connectionTimeout = setTimeout(
+                    () => {
+                        if (this.stop) {
+                            clearTimeout(this.connectionTimeout);
+                            return;
+                        }
+                        this.initialize(token, opts);
+                    },
+                    retryTime,
+                );
+            };
+
+            this.conn!.onerror = (evt: any) => {
+                if (this.connectFailCount <= 1) {
+                    console.log('websocket error'); //eslint-disable-line no-console
+                    console.log(evt); //eslint-disable-line no-console
+                }
+
+                if (this.errorCallback) {
+                    this.errorCallback(evt);
+                }
+            };
+
+            this.conn!.onmessage = (evt: any) => {
+                const msg = JSON.parse(evt.data);
+                if (msg.seq_reply) {
+                    if (msg.error) {
+                        console.warn(msg); //eslint-disable-line no-console
+                    }
+                } else if (this.eventCallback) {
+                    this.eventCallback(msg);
+                }
+            };
+        });
+    }
+
+    setConnectingCallback(callback: Function) {
+        this.connectingCallback = callback;
+    }
+
+    setEventCallback(callback: Function) {
+        this.eventCallback = callback;
+    }
+
+    setFirstConnectCallback(callback: Function) {
+        this.firstConnectCallback = callback;
+    }
+
+    setReconnectCallback(callback: Function) {
+        this.reconnectCallback = callback;
+    }
+
+    setErrorCallback(callback: Function) {
+        this.errorCallback = callback;
+    }
+
+    setCloseCallback(callback: Function) {
+        this.closeCallback = callback;
+    }
+
+    close(stop = false) {
+        this.stop = stop;
+        this.connectFailCount = 0;
+        this.sequence = 1;
+        if (this.conn && this.conn.readyState === WebSocket.OPEN) {
+            this.conn.onclose = () => {}; //eslint-disable-line @typescript-eslint/no-empty-function
+            this.conn.close();
+            this.conn = undefined;
+            console.log('websocket closed'); //eslint-disable-line no-console
+        }
+    }
+
+    sendMessage(action: string, data: any) {
+        const msg = {
+            action,
+            seq: this.sequence++,
+            data,
+        };
+
+        if (this.conn && this.conn.readyState === WebSocket.OPEN) {
+            this.conn.send(JSON.stringify(msg));
+        } else if (!this.conn || this.conn.readyState === WebSocket.CLOSED) {
+            this.conn = undefined;
+            this.initialize(this.token);
+        }
+    }
+
+    userTyping(channelId: string, parentId: string) {
+        this.sendMessage('user_typing', {
+            channel_id: channelId,
+            parent_id: parentId,
+        });
+    }
+
+    getStatuses() {
+        this.sendMessage('get_statuses', null);
+    }
+
+    getStatusesByIds(userIds: string[]) {
+        this.sendMessage('get_statuses_by_ids', {
+            user_ids: userIds,
+        });
+    }
+}
+
+export default new WebSocketClient();
diff --git a/app/components/app_version/index.tsx b/app/components/app_version/index.tsx
new file mode 100644
index 000000000..98138a8e4
--- /dev/null
+++ b/app/components/app_version/index.tsx
@@ -0,0 +1,38 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {StyleSheet, View} from 'react-native';
+import DeviceInfo from 'react-native-device-info';
+
+import FormattedText from '@components/formatted_text';
+
+const style = StyleSheet.create({
+    info: {
+        alignItems: 'center',
+        justifyContent: 'flex-end',
+    },
+    version: {
+        fontSize: 12,
+    },
+});
+
+const AppVersion = () => {
+    return (
+        <View pointerEvents='none'>
+            <View style={style.info}>
+                <FormattedText
+                    id='mobile.about.appVersion'
+                    defaultMessage='App Version: {version} (Build {number})'
+                    style={style.version}
+                    values={{
+                        version: DeviceInfo.getVersion(),
+                        number: DeviceInfo.getBuildNumber(),
+                    }}
+                />
+            </View>
+        </View>
+    );
+};
+
+export default AppVersion;
diff --git a/app/components/error_text/__snapshots__/error_text.test.tsx.snap b/app/components/error_text/__snapshots__/error_text.test.tsx.snap
new file mode 100644
index 000000000..7e89e48af
--- /dev/null
+++ b/app/components/error_text/__snapshots__/error_text.test.tsx.snap
@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ErrorText should match snapshot 1`] = `
+<Text
+  style={
+    Array [
+      Object {
+        "color": "#fd5960",
+        "fontSize": 12,
+        "marginBottom": 15,
+        "marginTop": 15,
+        "textAlign": "left",
+      },
+      Object {
+        "fontSize": 14,
+        "marginHorizontal": 15,
+      },
+    ]
+  }
+  testID="error.text"
+>
+  Username must begin with a letter and contain between 3 and 22 characters including numbers, lowercase letters, and the symbols
+</Text>
+`;
diff --git a/app/components/error_text/error_text.test.tsx b/app/components/error_text/error_text.test.tsx
new file mode 100644
index 000000000..7c8173ffe
--- /dev/null
+++ b/app/components/error_text/error_text.test.tsx
@@ -0,0 +1,28 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {render} from '@testing-library/react-native';
+import {Preferences} from '@constants';
+
+import ErrorText from './index';
+
+describe('ErrorText', () => {
+    const baseProps = {
+        testID: 'error.text',
+        textStyle: {
+            fontSize: 14,
+            marginHorizontal: 15,
+        },
+        theme: Preferences.THEMES.default,
+        error: 'Username must begin with a letter and contain between 3 and 22 characters including numbers, lowercase letters, and the symbols',
+    };
+
+    test('should match snapshot', () => {
+        const wrapper = render(
+            <ErrorText {...baseProps}/>,
+        );
+
+        expect(wrapper.toJSON()).toMatchSnapshot();
+    });
+});
diff --git a/app/components/error_text/index.tsx b/app/components/error_text/index.tsx
new file mode 100644
index 000000000..48e3c7c71
--- /dev/null
+++ b/app/components/error_text/index.tsx
@@ -0,0 +1,59 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {StyleProp, Text, TextStyle, ViewStyle} from 'react-native';
+
+import FormattedText from '@components/formatted_text';
+import {ClientError} from '@utils/client_error';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+export type ClientErrorWithIntl = ClientError & {intl: {values?: Record<string, any>}}
+
+type ErrorProps = {
+    error: ClientErrorWithIntl | string;
+    testID?: string;
+    textStyle?: StyleProp<ViewStyle> | StyleProp<TextStyle>
+    theme: Theme;
+}
+
+const ErrorText = ({error, testID, textStyle, theme}: ErrorProps) => {
+    const style = getStyleSheet(theme);
+    const message = typeof (error) === 'string' ? error : error.message;
+
+    if (typeof (error) !== 'string' && error.intl) {
+        const {intl} = error;
+        return (
+            <FormattedText
+                testID={testID}
+                id={intl.id}
+                defaultMessage={intl.defaultMessage}
+                values={intl.values}
+                style={[style.errorLabel, textStyle]}
+            />
+        );
+    }
+
+    return (
+        <Text
+            testID={testID}
+            style={[style.errorLabel, textStyle]}
+        >
+            {message}
+        </Text>
+    );
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
+    return {
+        errorLabel: {
+            color: (theme?.errorTextColor || '#DA4A4A'),
+            marginTop: 15,
+            marginBottom: 15,
+            fontSize: 12,
+            textAlign: 'left',
+        },
+    };
+});
+
+export default ErrorText;
diff --git a/app/components/formatted_text/index.tsx b/app/components/formatted_text/index.tsx
new file mode 100644
index 000000000..053fc985b
--- /dev/null
+++ b/app/components/formatted_text/index.tsx
@@ -0,0 +1,88 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {createElement, isValidElement} from 'react';
+import {StyleProp, Text, TextStyle, ViewStyle} from 'react-native';
+import {useIntl} from 'react-intl';
+
+type FormattedTextProps = {
+    id: string;
+    defaultMessage: string;
+    values?: Record<string, any>;
+    testID?: string;
+    style?: StyleProp<ViewStyle> | StyleProp<TextStyle>
+}
+
+const FormattedText = (props: FormattedTextProps) => {
+    const intl = useIntl();
+    const {formatMessage} = intl;
+    const {id, defaultMessage, values, ...otherProps} = props;
+    const tokenizedValues: Record<string, any> = {};
+    const elements: Record<string, any> = {};
+    let tokenDelimiter = '';
+
+    if (values && Object.keys(values).length > 0) {
+        // Creates a token with a random UID that should not be guessable or
+        // conflict with other parts of the `message` string.
+        const uid = Math.floor(Math.random() * 0x10000000000).toString(16);
+
+        const generateToken = (() => {
+            let counter = 0;
+            return () => {
+                const elementId = `ELEMENT-${uid}-${(counter += 1)}`;
+                return elementId;
+            };
+        })();
+
+        // Splitting with a delimiter to support IE8. When using a regex
+        // with a capture group IE8 does not include the capture group in
+        // the resulting array.
+        tokenDelimiter = `@__${uid}__@`;
+
+        // Iterates over the `props` to keep track of any React Element
+        // values so they can be represented by the `token` as a placeholder
+        // when the `message` is formatted. This allows the formatted
+        // message to then be broken-up into parts with references to the
+        // React Elements inserted back in.
+        Object.keys(values).forEach((name) => {
+            const value = values[name];
+
+            if (isValidElement(value)) {
+                const token = generateToken();
+                tokenizedValues[name] = tokenDelimiter + token + tokenDelimiter;
+                elements[token] = value;
+            } else {
+                tokenizedValues[name] = value;
+            }
+        });
+    }
+
+    const descriptor = {id, defaultMessage};
+    const formattedMessage = formatMessage(
+        descriptor,
+        tokenizedValues || values,
+    );
+    const hasElements = elements && Object.keys(elements).length > 0;
+
+    let nodes;
+    if (hasElements) {
+        // Split the message into parts so the React Element values captured
+        // above can be inserted back into the rendered message. This
+        // approach allows messages to render with React Elements while
+        // keeping React's virtual diffing working properly.
+        nodes = formattedMessage.
+            split(tokenDelimiter).
+            filter((part) => Boolean(part)).
+            map((part) => elements[part] || part);
+    } else {
+        nodes = [formattedMessage];
+    }
+
+    return createElement(Text, otherProps, ...nodes);
+};
+
+FormattedText.defaultProps = {
+    defaultMessage: '',
+};
+
+export default FormattedText;
diff --git a/app/components/loading/index.tsx b/app/components/loading/index.tsx
new file mode 100644
index 000000000..4fcb96b50
--- /dev/null
+++ b/app/components/loading/index.tsx
@@ -0,0 +1,38 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {ActivityIndicator, StyleSheet, View, ViewStyle} from 'react-native';
+
+type LoadingProps = {
+    color?: string,
+    size?: 'small' | 'large',
+    style?: ViewStyle,
+}
+
+const Loading = ({size = 'large', color = 'grey', style}: LoadingProps) => {
+    return (
+        <View style={styles.container}>
+            <ActivityIndicator
+                style={[styles.loading, style]}
+                animating={true}
+                size={size}
+                color={color}
+            />
+        </View>
+    );
+};
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
+
+    loading: {
+        marginLeft: 3,
+    },
+});
+
+export default Loading;
diff --git a/app/components/loading/loading.stories.tsx b/app/components/loading/loading.stories.tsx
new file mode 100644
index 000000000..c4af994a4
--- /dev/null
+++ b/app/components/loading/loading.stories.tsx
@@ -0,0 +1,17 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+import React from 'react';
+
+import {storiesOf} from '@storybook/react-native';
+import {withKnobs, select} from '@storybook/addon-knobs';
+
+import Loading from './index';
+
+storiesOf('Loading Icon Story', module).
+    addDecorator(withKnobs).
+    add('loading icon', () => (
+        <Loading
+            size={select('size', {Large: 'large', Small: 'small'}, 'large')}
+            color={select('color', {Red: 'red', Blue: 'blue', Yellow: 'yellow', Black: 'black'}, 'red')}
+        />
+    ));
diff --git a/app/constants/files.ts b/app/constants/files.ts
new file mode 100644
index 000000000..dae92df3e
--- /dev/null
+++ b/app/constants/files.ts
@@ -0,0 +1,18 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+const Files: Record<string, string[]> = {
+    AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac', 'ogg'],
+    CODE_TYPES: ['as', 'applescript', 'osascript', 'scpt', 'bash', 'sh', 'zsh', 'clj', 'boot', 'cl2', 'cljc', 'cljs', 'cljs.hl', 'cljscm', 'cljx', 'hic', 'coffee', '_coffee', 'cake', 'cjsx', 'cson', 'iced', 'cpp', 'c', 'cc', 'h', 'c++', 'h++', 'hpp', 'cs', 'csharp', 'css', 'd', 'di', 'dart', 'delphi', 'dpr', 'dfm', 'pas', 'pascal', 'freepascal', 'lazarus', 'lpr', 'lfm', 'diff', 'django', 'jinja', 'dockerfile', 'docker', 'erl', 'f90', 'f95', 'fsharp', 'fs', 'gcode', 'nc', 'go', 'groovy', 'handlebars', 'hbs', 'html.hbs', 'html.handlebars', 'hs', 'hx', 'java', 'jsp', 'js', 'jsx', 'json', 'jl', 'kt', 'ktm', 'kts', 'less', 'lisp', 'lua', 'mk', 'mak', 'md', 'mkdown', 'mkd', 'matlab', 'm', 'mm', 'objc', 'obj-c', 'ml', 'perl', 'pl', 'php', 'php3', 'php4', 'php5', 'php6', 'ps', 'ps1', 'pp', 'py', 'gyp', 'r', 'ruby', 'rb', 'gemspec', 'podspec', 'thor', 'irb', 'rs', 'scala', 'scm', 'sld', 'scss', 'st', 'sql', 'swift', 'tex', 'vbnet', 'vb', 'bas', 'vbs', 'v', 'veo', 'xml', 'html', 'xhtml', 'rss', 'atom', 'xsl', 'plist', 'yaml'],
+    IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png', 'jpeg', 'tiff', 'tif'],
+    PATCH_TYPES: ['patch'],
+    PDF_TYPES: ['pdf'],
+    PRESENTATION_TYPES: ['ppt', 'pptx'],
+    SPREADSHEET_TYPES: ['xlsx', 'csv'],
+    TEXT_TYPES: ['txt', 'rtf'],
+    VIDEO_TYPES: ['mp4', 'avi', 'webm', 'mkv', 'wmv', 'mpg', 'mov', 'flv'],
+    WORD_TYPES: ['doc', 'docx'],
+    ZIP_TYPES: ['zip'],
+};
+
+export default Files;
diff --git a/app/constants/general.ts b/app/constants/general.ts
new file mode 100644
index 000000000..72082b809
--- /dev/null
+++ b/app/constants/general.ts
@@ -0,0 +1,72 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export default {
+    CONFIG_CHANGED: 'config_changed',
+    SERVER_VERSION_CHANGED: 'server_version_changed',
+    PAGE_SIZE_DEFAULT: 60,
+    PAGE_SIZE_MAXIMUM: 200,
+    LOGS_PAGE_SIZE_DEFAULT: 10000,
+    PROFILE_CHUNK_SIZE: 100,
+    CHANNELS_CHUNK_SIZE: 50,
+    TEAMS_CHUNK_SIZE: 50,
+    SEARCH_TIMEOUT_MILLISECONDS: 100,
+    STATUS_INTERVAL: 60000,
+    AUTOCOMPLETE_LIMIT_DEFAULT: 25,
+    AUTOCOMPLETE_SPLIT_CHARACTERS: ['.', '-', '_'],
+    MENTION: 'mention',
+    OUT_OF_OFFICE: 'ooo',
+    OFFLINE: 'offline',
+    AWAY: 'away',
+    ONLINE: 'online',
+    DND: 'dnd',
+    PERMISSIONS_ALL: 'all',
+    PERMISSIONS_CHANNEL_ADMIN: 'channel_admin',
+    PERMISSIONS_TEAM_ADMIN: 'team_admin',
+    PERMISSIONS_SYSTEM_ADMIN: 'system_admin',
+    TEAM_GUEST_ROLE: 'team_guest',
+    TEAM_USER_ROLE: 'team_user',
+    TEAM_ADMIN_ROLE: 'team_admin',
+    CHANNEL_GUEST_ROLE: 'channel_guest',
+    CHANNEL_USER_ROLE: 'channel_user',
+    CHANNEL_ADMIN_ROLE: 'channel_admin',
+    SYSTEM_GUEST_ROLE: 'system_guest',
+    SYSTEM_USER_ROLE: 'system_user',
+    SYSTEM_ADMIN_ROLE: 'system_admin',
+    SYSTEM_USER_ACCESS_TOKEN_ROLE: 'system_user_access_token',
+    SYSTEM_POST_ALL_ROLE: 'system_post_all',
+    SYSTEM_POST_ALL_PUBLIC_ROLE: 'system_post_all_public',
+    ALLOW_EDIT_POST_ALWAYS: 'always',
+    ALLOW_EDIT_POST_NEVER: 'never',
+    ALLOW_EDIT_POST_TIME_LIMIT: 'time_limit',
+    DEFAULT_POST_EDIT_TIME_LIMIT: 300,
+    RESTRICT_DIRECT_MESSAGE_ANY: 'any',
+    RESTRICT_DIRECT_MESSAGE_TEAM: 'team',
+    SWITCH_TO_DEFAULT_CHANNEL: 'switch_to_default_channel',
+    REMOVED_FROM_CHANNEL: 'removed_from_channel',
+    DEFAULT_CHANNEL: 'town-square',
+    DM_CHANNEL: 'D',
+    OPEN_CHANNEL: 'O',
+    PRIVATE_CHANNEL: 'P',
+    GM_CHANNEL: 'G',
+    PUSH_NOTIFY_APPLE_REACT_NATIVE: 'apple_rn',
+    PUSH_NOTIFY_ANDROID_REACT_NATIVE: 'android_rn',
+    STORE_REHYDRATION_COMPLETE: 'store_hydration_complete',
+    OFFLINE_STORE_RESET: 'offline_store_reset',
+    OFFLINE_STORE_PURGE: 'offline_store_purge',
+    TEAMMATE_NAME_DISPLAY: {
+        SHOW_USERNAME: 'username',
+        SHOW_NICKNAME_FULLNAME: 'nickname_full_name',
+        SHOW_FULLNAME: 'full_name',
+    },
+    SPECIAL_MENTIONS: ['all', 'channel', 'here'],
+    MAX_USERS_IN_GM: 8,
+    MIN_USERS_IN_GM: 3,
+    MAX_GROUP_CHANNELS_FOR_PROFILES: 50,
+    DEFAULT_LOCALE: 'en',
+    DEFAULT_AUTOLINKED_URL_SCHEMES: ['http', 'https', 'ftp', 'mailto', 'tel', 'mattermost'],
+    DISABLED: 'disabled',
+    DEFAULT_ON: 'default_on',
+    DEFAULT_OFF: 'default_off',
+    REHYDRATED: 'app/REHYDRATED',
+};
diff --git a/app/constants/index.ts b/app/constants/index.ts
index e784b9ef3..c16a28c57 100644
--- a/app/constants/index.ts
+++ b/app/constants/index.ts
@@ -2,9 +2,11 @@
 // See LICENSE.txt for license information.
 
 import Attachment from './attachment';
+import SSO from './sso';
 import Database from './database';
-import DeepLink from './deep_linking';
 import Device from './device';
+import Files from './files';
+import General from './general';
 import List from './list';
 import Navigation from './navigation';
 import Preferences from './preferences';
@@ -14,9 +16,11 @@ import WebsocketEvents from './websocket';
 
 export {
     Attachment,
+    SSO,
     Database,
-    DeepLink,
     Device,
+    Files,
+    General,
     List,
     Navigation,
     Preferences,
diff --git a/app/constants/screens.ts b/app/constants/screens.ts
index b65dddf07..4959165f1 100644
--- a/app/constants/screens.ts
+++ b/app/constants/screens.ts
@@ -2,14 +2,23 @@
 // See LICENSE.txt for license information.
 
 export const CHANNEL = 'Channel';
+export const FORGOT_PASSWORD = 'ForgotPassword';
+export const LOGIN = 'Login';
+export const LOGIN_OPTIONS = 'LoginOptions';
 export const MAIN_SIDEBAR = 'MainSidebar';
+export const MFA = 'MFA';
 export const SERVER = 'Server';
 export const SETTINGS_SIDEBAR = 'SettingsSidebar';
+export const SSO = 'SSO';
 export const THREAD = 'Thread';
 
 export default {
     CHANNEL,
+    FORGOT_PASSWORD,
+    LOGIN,
+    LOGIN_OPTIONS,
     MAIN_SIDEBAR,
+    MFA,
     SERVER,
     SETTINGS_SIDEBAR,
     THREAD,
diff --git a/app/constants/sso.ts b/app/constants/sso.ts
new file mode 100644
index 000000000..71e737334
--- /dev/null
+++ b/app/constants/sso.ts
@@ -0,0 +1,12 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import keyMirror from '@utils/key_mirror';
+
+export default keyMirror({
+    GITLAB: null,
+    GOOGLE: null,
+    OFFICE365: null,
+    OPENID: null,
+    SAML: null,
+});
diff --git a/app/constants/view.ts b/app/constants/view.ts
index ed4f2af1a..f04970525 100644
--- a/app/constants/view.ts
+++ b/app/constants/view.ts
@@ -76,10 +76,6 @@ const ViewTypes = keyMirror({
 
     REMOVE_LAST_CHANNEL_FOR_TEAM: null,
 
-    GITLAB: null,
-    OFFICE365: null,
-    SAML: null,
-
     SET_INITIAL_POST_VISIBILITY: null,
     RECEIVED_FOCUSED_POST: null,
     LOADING_POSTS: null,
diff --git a/app/database/manager/__mocks__/index.ts b/app/database/manager/__mocks__/index.ts
index 23211b815..4c8d88efd 100644
--- a/app/database/manager/__mocks__/index.ts
+++ b/app/database/manager/__mocks__/index.ts
@@ -41,18 +41,23 @@ import {
 } from '@database/models/server';
 import {serverSchema} from '@database/schema/server';
 import logger from '@nozbe/watermelondb/utils/common/logger';
-import type {
-    ActiveServerDatabaseArgs,
+import {
     DatabaseConnectionArgs,
     DatabaseInstance,
     DatabaseInstances,
     DefaultNewServerArgs,
+    GetDatabaseConnectionArgs,
     Models,
+    RetrievedDatabase,
 } from '@typings/database/database';
 import {DatabaseType} from '@typings/database/enums';
+import IGlobal from '@typings/database/global';
 import IServers from '@typings/database/servers';
+import urlParse from 'url-parse';
 
-const {SERVERS} = MM_TABLES.DEFAULT;
+const {SERVERS, GLOBAL} = MM_TABLES.DEFAULT;
+const DEFAULT_DATABASE = 'default';
+const RECENTLY_VIEWED_SERVERS = 'RECENTLY_VIEWED_SERVERS';
 
 if (__DEV__) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -61,7 +66,6 @@ if (__DEV__) {
 }
 
 class DatabaseManager {
-  private activeDatabase: DatabaseInstance;
   private defaultDatabase: DatabaseInstance;
   private readonly defaultModels: Models;
   private readonly iOSAppGroupDatabase: string | null;
@@ -100,11 +104,58 @@ class DatabaseManager {
           TermsOfService,
           User,
       ];
-
       this.iOSAppGroupDatabase = null;
       this.androidFilesDirectory = null;
   }
 
+  /**
+   * getDatabaseConnection: Given a server url (serverUrl) and a flag (setAsActiveDatabase), this method will attempt
+   * to retrieve an existing database connection previously created for that url.  If not found, it will create a new connection and register it in the DEFAULT_DATABASE
+   * @param {GetDatabaseConnectionArgs} getDatabaseConnection
+   * @param {string} getDatabaseConnection.connectionName
+   * @param {string} getDatabaseConnection.serverUrl
+   * @param {boolean} getDatabaseConnection.setAsActiveDatabase
+   * @returns {Promise<DatabaseInstance>}
+   */
+  getDatabaseConnection = async ({
+      serverUrl,
+      setAsActiveDatabase,
+      connectionName,
+  }: GetDatabaseConnectionArgs) => {
+      // We potentially already have this server registered; so we'll try to retrieve it if it is present under DEFAULT_DATABASE/GLOBAL entity
+      const existingServers = (await this.retrieveDatabaseInstances([
+          serverUrl,
+      ])) as RetrievedDatabase[];
+
+      // Since we only passed one serverUrl, we'll expect only one value in the array
+      const serverDatabase = existingServers?.[0];
+
+      let connection: DatabaseInstance;
+
+      if (serverDatabase) {
+      // This serverUrl has previously been registered on the app
+          connection = serverDatabase.dbInstance;
+      } else {
+      // Or, it might be that the user has this server on the web-app but not mobile-app; so we'll need to create a new entry for this new serverUrl
+          const databaseName = connectionName ?? urlParse(serverUrl).hostname;
+          connection = await this.createDatabaseConnection({
+              shouldAddToDefaultDatabase: true,
+              configs: {
+                  actionsEnabled: true,
+                  dbName: databaseName,
+                  dbType: DatabaseType.SERVER,
+                  serverUrl,
+              },
+          });
+      }
+
+      if (setAsActiveDatabase) {
+          await this.setActiveServerDatabase(serverUrl);
+      }
+
+      return connection;
+  };
+
   /**
    * createDatabaseConnection: Creates database connection and registers the new connection into the default database.  However,
    * if a database connection could not be created, it will return undefined.
@@ -114,28 +165,17 @@ class DatabaseManager {
    * @returns {Promise<DatabaseInstance>}
    */
   createDatabaseConnection = async ({configs, shouldAddToDefaultDatabase = true}: DatabaseConnectionArgs): Promise<DatabaseInstance> => {
-      const {
-          actionsEnabled = true,
-          dbName = 'default',
-          dbType = DatabaseType.DEFAULT,
-          serverUrl = undefined,
-      } = configs;
+      const {actionsEnabled = true, dbName = DEFAULT_DATABASE, dbType = DatabaseType.DEFAULT, serverUrl = undefined} = configs;
 
       try {
-          const databaseName = dbType === DatabaseType.DEFAULT ? 'default' : dbName;
+          const databaseName = dbType === DatabaseType.DEFAULT ? DEFAULT_DATABASE : dbName;
 
-          // const databaseFilePath = this.getDatabaseDirectory(databaseName);
+          // const databaseFilePath = this.getDatabaseFilePath(databaseName);
           const migrations = dbType === DatabaseType.DEFAULT ? DefaultMigration : ServerMigration;
           const modelClasses = dbType === DatabaseType.DEFAULT ? this.defaultModels : this.serverModels;
           const schema = dbType === DatabaseType.DEFAULT ? defaultSchema : serverSchema;
 
-          const adapter = new LokiJSAdapter({
-              dbName: databaseName,
-              migrations,
-              schema,
-              useWebWorker: false,
-              useIncrementalIndexedDB: true,
-          });
+          const adapter = new LokiJSAdapter({dbName: databaseName, migrations, schema, useWebWorker: false, useIncrementalIndexedDB: true});
 
           // Registers the new server connection into the DEFAULT database
           if (serverUrl && shouldAddToDefaultDatabase) {
@@ -147,7 +187,7 @@ class DatabaseManager {
           }
           return new Database({adapter, actionsEnabled, modelClasses});
       } catch (e) {
-          // eslint-disable-next-line no-console
+      // eslint-disable-next-line no-console
           console.log('createDatabaseConnection ERROR:', e);
       }
 
@@ -157,22 +197,40 @@ class DatabaseManager {
   /**
    * setActiveServerDatabase: Set the new active server database.  The serverUrl is used to ensure that we do not duplicate entries in the default database.
    * This method should be called when switching to another server.
-   * @param {string} displayName
    * @param {string} serverUrl
    * @returns {Promise<void>}
    */
-  setActiveServerDatabase = async ({displayName, serverUrl}: ActiveServerDatabaseArgs) => {
-      const isServerPresent = await this.isServerPresent(serverUrl);
+  setActiveServerDatabase = async (serverUrl: string) => {
+      const defaultDatabase = await this.getDefaultDatabase();
 
-      this.activeDatabase = await this.createDatabaseConnection({
-          configs: {
-              actionsEnabled: true,
-              dbName: displayName,
-              dbType: DatabaseType.SERVER,
-              serverUrl,
-          },
-          shouldAddToDefaultDatabase: Boolean(!isServerPresent),
-      });
+      if (defaultDatabase) {
+          // retrieve recentlyViewedServers from Global entity
+          const recentlyViewedServers = (await defaultDatabase.collections.get(GLOBAL).query(Q.where('name', RECENTLY_VIEWED_SERVERS)).fetch()) as IGlobal[];
+
+          if (recentlyViewedServers.length) {
+              // We have previously written something for this flag
+              const flagRecord = recentlyViewedServers[0];
+              const recentList = Array.from(flagRecord.value);
+              recentList.unshift(serverUrl);
+
+              // so as to avoid duplicate in this array
+              const sanitizedList = Array.from(new Set(recentList));
+
+              await defaultDatabase.action(async () => {
+                  await flagRecord.update((record) => {
+                      record.value = sanitizedList;
+                  });
+              });
+          } else {
+              // The flag hasn't been set; so we create the record
+              await defaultDatabase.action(async () => {
+                  await defaultDatabase.collections.get(GLOBAL).create((record: IGlobal) => {
+                      record.name = RECENTLY_VIEWED_SERVERS;
+                      record.value = [serverUrl];
+                  });
+              });
+          }
+      }
   };
 
   /**
@@ -181,21 +239,43 @@ class DatabaseManager {
    * @returns {Promise<boolean>}
    */
   isServerPresent = async (serverUrl: string) => {
-      const allServers = await this.getAllServers();
-      const existingServer = allServers?.filter((server) => {
-          return server.url === serverUrl;
-      });
-      return existingServer && existingServer.length > 0;
+      const allServers = await this.getAllServers([serverUrl]);
+      return allServers?.length > 0;
   };
 
   /**
-   * getActiveServerDatabase: The DatabaseManager should be the only one setting the active database.  Hence, we have made the activeDatabase property private.
-   * Use this getter method to retrieve the active database if it has been set in your code.
-   * @returns {DatabaseInstance}
+   * getActiveServerUrl: Use this getter method to retrieve the active server URL.
+   * @returns {string}
    */
-  getActiveServerDatabase = (): DatabaseInstance => {
-      return this.activeDatabase;
-  };
+   getActiveServerUrl = async (): Promise<string|undefined> => {
+       const defaultDatabase = await this.getDefaultDatabase();
+
+       if (defaultDatabase) {
+           const serverRecords = await defaultDatabase.collections.get(GLOBAL).query(Q.where('name', RECENTLY_VIEWED_SERVERS)).fetch() as IGlobal[];
+
+           if (serverRecords.length) {
+               const recentServers = serverRecords[0].value as string[];
+               return recentServers[0];
+           }
+           return undefined;
+       }
+       return undefined;
+   };
+
+   /**
+   * getActiveServerDatabase: The DatabaseManager should be the only one setting the active database. Hence, we have made the activeDatabase property private.
+   * Use this getter method to retrieve the active database if it has been set in your code.
+   * @returns {Promise<DatabaseInstance | undefined>}
+   */
+   getActiveServerDatabase = async (): Promise<DatabaseInstance> => {
+       const serverUrl = await this.getActiveServerUrl();
+
+       if (serverUrl) {
+           const serverDatabase = await this.getDatabaseConnection({serverUrl, setAsActiveDatabase: false});
+           return serverDatabase;
+       }
+       return undefined;
+   };
 
   /**
    * getDefaultDatabase : Returns the default database.
@@ -213,41 +293,31 @@ class DatabaseManager {
    * and return them to the caller.
    *
    * @param {string[]} serverUrls
-   * @returns {Promise<DatabaseInstances[] | null>}
+   * @returns {Promise<RetrievedDatabase[] | null>}
    */
-  retrieveDatabaseInstances = async (serverUrls?: string[]): Promise<DatabaseInstances[] | null> => {
-      if (serverUrls?.length) {
-          // Retrieve all server records from the default db
-          const allServers = await this.getAllServers();
+  retrieveDatabaseInstances = async (serverUrls: string[]): Promise<DatabaseInstances[] | null> => {
+      // Retrieve all server records from the default db
+      const allServers = await this.getAllServers(serverUrls);
 
-          // Filter only those servers that are present in the serverUrls array
-          const servers = allServers!.filter((server: IServers) => {
-              return serverUrls.includes(server.url);
-          });
+      // Creates server database instances
+      if (allServers.length) {
+          const databasePromises = allServers.map(async (server: IServers) => {
+              const {displayName, url} = server;
 
-          // Creates server database instances
-          if (servers.length) {
-              const databasePromises = servers.map(async (server: IServers) => {
-                  const {displayName, url} = server;
-
-                  // Since we are retrieving existing URL ( and so database connections ) from the 'DEFAULT' database, shouldAddToDefaultDatabase is set to false
-                  const dbInstance = await this.createDatabaseConnection({
-                      configs: {
-                          actionsEnabled: true,
-                          dbName: displayName,
-                          dbType: DatabaseType.SERVER,
-                          serverUrl: url,
-                      },
-                      shouldAddToDefaultDatabase: false,
-                  });
-
-                  return {url, dbInstance};
+              // Since we are retrieving existing URL ( and so database connections ) from the 'DEFAULT' database, shouldAddToDefaultDatabase is set to false
+              const dbInstance = await this.createDatabaseConnection({
+                  configs: {
+                      actionsEnabled: true,
+                      dbName: displayName,
+                      dbType: DatabaseType.SERVER,
+                      serverUrl: url,
+                  },
+                  shouldAddToDefaultDatabase: false,
               });
-
-              const databaseInstances = await Promise.all(databasePromises);
-              return databaseInstances;
-          }
-          return null;
+              return {url, dbInstance, displayName};
+          });
+          const databaseInstances = await Promise.all(databasePromises);
+          return databaseInstances;
       }
       return null;
   };
@@ -260,26 +330,40 @@ class DatabaseManager {
    */
   deleteDatabase = async (serverUrl: string): Promise<boolean> => {
       try {
-          const defaultDB = await this.getDefaultDatabase();
+          const defaultDatabase = await this.getDefaultDatabase();
           let server: IServers;
-
-          if (defaultDB) {
-              const serversRecords = (await defaultDB.collections.get(SERVERS).query(Q.where('url', serverUrl)).fetch()) as IServers[];
+          let result = true;
+          if (defaultDatabase) {
+              const serversRecords = (await defaultDatabase.collections.get(SERVERS).query(Q.where('url', serverUrl)).fetch()) as IServers[];
               server = serversRecords?.[0] ?? undefined;
 
+              const globalRecords = await defaultDatabase.collections.get(GLOBAL).query(Q.where('name', RECENTLY_VIEWED_SERVERS)).fetch() as IGlobal[];
+              const global = globalRecords?.[0] ?? undefined;
+
               if (server) {
                   // Perform a delete operation for this server record on the 'servers' table in default database
-                  await defaultDB.action(async () => {
+                  await defaultDatabase.action(async () => {
                       await server.destroyPermanently();
                   });
 
-                  return true;
+                  result = result && true;
               }
-              return false;
+
+              if (global) {
+                  // filter out the deleted serverURL
+                  const urls = global.value as string[];
+                  const filtered = urls.filter((url) => url !== serverUrl);
+                  await defaultDatabase.action(async () => {
+                      await global.update((record) => {
+                          record.value = filtered;
+                      });
+                  });
+                  result = result && true;
+              }
+              return result;
           }
           return false;
       } catch (e) {
-      // console.log('An error occurred while trying to delete database with name ', databaseName);
           return false;
       }
   };
@@ -288,11 +372,17 @@ class DatabaseManager {
    * getAllServers : Retrieves all the servers registered in the default database
    * @returns {Promise<undefined | Servers[]>}
    */
-  private getAllServers = async () => {
+  private getAllServers = async (serverUrls: string[]) => {
       // Retrieve all server records from the default db
       const defaultDatabase = await this.getDefaultDatabase();
-      const allServers = defaultDatabase && ((await defaultDatabase.collections.get(MM_TABLES.DEFAULT.SERVERS).query().fetch()) as IServers[]);
-      return allServers;
+      if (defaultDatabase) {
+          const allServers = (await defaultDatabase.collections.
+              get(SERVERS).
+              query(Q.where('url', Q.oneOf(serverUrls))).
+              fetch()) as IServers[];
+          return allServers;
+      }
+      return [];
   };
 
   /**
@@ -301,7 +391,7 @@ class DatabaseManager {
    */
   private setDefaultDatabase = async (): Promise<DatabaseInstance> => {
       this.defaultDatabase = await this.createDatabaseConnection({
-          configs: {dbName: 'default'},
+          configs: {dbName: DEFAULT_DATABASE},
           shouldAddToDefaultDatabase: false,
       });
 
@@ -322,7 +412,7 @@ class DatabaseManager {
 
           if (defaultDatabase && !isServerPresent) {
               await defaultDatabase.action(async () => {
-                  const serversCollection = defaultDatabase.collections.get('servers');
+                  const serversCollection = defaultDatabase.collections.get(SERVERS);
                   await serversCollection.create((server: IServers) => {
                       server.dbPath = databaseFilePath;
                       server.displayName = displayName;
@@ -333,9 +423,10 @@ class DatabaseManager {
               });
           }
       } catch (e) {
-      // console.log({catchError: e});
+      // eslint-disable-next-line no-console
+          console.log('addServerToDefaultDatabase ERROR:', e);
       }
   };
 }
 
-export default new DatabaseManager();
+export default DatabaseManager;
diff --git a/app/database/manager/index.ts b/app/database/manager/index.ts
index 41b95e531..4295a81ad 100644
--- a/app/database/manager/index.ts
+++ b/app/database/manager/index.ts
@@ -43,23 +43,27 @@ import {
     User,
 } from '@database/models/server';
 import {serverSchema} from '@database/schema/server';
-import type {
-    ActiveServerDatabaseArgs,
+import {
     DatabaseConnectionArgs,
     DatabaseInstance,
     DatabaseInstances,
     DefaultNewServerArgs,
+    GetDatabaseConnectionArgs,
     MigrationEvents,
     Models,
+    RetrievedDatabase,
 } from '@typings/database/database';
 import {DatabaseType} from '@typings/database/enums';
 import IServers from '@typings/database/servers';
+import IGlobal from '@typings/database/global';
 import {deleteIOSDatabase, getIOSAppGroupDetails} from '@utils/mattermost_managed';
+import urlParse from 'url-parse';
 
-const {SERVERS} = MM_TABLES.DEFAULT;
+const {SERVERS, GLOBAL} = MM_TABLES.DEFAULT;
+const DEFAULT_DATABASE = 'default';
+const RECENTLY_VIEWED_SERVERS = 'RECENTLY_VIEWED_SERVERS';
 
 class DatabaseManager {
-  private activeDatabase: DatabaseInstance;
   private defaultDatabase: DatabaseInstance;
   private readonly defaultModels: Models;
   private readonly iOSAppGroupDatabase: string | null;
@@ -103,6 +107,50 @@ class DatabaseManager {
       this.androidFilesDirectory = Platform.OS === 'android' ? FileSystem.documentDirectory : null;
   }
 
+  /**
+     * getDatabaseConnection: Given a server url (serverUrl) and a flag (setAsActiveDatabase), this method will attempt
+     * to retrieve an existing database connection previously created for that url.
+     * If not found, it will create a new connection and register it in the DEFAULT_DATABASE. In this case, it will also
+     * use the provided connectionName as display_name for this server
+     * @param {GetDatabaseConnectionArgs} getDatabaseConnection
+     * @param {string} getDatabaseConnection.connectionName
+     * @param {string} getDatabaseConnection.serverUrl
+     * @param {boolean} getDatabaseConnection.setAsActiveDatabase
+     * @returns {Promise<DatabaseInstance>}
+     */
+  getDatabaseConnection = async ({serverUrl, setAsActiveDatabase, connectionName}: GetDatabaseConnectionArgs) => {
+      // We potentially already have this server registered; so we'll try to retrieve it if it is present under DEFAULT_DATABASE/GLOBAL entity
+      const existingServers = await this.retrieveDatabaseInstances([serverUrl]) as RetrievedDatabase[];
+
+      // Since we only passed one serverUrl, we'll expect only one value in the array
+      const serverDatabase = existingServers?.[0];
+
+      let connection: DatabaseInstance;
+
+      if (serverDatabase) {
+          // This serverUrl has previously been registered on the app
+          connection = serverDatabase.dbInstance;
+      } else {
+          // Or, it might be that the user has this server on the web-app but not mobile-app; so we'll need to create a new entry for this new serverUrl
+          const databaseName = connectionName ?? urlParse(serverUrl).hostname;
+          connection = await this.createDatabaseConnection({
+              shouldAddToDefaultDatabase: true,
+              configs: {
+                  actionsEnabled: true,
+                  dbName: databaseName,
+                  dbType: DatabaseType.SERVER,
+                  serverUrl,
+              },
+          });
+      }
+
+      if (setAsActiveDatabase) {
+          await this.setActiveServerDatabase(serverUrl);
+      }
+
+      return connection;
+  };
+
   /**
    * createDatabaseConnection: Creates database connection and registers the new connection into the default database.  However,
    * if a database connection could not be created, it will return undefined.
@@ -112,16 +160,12 @@ class DatabaseManager {
    * @returns {Promise<DatabaseInstance>}
    */
   createDatabaseConnection = async ({configs, shouldAddToDefaultDatabase = true}: DatabaseConnectionArgs): Promise<DatabaseInstance> => {
-      const {
-          actionsEnabled = true,
-          dbName = 'default',
-          dbType = DatabaseType.DEFAULT,
-          serverUrl = undefined,
-      } = configs;
+      const {actionsEnabled = true, dbName = DEFAULT_DATABASE, dbType = DatabaseType.DEFAULT, serverUrl = undefined} = configs;
 
       try {
-          const databaseName = dbType === DatabaseType.DEFAULT ? 'default' : dbName;
-          const databaseFilePath = this.getDatabaseDirectory(databaseName);
+          const databaseName = dbType === DatabaseType.DEFAULT ? DEFAULT_DATABASE : dbName;
+
+          const databaseFilePath = this.getDatabaseFilePath(databaseName);
           const migrations = dbType === DatabaseType.DEFAULT ? DefaultMigration : ServerMigration;
           const modelClasses = dbType === DatabaseType.DEFAULT ? this.defaultModels : this.serverModels;
           const schema = dbType === DatabaseType.DEFAULT ? defaultSchema : serverSchema;
@@ -153,46 +197,73 @@ class DatabaseManager {
   /**
    * setActiveServerDatabase: Set the new active server database.  The serverUrl is used to ensure that we do not duplicate entries in the default database.
    * This method should be called when switching to another server.
-   * @param {string} displayName
    * @param {string} serverUrl
    * @returns {Promise<void>}
    */
-  setActiveServerDatabase = async ({displayName, serverUrl}: ActiveServerDatabaseArgs) => {
-      const isServerPresent = await this.isServerPresent(serverUrl);
+  setActiveServerDatabase = async (serverUrl: string) => {
+      const defaultDatabase = await this.getDefaultDatabase();
+      if (defaultDatabase) {
+          // retrieve recentlyViewedServers from Global entity
+          const recentlyViewedServers = await defaultDatabase.collections.get(GLOBAL).query(Q.where('name', RECENTLY_VIEWED_SERVERS)).fetch() as IGlobal[];
 
-      this.activeDatabase = await this.createDatabaseConnection({
-          configs: {
-              actionsEnabled: true,
-              dbName: displayName,
-              dbType: DatabaseType.SERVER,
-              serverUrl,
-          },
-          shouldAddToDefaultDatabase: Boolean(!isServerPresent),
-      });
+          if (recentlyViewedServers.length) {
+              // We have previously written something for this flag
+              const flagRecord = recentlyViewedServers[0];
+              const recentList = Array.from(flagRecord.value);
+              recentList.unshift(serverUrl);
+
+              // so as to avoid duplicate in this array
+              const sanitizedList = Array.from(new Set(recentList));
+
+              await defaultDatabase.action(async () => {
+                  await flagRecord.update((record) => {
+                      record.value = sanitizedList;
+                  });
+              });
+          } else {
+              // The flag hasn't been set; so we create the record
+              await defaultDatabase.action(async () => {
+                  await defaultDatabase.collections.get(GLOBAL).create((record: IGlobal) => {
+                      record.name = RECENTLY_VIEWED_SERVERS;
+                      record.value = [serverUrl];
+                  });
+              });
+          }
+      }
   };
 
   /**
-   * isServerPresent : Confirms if the current serverUrl does not already exist in the database
-   * @param {String} serverUrl
-   * @returns {Promise<boolean>}
+   * getActiveServerUrl: Use this getter method to retrieve the active server URL.
+   * @returns {string | undefined}
    */
-  private isServerPresent = async (serverUrl: string) => {
-      const allServers = await this.getAllServers();
+   getActiveServerUrl = async (): Promise<string | undefined> => {
+       const defaultDatabase = await this.getDefaultDatabase();
 
-      const existingServer = allServers?.filter((server) => {
-          return server.url === serverUrl;
-      });
+       if (defaultDatabase) {
+           const serverRecords = await defaultDatabase.collections.get(GLOBAL).query(Q.where('name', RECENTLY_VIEWED_SERVERS)).fetch() as IGlobal[];
 
-      return existingServer && existingServer?.length > 0;
-  };
+           if (serverRecords.length) {
+               const recentServers = serverRecords[0].value as string[];
+               return recentServers[0];
+           }
+           return undefined;
+       }
+       return undefined;
+   };
 
   /**
    * getActiveServerDatabase: The DatabaseManager should be the only one setting the active database.  Hence, we have made the activeDatabase property private.
    * Use this getter method to retrieve the active database if it has been set in your code.
-   * @returns {DatabaseInstance}
+   * @returns {Promise<MostRecentConnection | undefined>}
    */
-  getActiveServerDatabase = (): DatabaseInstance => {
-      return this.activeDatabase;
+  getActiveServerDatabase = async (): Promise<DatabaseInstance> => {
+      const serverUrl = await this.getActiveServerUrl();
+
+      if (serverUrl) {
+          const serverDatabase = await this.getDatabaseConnection({serverUrl, setAsActiveDatabase: false});
+          return serverDatabase;
+      }
+      return undefined;
   };
 
   /**
@@ -211,41 +282,32 @@ class DatabaseManager {
    * and return them to the caller.
    *
    * @param {string[]} serverUrls
-   * @returns {Promise<{url: string, dbInstance: DatabaseInstance}[] | null>}
+   * @returns {Promise<RetrievedDatabase[] | null>}
    */
-  retrieveDatabaseInstances = async (serverUrls?: string[]): Promise<DatabaseInstances[] | null> => {
-      if (serverUrls?.length) {
-          // Retrieve all server records from the default db
-          const allServers = await this.getAllServers();
+  retrieveDatabaseInstances = async (serverUrls: string[]): Promise<DatabaseInstances[] | null> => {
+      // Retrieve all server records from the default db
+      const allServers = await this.getAllServers(serverUrls);
 
-          // Filter only those servers that are present in the serverUrls array
-          const servers = allServers!.filter((server: IServers) => {
-              return serverUrls.includes(server.url);
-          });
+      // Creates server database instances
+      if (allServers.length) {
+          const databasePromises = await allServers.map(async (server: IServers) => {
+              const {displayName, url} = server;
 
-          // Creates server database instances
-          if (servers.length) {
-              const databasePromises = await servers.map(async (server: IServers) => {
-                  const {displayName, url} = server;
-
-                  // Since we are retrieving existing URL ( and so database connections ) from the 'DEFAULT' database, shouldAddToDefaultDatabase is set to false
-                  const dbInstance = await this.createDatabaseConnection({
-                      configs: {
-                          actionsEnabled: true,
-                          dbName: displayName,
-                          dbType: DatabaseType.SERVER,
-                          serverUrl: url,
-                      },
-                      shouldAddToDefaultDatabase: false,
-                  });
-
-                  return {url, dbInstance};
+              // Since we are retrieving existing URL ( and so database connections ) from the 'DEFAULT' database, shouldAddToDefaultDatabase is set to false
+              const dbInstance = await this.createDatabaseConnection({
+                  configs: {
+                      actionsEnabled: true,
+                      dbName: displayName,
+                      dbType: DatabaseType.SERVER,
+                      serverUrl: url,
+                  },
+                  shouldAddToDefaultDatabase: false,
               });
 
-              const databaseInstances = await Promise.all(databasePromises);
-              return databaseInstances;
-          }
-          return null;
+              return {dbInstance, displayName, url};
+          });
+          const databaseInstances = await Promise.all(databasePromises);
+          return databaseInstances;
       }
       return null;
   };
@@ -258,24 +320,26 @@ class DatabaseManager {
    */
   deleteDatabase = async (serverUrl: string): Promise<boolean> => {
       try {
-          const defaultDB = await this.getDefaultDatabase();
+          const defaultDatabase = await this.getDefaultDatabase();
           let server: IServers;
+          let result = true;
 
-          if (defaultDB) {
-              const serversRecords = (await defaultDB.collections.
-                  get(SERVERS).
-                  query(Q.where('url', serverUrl)).
-                  fetch()) as IServers[];
+          if (defaultDatabase) {
+              // NOTE: We are deleting this 'database' entry in the SERVERS entity on the DEFAULT database; for that we retrieve its record first.
+              const serversRecords = (await defaultDatabase.collections.get(SERVERS).query(Q.where('url', serverUrl)).fetch()) as IServers[];
               server = serversRecords?.[0] ?? undefined;
 
+              const globalRecords = await defaultDatabase.collections.get(GLOBAL).query(Q.where('name', RECENTLY_VIEWED_SERVERS)).fetch() as IGlobal[];
+              const global = globalRecords?.[0] ?? undefined;
+
               if (server) {
+                  const databaseName = server.displayName;
+
                   // Perform a delete operation for this server record on the 'servers' table in default database
-                  await defaultDB.action(async () => {
+                  await defaultDatabase.action(async () => {
                       await server.destroyPermanently();
                   });
 
-                  const databaseName = server.displayName;
-
                   if (Platform.OS === 'ios') {
                       // On iOS, we'll delete the *.db file under the shared app-group/databases folder
                       deleteIOSDatabase({databaseName});
@@ -290,13 +354,24 @@ class DatabaseManager {
                   await FileSystem.deleteAsync(databaseFile);
                   await FileSystem.deleteAsync(databaseJournal);
 
-                  return true;
+                  result = result && true;
               }
-              return false;
+
+              if (global) {
+                  // filter out the deleted serverURL
+                  const urls = global.value as string[];
+                  const filtered = urls.filter((url) => url !== serverUrl);
+                  await defaultDatabase.action(async () => {
+                      await global.update((record) => {
+                          record.value = filtered;
+                      });
+                  });
+                  result = result && true;
+              }
+              return result;
           }
           return false;
       } catch (e) {
-      // console.log('An error occurred while trying to delete database with name ', databaseName);
           return false;
       }
   };
@@ -308,7 +383,7 @@ class DatabaseManager {
    */
   factoryReset = async (shouldRemoveDirectory: boolean): Promise<boolean> => {
       try {
-      //On iOS, we'll delete the databases folder under the shared AppGroup folder
+          //On iOS, we'll delete the databases folder under the shared AppGroup folder
           if (Platform.OS === 'ios') {
               deleteIOSDatabase({shouldRemoveDirectory});
               return true;
@@ -319,20 +394,34 @@ class DatabaseManager {
           await FileSystem.deleteAsync(androidFilesDir);
           return true;
       } catch (e) {
-      // console.log('An error occurred while trying to delete the databases directory);
           return false;
       }
   };
 
+    /**
+     * isServerPresent : Confirms if the current serverUrl does not already exist in the database
+     * @param {String} serverUrl
+     * @returns {Promise<boolean>}
+     */
+    private isServerPresent = async (serverUrl: string) => {
+        const allServers = await this.getAllServers([serverUrl]);
+        return allServers?.length > 0;
+    };
+
   /**
    * getAllServers : Retrieves all the servers registered in the default database
-   * @returns {Promise<undefined | Servers[]>}
+   * @returns {Promise<Servers[]>}
    */
-  private getAllServers = async () => {
+  private getAllServers = async (serverUrls: string[]) => {
       // Retrieve all server records from the default db
       const defaultDatabase = await this.getDefaultDatabase();
-      const allServers = defaultDatabase && ((await defaultDatabase.collections.get(MM_TABLES.DEFAULT.SERVERS).query().fetch()) as IServers[]);
-      return allServers;
+
+      if (defaultDatabase) {
+          const allServers = (await defaultDatabase.collections.get(SERVERS).query(Q.where('url', Q.oneOf(serverUrls))).fetch() as IServers[]);
+          return allServers;
+      }
+
+      return [];
   };
 
   /**
@@ -341,7 +430,7 @@ class DatabaseManager {
    */
   private setDefaultDatabase = async (): Promise<DatabaseInstance> => {
       this.defaultDatabase = await this.createDatabaseConnection({
-          configs: {dbName: 'default'},
+          configs: {dbName: DEFAULT_DATABASE},
           shouldAddToDefaultDatabase: false,
       });
 
@@ -362,7 +451,7 @@ class DatabaseManager {
 
           if (defaultDatabase && !isServerPresent) {
               await defaultDatabase.action(async () => {
-                  const serversCollection = defaultDatabase.collections.get('servers');
+                  const serversCollection = defaultDatabase.collections.get(SERVERS);
                   await serversCollection.create((server: IServers) => {
                       server.dbPath = databaseFilePath;
                       server.displayName = displayName;
@@ -408,7 +497,7 @@ class DatabaseManager {
   };
 
   /**
-   * getDatabaseDirectory: Using the database name, this method will return the database directory for each platform.
+   * getDatabaseFilePath: Using the database name, this method will return the database file path for each platform.
    * On iOS, it will point towards the AppGroup shared directory while on Android, it will point towards the Files Directory.
    * Please note that in each case, the *.db files will be created/grouped under a 'databases' sub-folder.
    * iOS Simulator : appGroup => /Users/{username}/Library/Developer/CoreSimulator/Devices/DA6F1C73/data/Containers/Shared/AppGroup/ACA65327/databases"}
@@ -417,7 +506,7 @@ class DatabaseManager {
    * @param {string} dbName
    * @returns {string}
    */
-  private getDatabaseDirectory = (dbName: string): string => {
+  private getDatabaseFilePath = (dbName: string): string => {
       return Platform.OS === 'ios' ? `${this.iOSAppGroupDatabase}/${dbName}.db` : `${FileSystem.documentDirectory}${dbName}.db`;
   };
 }
@@ -428,4 +517,4 @@ if (!__DEV__) {
     logger.silence();
 }
 
-export default new DatabaseManager();
+export default DatabaseManager;
diff --git a/app/database/manager/test.ts b/app/database/manager/test.ts
index b419f4652..c3cb696f7 100644
--- a/app/database/manager/test.ts
+++ b/app/database/manager/test.ts
@@ -1,18 +1,19 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {Database} from '@nozbe/watermelondb';
+import {Database, Q} from '@nozbe/watermelondb';
 
 import {MM_TABLES} from '@constants/database';
-import {DatabaseInstance} from '@typings/database/database';
 import {DatabaseType} from '@typings/database/enums';
+import IGlobal from '@typings/database/global';
 import IServers from '@typings/database/servers';
 
 import DatabaseManager from '@database/manager';
 
 jest.mock('@database/manager');
 
-const {SERVERS} = MM_TABLES.DEFAULT;
+const {GLOBAL, SERVERS} = MM_TABLES.DEFAULT;
+const RECENTLY_VIEWED_SERVERS = 'RECENTLY_VIEWED_SERVERS';
 
 // NOTE :  On the mock Database Manager, we cannot test for :
 // 1. Android/iOS file path
@@ -21,12 +22,43 @@ const {SERVERS} = MM_TABLES.DEFAULT;
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** Database Manager tests ***', () => {
+    let databaseManagerClient: DatabaseManager | null;
+
+    beforeEach(() => {
+        databaseManagerClient = new DatabaseManager();
+    });
+
+    afterEach(() => {
+        databaseManagerClient = null;
+    });
+
+    const createTwoConnections = async () => {
+        await databaseManagerClient!.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'connection1',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'https://appv1.mattermost.com',
+            },
+        });
+        await databaseManagerClient!.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'connection2',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'https://appv2.mattermost.com',
+            },
+        });
+    };
+
     it('=> should return a default database', async () => {
         expect.assertions(2);
 
-        const spyOnAddServerToDefaultDatabase = jest.spyOn(DatabaseManager as any, 'addServerToDefaultDatabase');
+        const spyOnAddServerToDefaultDatabase = jest.spyOn(databaseManagerClient as any, 'addServerToDefaultDatabase');
 
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
+        const defaultDB = await databaseManagerClient!.getDefaultDatabase();
 
         expect(defaultDB).toBeInstanceOf(Database);
         expect(spyOnAddServerToDefaultDatabase).not.toHaveBeenCalledTimes(1);
@@ -35,9 +67,9 @@ describe('*** Database Manager tests ***', () => {
     it('=> should create a new server connection', async () => {
         expect.assertions(2);
 
-        const spyOnAddServerToDefaultDatabase = jest.spyOn(DatabaseManager as any, 'addServerToDefaultDatabase');
+        const spyOnAddServerToDefaultDatabase = jest.spyOn(databaseManagerClient as any, 'addServerToDefaultDatabase');
 
-        const connection1 = await DatabaseManager.createDatabaseConnection({
+        const connection1 = await databaseManagerClient!.createDatabaseConnection({
             shouldAddToDefaultDatabase: true,
             configs: {
                 actionsEnabled: true,
@@ -52,53 +84,59 @@ describe('*** Database Manager tests ***', () => {
     });
 
     it('=> should switch between active server connections', async () => {
-        expect.assertions(5);
-        let activeServer: DatabaseInstance;
+        expect.assertions(6);
         let adapter;
 
-        activeServer = await DatabaseManager.getActiveServerDatabase();
+        const activeServerA = await databaseManagerClient!.getActiveServerDatabase();
 
         // as we haven't set an active server yet, we should be getting undefined in the activeServer variable
-        expect(activeServer).toBeUndefined();
+        expect(activeServerA).toBeUndefined();
 
-        const setActiveServer = async ({displayName, serverUrl}:{displayName: string, serverUrl: string}) => {
+        const setActiveServer = async (serverUrl: string) => {
             // now we set the active database
-            await DatabaseManager.setActiveServerDatabase({displayName, serverUrl});
+            await databaseManagerClient!.setActiveServerDatabase(serverUrl);
         };
 
-        await setActiveServer({displayName: 'community mattermost', serverUrl: 'https://appv1.mattermost.com'});
+        await setActiveServer('https://appv1.mattermost.com');
 
         // let's verify if we now have a value for activeServer
-        activeServer = await DatabaseManager.getActiveServerDatabase();
-        expect(activeServer).toBeDefined();
+        const activeServerB = await databaseManagerClient!.getActiveServerDatabase();
+        expect(activeServerB).toBeDefined();
 
-        adapter = activeServer!.adapter as any;
+        adapter = activeServerB!.adapter as any;
         const currentDBName = adapter.underlyingAdapter._dbName;
-        expect(currentDBName).toStrictEqual('community mattermost');
+        expect(currentDBName).toStrictEqual('appv1.mattermost.com');
 
         // spice things up; we'll set a new server and verify if the value of activeServer changes
-        await setActiveServer({displayName: 'appv2', serverUrl: 'https://appv2.mattermost.com'});
-        activeServer = await DatabaseManager.getActiveServerDatabase();
-        expect(activeServer).toBeDefined();
+        await setActiveServer('https://appv2.mattermost.com');
+        const activeServerC = await databaseManagerClient!.getActiveServerDatabase();
+        expect(activeServerC).toBeDefined();
 
-        adapter = activeServer!.adapter as any;
+        adapter = activeServerC!.adapter as any;
         const newDBName = adapter.underlyingAdapter._dbName;
-        expect(newDBName).toStrictEqual('appv2');
+        expect(newDBName).toStrictEqual('appv2.mattermost.com');
+
+        const defaultDatabase = await databaseManagerClient!.getDefaultDatabase();
+        const records = await defaultDatabase!.collections.get(MM_TABLES.DEFAULT.GLOBAL).query(Q.where('name', 'RECENTLY_VIEWED_SERVERS')).fetch() as IGlobal[];
+        const recentlyViewedServers = records?.[0]?.value;
+        expect(recentlyViewedServers?.length).toBe(2);
     });
 
     it('=> should retrieve all database instances matching serverUrls parameter', async () => {
         expect.assertions(3);
 
-        const spyOnCreateDatabaseConnection = jest.spyOn(DatabaseManager, 'createDatabaseConnection');
+        await createTwoConnections();
 
-        const dbInstances = await DatabaseManager.retrieveDatabaseInstances([
+        const spyOnCreateDatabaseConnection = jest.spyOn(databaseManagerClient!, 'createDatabaseConnection');
+
+        const dbInstances = await databaseManagerClient!.retrieveDatabaseInstances([
             'https://xunity2.mattermost.com',
             'https://appv2.mattermost.com',
             'https://appv1.mattermost.com',
         ]);
 
         expect(dbInstances).toBeTruthy();
-        const numDbInstances = dbInstances && dbInstances.length ? dbInstances.length : 0;
+        const numDbInstances = dbInstances?.length ?? 0;
 
         // The Database Manager will call the 'createDatabaseConnection' method in consequence of the number of database connection present in dbInstances array
         expect(spyOnCreateDatabaseConnection).toHaveBeenCalledTimes(numDbInstances);
@@ -107,12 +145,23 @@ describe('*** Database Manager tests ***', () => {
         expect(numDbInstances).toEqual(2);
     });
 
+    it('=> should retrieve existing database instances matching serverUrl parameter', async () => {
+        expect.assertions(2);
+        await createTwoConnections();
+        const spyOnRetrieveDatabaseInstances = jest.spyOn(databaseManagerClient!, 'retrieveDatabaseInstances');
+        const connection = await databaseManagerClient!.getDatabaseConnection({serverUrl: 'https://appv1.mattermost.com', setAsActiveDatabase: false});
+        expect(spyOnRetrieveDatabaseInstances).toHaveBeenCalledTimes(1);
+        expect(connection).toBeDefined();
+    });
+
+    //todo: test the current active database together with the getDatabaseConnection method
+
     it('=> should have records of Servers set in the servers table of the default database', async () => {
         expect.assertions(3);
 
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
+        const defaultDB = await databaseManagerClient!.getDefaultDatabase();
         expect(defaultDB).toBeDefined();
-
+        await createTwoConnections();
         const serversRecords = await defaultDB!.collections.get(SERVERS).query().fetch() as IServers[];
         expect(serversRecords).toBeDefined();
 
@@ -122,16 +171,29 @@ describe('*** Database Manager tests ***', () => {
 
     it('=> should delete appv1 server from the servers table of Default database', async () => {
         expect.assertions(3);
+        await createTwoConnections();
+
+        const defaultDatabase = await databaseManagerClient!.getDefaultDatabase();
+
+        await databaseManagerClient?.setActiveServerDatabase('https://appv1.mattermost.com');
+        await databaseManagerClient?.setActiveServerDatabase('https://appv2.mattermost.com');
+
+        const fetchGlobalRecords = async () => {
+            const initialGlobalRecords = await defaultDatabase!.collections.get(GLOBAL).query(Q.where('name', RECENTLY_VIEWED_SERVERS)).fetch() as IGlobal[];
+            return initialGlobalRecords?.[0].value as string[];
+        };
+
+        const recentServers = await fetchGlobalRecords();
+        expect(recentServers.length).toBe(2);
 
         // Removing database for appv1 connection
-        const isAppV1Removed = await DatabaseManager.deleteDatabase('https://appv1.mattermost.com');
+        const isAppV1Removed = await databaseManagerClient!.deleteDatabase('https://appv1.mattermost.com');
         expect(isAppV1Removed).toBe(true);
 
         // Verifying in the database to confirm if its record was deleted
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
-        const serversRecords = await defaultDB!.collections.get(SERVERS).query().fetch() as IServers[];
-        expect(serversRecords).toBeDefined();
-        expect(serversRecords.length).toEqual(1);
+
+        const updatedRecentServers = await fetchGlobalRecords();
+        expect(updatedRecentServers.length).toBe(1);
     });
 
     it('=> should enforce uniqueness of connections using serverUrl as key', async () => {
@@ -139,7 +201,7 @@ describe('*** Database Manager tests ***', () => {
 
         // We can't have more than one connection with the same server url
         const serverUrl = 'https://appv3.mattermost.com';
-        await DatabaseManager.createDatabaseConnection({
+        await databaseManagerClient!.createDatabaseConnection({
             shouldAddToDefaultDatabase: true,
             configs: {
                 actionsEnabled: true,
@@ -149,7 +211,7 @@ describe('*** Database Manager tests ***', () => {
             },
         });
 
-        await DatabaseManager.createDatabaseConnection({
+        await databaseManagerClient!.createDatabaseConnection({
             shouldAddToDefaultDatabase: true,
             configs: {
                 actionsEnabled: true,
@@ -159,7 +221,7 @@ describe('*** Database Manager tests ***', () => {
             },
         });
 
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
+        const defaultDB = await databaseManagerClient!.getDefaultDatabase();
 
         const allServers = defaultDB && await defaultDB.collections.get(SERVERS).query().fetch() as IServers[];
 
diff --git a/app/database/manager/test_manual.ts b/app/database/manager/test_manual.ts
index defce95e5..7d2a1a335 100644
--- a/app/database/manager/test_manual.ts
+++ b/app/database/manager/test_manual.ts
@@ -6,9 +6,11 @@ import {Platform} from 'react-native';
 import {DatabaseType} from '@typings/database/enums';
 import {getIOSAppGroupDetails} from '@utils/mattermost_managed';
 
-import DBManager from './index';
+import DatabaseManager from './index';
 
 export default async () => {
+    const databaseClient = new DatabaseManager();
+
     // Test: It should return the iOS App-Group shared directory
     const testAppGroupDirectory = () => {
         if (Platform.OS === 'ios') {
@@ -18,12 +20,12 @@ export default async () => {
 
     // Test: It should return an instance of the default database
     const testGetDefaultDatabase = () => {
-        DBManager.getDefaultDatabase();
+        databaseClient.getDefaultDatabase();
     };
 
     // Test: It should creates a new server connection
     const testNewServerConnection = async () => {
-        await DBManager.createDatabaseConnection({
+        await databaseClient.createDatabaseConnection({
             shouldAddToDefaultDatabase: true,
             configs: {
                 actionsEnabled: true,
@@ -36,20 +38,17 @@ export default async () => {
 
     // Test: It should return the current active server database
     const testGetActiveServerConnection = () => {
-        // const activeServer = DBManager.getActiveServerDatabase();
+        // const activeServer = DatabaseManager.getActiveServerDatabase();
     };
 
     // Test: It should set the current active server database to the provided server url.
     const testSetActiveServerConnection = async () => {
-        await DBManager.setActiveServerDatabase({
-            displayName: 'comm4',
-            serverUrl: 'https://comm4.mattermost.com',
-        });
+        await databaseClient.setActiveServerDatabase('https://comm4.mattermost.com');
     };
 
     // Test: It should return database instance(s) if there are valid server urls in the provided list.
     const testRetrieveAllDatabaseConnections = async () => {
-        await DBManager.retrieveDatabaseInstances([
+        await databaseClient.retrieveDatabaseInstances([
             'https://xunity2.mattermost.com',
             'https://comm5.mattermost.com',
             'https://comm4.mattermost.com',
@@ -58,12 +57,12 @@ export default async () => {
 
     // Test: It should delete the associated *.db file for this  server url
     const testDeleteSQLFile = async () => {
-        await DBManager.deleteDatabase('https://comm4.mattermost.com');
+        await databaseClient.deleteDatabase('https://comm4.mattermost.com');
     };
 
     // Test: It should wipe out the databases folder under the documents direction on Android and in the shared directory for the AppGroup on iOS
     const testFactoryReset = async () => {
-        await DBManager.factoryReset(true);
+        await databaseClient.factoryReset(true);
     };
 
     // NOTE : Comment and test the below functions one at a time.  It starts with creating a default database and ends with a factory reset.
diff --git a/app/database/models/default/global.ts b/app/database/models/default/global.ts
index 933f02f96..43e0b0056 100644
--- a/app/database/models/default/global.ts
+++ b/app/database/models/default/global.ts
@@ -22,5 +22,5 @@ export default class Global extends Model {
     @field('name') name!: string;
 
     /** value : The value part of the key-value combination */
-    @json('value', (rawJson) => rawJson) value!: string;
+    @json('value', (rawJson) => rawJson) value!: any;
 }
diff --git a/app/database/operator/comparators/index.ts b/app/database/operator/comparators/index.ts
index 2e1265bfb..06247c11b 100644
--- a/app/database/operator/comparators/index.ts
+++ b/app/database/operator/comparators/index.ts
@@ -80,7 +80,7 @@ export const isRecordRoleEqualToRaw = (record: Role, raw: RawRole) => {
 };
 
 export const isRecordSystemEqualToRaw = (record: System, raw: RawSystem) => {
-    return raw.id === record.id;
+    return raw.name === record.name;
 };
 
 export const isRecordTermsOfServiceEqualToRaw = (record: TermsOfService, raw: RawTermsOfService) => {
diff --git a/app/database/operator/handlers/base_handler.test.ts b/app/database/operator/handlers/base_handler.test.ts
index 2823d9d30..8d32cceb5 100644
--- a/app/database/operator/handlers/base_handler.test.ts
+++ b/app/database/operator/handlers/base_handler.test.ts
@@ -3,7 +3,7 @@
 
 import DataOperatorException from '@database/exceptions/data_operator_exception';
 import DatabaseManager from '@database/manager';
-import {DataOperator} from '@database/operator';
+import Operator from '@database/operator';
 import {
     isRecordAppEqualToRaw,
     isRecordCustomEmojiEqualToRaw,
@@ -24,22 +24,40 @@ import {
 } from '@database/operator/prepareRecords/general';
 import {createTestConnection} from '@database/operator/utils/create_test_connection';
 import {RawGlobal, RawRole, RawServers, RawTermsOfService} from '@typings/database/database';
-import {IsolatedEntities} from '@typings/database/enums';
+import {DatabaseType, IsolatedEntities} from '@typings/database/enums';
 
 jest.mock('@database/manager');
 
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** DataOperator: Base Handlers tests ***', () => {
+    let databaseManagerClient: DatabaseManager;
+    let operatorClient: Operator;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+        const database = await databaseManagerClient.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'base_handler',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'baseHandler.test.com',
+            },
+        });
+
+        operatorClient = new Operator(database!);
+    });
+
     it('=> HandleApp: should write to APP entity', async () => {
         expect.assertions(3);
 
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
-        expect(defaultDB).toBeTruthy();
+        const defaultDatabase = await databaseManagerClient.getDefaultDatabase();
+        expect(defaultDatabase).toBeTruthy();
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
-        await DataOperator.handleIsolatedEntity({
+        await operatorClient.handleIsolatedEntity({
             tableName: IsolatedEntities.APP,
             values: [
                 {
@@ -81,13 +99,13 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
     it('=> HandleGlobal: should write to GLOBAL entity', async () => {
         expect.assertions(2);
 
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
-        expect(defaultDB).toBeTruthy();
+        const defaultDatabase = await databaseManagerClient.getDefaultDatabase();
+        expect(defaultDatabase).toBeTruthy();
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
         const values: RawGlobal[] = [{name: 'global-1-name', value: 'global-1-value'}];
 
-        await DataOperator.handleIsolatedEntity({
+        await operatorClient.handleIsolatedEntity({
             tableName: IsolatedEntities.GLOBAL,
             values,
             prepareRecordsOnly: false,
@@ -106,10 +124,10 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
     it('=> HandleServers: should write to SERVERS entity', async () => {
         expect.assertions(2);
 
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
-        expect(defaultDB).toBeTruthy();
+        const defaultDatabase = await databaseManagerClient.getDefaultDatabase();
+        expect(defaultDatabase).toBeTruthy();
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         const values: RawServers[] = [
             {
@@ -121,7 +139,7 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
             },
         ];
 
-        await DataOperator.handleIsolatedEntity({
+        await operatorClient.handleIsolatedEntity({
             tableName: IsolatedEntities.SERVERS,
             values,
             prepareRecordsOnly: false,
@@ -150,7 +168,7 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
 
         await createTestConnection({databaseName: 'base_handler', setActive: true});
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         const values: RawRole[] = [
             {
@@ -160,7 +178,7 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
             },
         ];
 
-        await DataOperator.handleIsolatedEntity({
+        await operatorClient.handleIsolatedEntity({
             tableName: IsolatedEntities.ROLE,
             values,
             prepareRecordsOnly: false,
@@ -185,11 +203,11 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
     it('=> HandleCustomEmojis: should write to CUSTOM_EMOJI entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'base_handler', setActive: true});
 
-        await DataOperator.handleIsolatedEntity({
+        await operatorClient.handleIsolatedEntity({
             tableName: IsolatedEntities.CUSTOM_EMOJI,
             values: [
                 {
@@ -229,11 +247,11 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
 
         await createTestConnection({databaseName: 'base_handler', setActive: true});
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         const values = [{id: 'system-id-1', name: 'system-1', value: 'system-1'}];
 
-        await DataOperator.handleIsolatedEntity({
+        await operatorClient.handleIsolatedEntity({
             tableName: IsolatedEntities.SYSTEM,
             values,
             prepareRecordsOnly: false,
@@ -241,7 +259,7 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
 
         expect(spyOnHandleEntityRecords).toHaveBeenCalledWith({
             findMatchingRecordBy: isRecordSystemEqualToRaw,
-            fieldName: 'id',
+            fieldName: 'name',
             operator: prepareSystemRecord,
             rawValues: values,
             tableName: 'System',
@@ -254,7 +272,7 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
 
         await createTestConnection({databaseName: 'base_handler', setActive: true});
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         const values: RawTermsOfService[] = [
             {
@@ -266,7 +284,7 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
             },
         ];
 
-        await DataOperator.handleIsolatedEntity({
+        await operatorClient.handleIsolatedEntity({
             tableName: IsolatedEntities.TERMS_OF_SERVICE,
             values,
             prepareRecordsOnly: false,
@@ -285,11 +303,11 @@ describe('*** DataOperator: Base Handlers tests ***', () => {
     it('=> No table name: should not call executeInDatabase if tableName is invalid', async () => {
         expect.assertions(2);
 
-        const defaultDB = await DatabaseManager.getDefaultDatabase();
-        expect(defaultDB).toBeTruthy();
+        const defaultDatabase = await databaseManagerClient.getDefaultDatabase();
+        expect(defaultDatabase).toBeTruthy();
 
         await expect(
-            DataOperator.handleIsolatedEntity({
+            operatorClient.handleIsolatedEntity({
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 tableName: 'INVALID_TABLE_NAME',
diff --git a/app/database/operator/handlers/base_handler.ts b/app/database/operator/handlers/base_handler.ts
index ba3062c73..66c8215ef 100644
--- a/app/database/operator/handlers/base_handler.ts
+++ b/app/database/operator/handlers/base_handler.ts
@@ -30,7 +30,7 @@ import {
     getRangeOfValues,
     getRawRecordPairs,
     getUniqueRawsBy,
-    hasSimilarUpdateAt,
+    getValidRecordsForUpdate,
     retrieveRecords,
 } from '@database/operator/utils/general';
 import {
@@ -50,7 +50,7 @@ export interface BaseHandlerMix {
   activeDatabase: Database;
   getActiveDatabase: () => DatabaseInstance;
   setActiveDatabase: (database: Database) => void;
-  handleIsolatedEntity: ({tableName, values, prepareRecordsOnly}: HandleIsolatedEntityArgs) => boolean | Model[];
+  handleIsolatedEntity: ({tableName, values, prepareRecordsOnly}: HandleIsolatedEntityArgs) => Model[];
   handleEntityRecords: ({findMatchingRecordBy, fieldName, operator, rawValues, tableName, prepareRecordsOnly}: HandleEntityRecordsArgs) => Promise<null | Model[]>;
   processInputs: ({rawValues, tableName, findMatchingRecordBy, fieldName}: ProcessInputsArgs) => Promise<{ createRaws: RecordPair[]; updateRaws: RecordPair[] }>;
   batchOperations: ({database, models}: BatchOperationsArgs) => Promise<void>;
@@ -68,7 +68,7 @@ class BaseHandler {
    */
   activeDatabase: DatabaseInstance;
 
-  constructor(serverDatabase?: Database) {
+  constructor(serverDatabase: Database) {
       this.activeDatabase = serverDatabase;
   }
 
@@ -94,13 +94,14 @@ class BaseHandler {
    * @param {boolean} isolatedEntityArgs.prepareRecordsOnly
    * @param {RawValue} isolatedEntityArgs.values
    * @throws DataOperatorException
-   * @returns {Model[] | boolean}
+   * @returns {Model[]}
    */
   handleIsolatedEntity = async ({tableName, values, prepareRecordsOnly = true}: HandleIsolatedEntityArgs) => {
       let findMatchingRecordBy;
       let fieldName;
       let operator;
       let rawValues;
+      let records: Model[] = [];
 
       if (!values.length) {
           throw new DataOperatorException(
@@ -146,9 +147,9 @@ class BaseHandler {
           }
           case IsolatedEntities.SYSTEM: {
               findMatchingRecordBy = isRecordSystemEqualToRaw;
-              fieldName = 'id';
+              fieldName = 'name';
               operator = prepareSystemRecord;
-              rawValues = getUniqueRawsBy({raws: values, key: 'id'});
+              rawValues = getUniqueRawsBy({raws: values, key: 'name'});
               break;
           }
           case IsolatedEntities.TERMS_OF_SERVICE: {
@@ -166,7 +167,7 @@ class BaseHandler {
       }
 
       if (fieldName && findMatchingRecordBy) {
-          const records = await this.handleEntityRecords({
+          records = await this.handleEntityRecords({
               fieldName,
               findMatchingRecordBy,
               operator,
@@ -175,10 +176,10 @@ class BaseHandler {
               tableName,
           });
 
-          return prepareRecordsOnly && records?.length && records;
+          return records;
       }
 
-      return false;
+      return records;
   };
 
   /**
@@ -189,13 +190,14 @@ class BaseHandler {
    * @param {(DataFactoryArgs) => Promise<Model>} handleEntityArgs.operator
    * @param {RawValue[]} handleEntityArgs.rawValues
    * @param {string} handleEntityArgs.tableName
-   * @returns {Promise<null | Model[]>}
+   * @returns {Promise<Model[]>}
    */
   handleEntityRecords = async ({findMatchingRecordBy, fieldName, operator, rawValues, tableName, prepareRecordsOnly = true}: HandleEntityRecordsArgs) => {
       if (!rawValues.length) {
-          return null;
+          throw new DataOperatorException(
+              `An empty "rawValues" array has been passed to the handleEntityRecords method for tableName ${tableName}`,
+          );
       }
-
       const {createRaws, updateRaws} = await this.processInputs({
           rawValues,
           tableName,
@@ -205,7 +207,8 @@ class BaseHandler {
 
       const database = await this.getDatabase(tableName);
 
-      const models = await this.prepareRecords({
+      let models: Model[] = [];
+      models = await this.prepareRecords({
           database,
           tableName,
           createRaws,
@@ -221,7 +224,7 @@ class BaseHandler {
           await this.batchOperations({database, models});
       }
 
-      return null;
+      return models;
   };
 
   /**
@@ -263,23 +266,17 @@ class BaseHandler {
                   const existingRecord = existingRecords[findIndex];
 
                   // Some raw value has an update_at field.  We'll proceed to update only if the update_at value is different from the record's value in database
-                  const isUpdateAtSimilar = hasSimilarUpdateAt({
+                  const updateRecords = getValidRecordsForUpdate({
                       tableName,
                       existingRecord,
                       newValue: newElement,
                   });
 
-                  if (!isUpdateAtSimilar) {
-                      return updateRaws.push({
-                          record: existingRecord,
-                          raw: newElement,
-                      });
-                  }
-              } else {
-                  // This RawValue is not present in the database; hence, we need to create it
-                  return createRaws.push({record: undefined, raw: newElement});
+                  return updateRaws.push(updateRecords);
               }
-              return null;
+
+              // This RawValue is not present in the database; hence, we need to create it
+              return createRaws.push({record: undefined, raw: newElement});
           });
 
           return {
@@ -419,7 +416,8 @@ class BaseHandler {
    * @returns {Promise<Database>}
    */
   getDefaultDatabase = async () => {
-      const connection = await DatabaseManager.getDefaultDatabase();
+      const databaseManagerClient = new DatabaseManager();
+      const connection = await databaseManagerClient.getDefaultDatabase();
       if (connection === undefined) {
           throw new DatabaseConnectionException(
               'An error occurred while retrieving the default database',
@@ -440,16 +438,10 @@ class BaseHandler {
           return this.activeDatabase;
       }
 
-      // NOTE: here we are getting the active server directly as in a multi-server support system, the current
-      // active server connection will already be set on application init
-      const connection = await DatabaseManager.getActiveServerDatabase();
-      if (connection === undefined) {
-          throw new DatabaseConnectionException(
-              'An error occurred while retrieving the server database',
-              '',
-          );
-      }
-      return connection;
+      throw new DatabaseConnectionException(
+          "This operator client didn't have its activeDatabase set",
+          '',
+      );
   };
 }
 
diff --git a/app/database/operator/handlers/channel.test.ts b/app/database/operator/handlers/channel.test.ts
index 961de26a8..35618b7ce 100644
--- a/app/database/operator/handlers/channel.test.ts
+++ b/app/database/operator/handlers/channel.test.ts
@@ -1,7 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DataOperator} from '@database/operator';
+import DatabaseManager from '@database/manager';
+import Operator from '@database/operator';
 import {
     isRecordChannelEqualToRaw,
     isRecordChannelInfoEqualToRaw,
@@ -15,20 +16,39 @@ import {
     prepareMyChannelSettingsRecord,
 } from '@database/operator/prepareRecords/channel';
 import {createTestConnection} from '@database/operator/utils/create_test_connection';
+import {DatabaseType} from '@typings/database/enums';
 
 jest.mock('@database/manager');
 
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** Operator: Channel Handlers tests ***', () => {
+    let databaseManagerClient: DatabaseManager;
+    let operatorClient: Operator;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+        const database = await databaseManagerClient.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'base_handler',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'baseHandler.test.com',
+            },
+        });
+
+        operatorClient = new Operator(database!);
+    });
+
     it('=> HandleChannel: should write to CHANNEL entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'channel_handler', setActive: true});
 
-        await DataOperator.handleChannel({
+        await operatorClient.handleChannel({
             channels: [
                 {
                     id: 'kjlw9j1ttnxwig7tnqgebg7dtipno',
@@ -89,11 +109,11 @@ describe('*** Operator: Channel Handlers tests ***', () => {
     it('=> HandleMyChannelSettings: should write to MY_CHANNEL_SETTINGS entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'channel_handler', setActive: true});
 
-        await DataOperator.handleMyChannelSettings({
+        await operatorClient.handleMyChannelSettings({
             settings: [
                 {
                     channel_id: 'c',
@@ -138,11 +158,11 @@ describe('*** Operator: Channel Handlers tests ***', () => {
     it('=> HandleChannelInfo: should write to CHANNEL_INFO entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'channel_handler', setActive: true});
 
-        await DataOperator.handleChannelInfo({
+        await operatorClient.handleChannelInfo({
             channelInfos: [
                 {
                     channel_id: 'c',
@@ -180,11 +200,11 @@ describe('*** Operator: Channel Handlers tests ***', () => {
     it('=> HandleMyChannel: should write to MY_CHANNEL entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'channel_handler', setActive: true});
 
-        await DataOperator.handleMyChannel({
+        await operatorClient.handleMyChannel({
             myChannels: [
                 {
                     channel_id: 'c',
diff --git a/app/database/operator/handlers/channel.ts b/app/database/operator/handlers/channel.ts
index 00e60a2bd..7d5a62215 100644
--- a/app/database/operator/handlers/channel.ts
+++ b/app/database/operator/handlers/channel.ts
@@ -48,9 +48,11 @@ const ChannelHandler = (superclass: any) => class extends superclass {
      * @param {RawChannel[]} channelsArgs.channels
      * @param {boolean} channelsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {Channel[]|boolean}
+     * @returns {Channel[]}
      */
     handleChannel = async ({channels, prepareRecordsOnly = true}: HandleChannelArgs) => {
+        let records: Channel[] = [];
+
         if (!channels.length) {
             throw new DataOperatorException(
                 'An empty "channels" array has been passed to the handleChannel method',
@@ -59,7 +61,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: channels, key: 'id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'id',
             findMatchingRecordBy: isRecordChannelEqualToRaw,
             operator: prepareChannelRecord,
@@ -68,7 +70,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
             tableName: CHANNEL,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -77,9 +79,11 @@ const ChannelHandler = (superclass: any) => class extends superclass {
      * @param {RawMyChannelSettings[]} settingsArgs.settings
      * @param {boolean} settingsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {MyChannelSettings[]| boolean}
+     * @returns {MyChannelSettings[]}
      */
     handleMyChannelSettings = async ({settings, prepareRecordsOnly = true}: HandleMyChannelSettingsArgs) => {
+        let records: MyChannelSettings[] = [];
+
         if (!settings.length) {
             throw new DataOperatorException(
                 'An empty "settings" array has been passed to the handleMyChannelSettings method',
@@ -88,7 +92,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: settings, key: 'channel_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'channel_id',
             findMatchingRecordBy: isRecordMyChannelSettingsEqualToRaw,
             operator: prepareMyChannelSettingsRecord,
@@ -97,7 +101,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
             tableName: MY_CHANNEL_SETTINGS,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -106,9 +110,11 @@ const ChannelHandler = (superclass: any) => class extends superclass {
      * @param {RawChannelInfo[]} channelInfosArgs.channelInfos
      * @param {boolean} channelInfosArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {ChannelInfo[]| boolean}
+     * @returns {ChannelInfo[]}
      */
     handleChannelInfo = async ({channelInfos, prepareRecordsOnly = true}: HandleChannelInfoArgs) => {
+        let records: ChannelInfo[] = [];
+
         if (!channelInfos.length) {
             throw new DataOperatorException(
                 'An empty "channelInfos" array has been passed to the handleMyChannelSettings method',
@@ -120,7 +126,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
             key: 'channel_id',
         });
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'channel_id',
             findMatchingRecordBy: isRecordChannelInfoEqualToRaw,
             operator: prepareChannelInfoRecord,
@@ -129,7 +135,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
             tableName: CHANNEL_INFO,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -138,9 +144,11 @@ const ChannelHandler = (superclass: any) => class extends superclass {
      * @param {RawMyChannel[]} myChannelsArgs.myChannels
      * @param {boolean} myChannelsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {MyChannel[]| boolean}
+     * @returns {MyChannel[]}
      */
     handleMyChannel = async ({myChannels, prepareRecordsOnly = true}: HandleMyChannelArgs) => {
+        let records: MyChannel[] = [];
+
         if (!myChannels.length) {
             throw new DataOperatorException(
                 'An empty "myChannels" array has been passed to the handleMyChannel method',
@@ -152,7 +160,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
             key: 'channel_id',
         });
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'channel_id',
             findMatchingRecordBy: isRecordMyChannelEqualToRaw,
             operator: prepareMyChannelRecord,
@@ -161,7 +169,7 @@ const ChannelHandler = (superclass: any) => class extends superclass {
             tableName: MY_CHANNEL,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 };
 
diff --git a/app/database/operator/handlers/group.test.ts b/app/database/operator/handlers/group.test.ts
index 531b470f2..209775509 100644
--- a/app/database/operator/handlers/group.test.ts
+++ b/app/database/operator/handlers/group.test.ts
@@ -1,7 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DataOperator} from '@database/operator';
+import DatabaseManager from '@database/manager';
+import Operator from '@database/operator';
 import {
     isRecordGroupEqualToRaw,
     isRecordGroupMembershipEqualToRaw,
@@ -15,20 +16,39 @@ import {
     prepareGroupsInTeamRecord,
 } from '@database/operator/prepareRecords/group';
 import {createTestConnection} from '@database/operator/utils/create_test_connection';
+import {DatabaseType} from '@typings/database/enums';
 
 jest.mock('@database/manager');
 
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** Operator: Group Handlers tests ***', () => {
+    let databaseManagerClient: DatabaseManager;
+    let operatorClient: Operator;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+        const database = await databaseManagerClient.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'base_handler',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'baseHandler.test.com',
+            },
+        });
+
+        operatorClient = new Operator(database!);
+    });
+
     it('=> HandleGroup: should write to GROUP entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'group_handler', setActive: true});
 
-        await DataOperator.handleGroup({
+        await operatorClient.handleGroup({
             groups: [
                 {
                     id: 'id_groupdfjdlfkjdkfdsf',
@@ -73,11 +93,11 @@ describe('*** Operator: Group Handlers tests ***', () => {
     it('=> HandleGroupsInTeam: should write to GROUPS_IN_TEAM entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'group_handler', setActive: true});
 
-        await DataOperator.handleGroupsInTeam({
+        await operatorClient.handleGroupsInTeam({
             groupsInTeams: [
                 {
                     team_id: 'team_899',
@@ -118,11 +138,11 @@ describe('*** Operator: Group Handlers tests ***', () => {
     it('=> HandleGroupsInChannel: should write to GROUPS_IN_CHANNEL entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'group_handler', setActive: true});
 
-        await DataOperator.handleGroupsInChannel({
+        await operatorClient.handleGroupsInChannel({
             groupsInChannels: [
                 {
                     auto_add: true,
@@ -173,11 +193,11 @@ describe('*** Operator: Group Handlers tests ***', () => {
     it('=> HandleGroupMembership: should write to GROUP_MEMBERSHIP entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'group_handler', setActive: true});
 
-        await DataOperator.handleGroupMembership({
+        await operatorClient.handleGroupMembership({
             groupMemberships: [
                 {
                     user_id: 'u4cprpki7ri81mbx8efixcsb8jo',
diff --git a/app/database/operator/handlers/group.ts b/app/database/operator/handlers/group.ts
index d2957ca34..c935d14d2 100644
--- a/app/database/operator/handlers/group.ts
+++ b/app/database/operator/handlers/group.ts
@@ -48,9 +48,11 @@ const GroupHandler = (superclass: any) => class extends superclass {
      * @param {RawGroupMembership[]} groupMembershipsArgs.groupMemberships
      * @param {boolean} groupMembershipsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {GroupMembership[] | boolean}
+     * @returns {GroupMembership[]}
      */
     handleGroupMembership = async ({groupMemberships, prepareRecordsOnly = true}: HandleGroupMembershipArgs) => {
+        let records: GroupMembership[] = [];
+
         if (!groupMemberships.length) {
             throw new DataOperatorException(
                 'An empty "groupMemberships" array has been passed to the handleGroupMembership method',
@@ -59,7 +61,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: groupMemberships, key: 'group_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'user_id',
             findMatchingRecordBy: isRecordGroupMembershipEqualToRaw,
             operator: prepareGroupMembershipRecord,
@@ -68,7 +70,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
             tableName: GROUP_MEMBERSHIP,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -77,9 +79,11 @@ const GroupHandler = (superclass: any) => class extends superclass {
      * @param {RawGroup[]} groupsArgs.groups
      * @param {boolean} groupsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {Group[] | boolean}
+     * @returns {Group[]}
      */
     handleGroup = async ({groups, prepareRecordsOnly = true}: HandleGroupArgs) => {
+        let records: Group[] = [];
+
         if (!groups.length) {
             throw new DataOperatorException(
                 'An empty "groups" array has been passed to the handleGroup method',
@@ -88,7 +92,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: groups, key: 'name'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'name',
             findMatchingRecordBy: isRecordGroupEqualToRaw,
             operator: prepareGroupRecord,
@@ -97,7 +101,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
             tableName: GROUP,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -106,9 +110,11 @@ const GroupHandler = (superclass: any) => class extends superclass {
      * @param {RawGroupsInTeam[]} groupsInTeamsArgs.groupsInTeams
      * @param {boolean} groupsInTeamsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {GroupsInTeam[] | boolean}
+     * @returns {GroupsInTeam[]}
      */
     handleGroupsInTeam = async ({groupsInTeams, prepareRecordsOnly = true} : HandleGroupsInTeamArgs) => {
+        let records: GroupsInTeam[] = [];
+
         if (!groupsInTeams.length) {
             throw new DataOperatorException(
                 'An empty "groups" array has been passed to the handleGroupsInTeam method',
@@ -117,7 +123,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: groupsInTeams, key: 'group_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'group_id',
             findMatchingRecordBy: isRecordGroupsInTeamEqualToRaw,
             operator: prepareGroupsInTeamRecord,
@@ -126,7 +132,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
             tableName: GROUPS_IN_TEAM,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -135,9 +141,11 @@ const GroupHandler = (superclass: any) => class extends superclass {
      * @param {RawGroupsInChannel[]} groupsInChannelsArgs.groupsInChannels
      * @param {boolean} groupsInChannelsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {GroupsInChannel[] | boolean}
+     * @returns {GroupsInChannel[]}
      */
     handleGroupsInChannel = async ({groupsInChannels, prepareRecordsOnly = true}: HandleGroupsInChannelArgs) => {
+        let records: GroupsInChannel[] = [];
+
         if (!groupsInChannels.length) {
             throw new DataOperatorException(
                 'An empty "groups" array has been passed to the handleGroupsInTeam method',
@@ -146,7 +154,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: groupsInChannels, key: 'channel_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'group_id',
             findMatchingRecordBy: isRecordGroupsInChannelEqualToRaw,
             operator: prepareGroupsInChannelRecord,
@@ -155,7 +163,7 @@ const GroupHandler = (superclass: any) => class extends superclass {
             tableName: GROUPS_IN_CHANNEL,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 };
 
diff --git a/app/database/operator/handlers/post.test.ts b/app/database/operator/handlers/post.test.ts
index 9473006c6..a9f8baf9a 100644
--- a/app/database/operator/handlers/post.test.ts
+++ b/app/database/operator/handlers/post.test.ts
@@ -1,27 +1,48 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DataOperator} from '@database/operator';
+import DatabaseManager from '@database/manager';
+import Operator from '@database/operator';
 import {isRecordDraftEqualToRaw} from '@database/operator/comparators';
 import {prepareDraftRecord} from '@database/operator/prepareRecords/post';
 import {createTestConnection} from '@database/operator/utils/create_test_connection';
+import {DatabaseType} from '@typings/database/enums';
 
 jest.mock('@database/manager');
 
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** Operator: Post Handlers tests ***', () => {
+    let databaseManagerClient: DatabaseManager;
+    let operatorClient: Operator;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+        const database = await databaseManagerClient.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'base_handler',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'baseHandler.test.com',
+            },
+        });
+
+        operatorClient = new Operator(database!);
+    });
+
     it('=> HandleDraft: should write to the Draft entity', async () => {
         expect.assertions(1);
 
         await createTestConnection({databaseName: 'post_handler', setActive: true});
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
         const values = [
             {
                 channel_id: '4r9jmr7eqt8dxq3f9woypzurrychannelid',
                 files: [
                     {
+                        id: '322dxx',
                         user_id: 'user_id',
                         post_id: 'post_id',
                         create_at: 123,
@@ -42,7 +63,7 @@ describe('*** Operator: Post Handlers tests ***', () => {
             },
         ];
 
-        await DataOperator.handleDraft({drafts: values, prepareRecordsOnly: false});
+        await operatorClient.handleDraft({drafts: values, prepareRecordsOnly: false});
 
         expect(spyOnHandleEntityRecords).toHaveBeenCalledWith({
             findMatchingRecordBy: isRecordDraftEqualToRaw,
@@ -206,17 +227,17 @@ describe('*** Operator: Post Handlers tests ***', () => {
             },
         ];
 
-        const spyOnHandleFiles = jest.spyOn(DataOperator as any, 'handleFiles');
-        const spyOnHandlePostMetadata = jest.spyOn(DataOperator as any, 'handlePostMetadata');
-        const spyOnHandleReactions = jest.spyOn(DataOperator as any, 'handleReactions');
-        const spyOnHandleCustomEmojis = jest.spyOn(DataOperator as any, 'handleIsolatedEntity');
-        const spyOnHandlePostsInThread = jest.spyOn(DataOperator as any, 'handlePostsInThread');
-        const spyOnHandlePostsInChannel = jest.spyOn(DataOperator as any, 'handlePostsInChannel');
+        const spyOnHandleFiles = jest.spyOn(operatorClient as any, 'handleFiles');
+        const spyOnHandlePostMetadata = jest.spyOn(operatorClient as any, 'handlePostMetadata');
+        const spyOnHandleReactions = jest.spyOn(operatorClient as any, 'handleReactions');
+        const spyOnHandleCustomEmojis = jest.spyOn(operatorClient as any, 'handleIsolatedEntity');
+        const spyOnHandlePostsInThread = jest.spyOn(operatorClient as any, 'handlePostsInThread');
+        const spyOnHandlePostsInChannel = jest.spyOn(operatorClient as any, 'handlePostsInChannel');
 
         await createTestConnection({databaseName: 'post_handler', setActive: true});
 
         // handlePosts will in turn call handlePostsInThread
-        await DataOperator.handlePosts({
+        await operatorClient.handlePosts({
             orders: [
                 '8swgtrrdiff89jnsiwiip3y1eoe',
                 '8fcnk3p1jt8mmkaprgajoxz115a',
diff --git a/app/database/operator/handlers/post.ts b/app/database/operator/handlers/post.ts
index 37c2f76dd..d4e40b404 100644
--- a/app/database/operator/handlers/post.ts
+++ b/app/database/operator/handlers/post.ts
@@ -1,6 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {Q} from '@nozbe/watermelondb';
+import Model from '@nozbe/watermelondb/Model';
+
 import {MM_TABLES} from '@constants/database';
 import DataOperatorException from '@database/exceptions/data_operator_exception';
 import {isRecordDraftEqualToRaw, isRecordPostEqualToRaw} from '@database/operator/comparators';
@@ -14,8 +17,6 @@ import {
 } from '@database/operator/prepareRecords/post';
 import {getRawRecordPairs, getUniqueRawsBy, retrieveRecords} from '@database/operator/utils/general';
 import {createPostsChain, sanitizePosts} from '@database/operator/utils/post';
-import {Q} from '@nozbe/watermelondb';
-import Model from '@nozbe/watermelondb/Model';
 import {
     HandleDraftArgs,
     HandleFilesArgs,
@@ -64,9 +65,11 @@ const PostHandler = (superclass: any) => class extends superclass {
      * @param {RawDraft[]} draftsArgs.drafts
      * @param {boolean} draftsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {Draft[] | boolean}
+     * @returns {Draft[]}
      */
     handleDraft = async ({drafts, prepareRecordsOnly = true}: HandleDraftArgs) => {
+        let records: Draft[] = [];
+
         if (!drafts.length) {
             throw new DataOperatorException(
                 'An empty "drafts" array has been passed to the handleReactions method',
@@ -75,7 +78,7 @@ const PostHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: drafts, key: 'channel_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'channel_id',
             findMatchingRecordBy: isRecordDraftEqualToRaw,
             operator: prepareDraftRecord,
@@ -84,7 +87,7 @@ const PostHandler = (superclass: any) => class extends superclass {
             tableName: DRAFT,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
diff --git a/app/database/operator/handlers/team.test.ts b/app/database/operator/handlers/team.test.ts
index 7870a2c5f..5e608f63c 100644
--- a/app/database/operator/handlers/team.test.ts
+++ b/app/database/operator/handlers/team.test.ts
@@ -1,7 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DataOperator} from '@database/operator';
+import DatabaseManager from '@database/manager';
+import Operator from '@database/operator';
 import {
     isRecordMyTeamEqualToRaw,
     isRecordSlashCommandEqualToRaw,
@@ -19,20 +20,39 @@ import {
     prepareTeamSearchHistoryRecord,
 } from '@database/operator/prepareRecords/team';
 import {createTestConnection} from '@database/operator/utils/create_test_connection';
+import {DatabaseType} from '@typings/database/enums';
 
 jest.mock('@database/manager');
 
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** Operator: Team Handlers tests ***', () => {
+    let databaseManagerClient: DatabaseManager;
+    let operatorClient: Operator;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+        const database = await databaseManagerClient.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'base_handler',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'baseHandler.test.com',
+            },
+        });
+
+        operatorClient = new Operator(database!);
+    });
+
     it('=> HandleTeam: should write to TEAM entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'team_handler', setActive: true});
 
-        await DataOperator.handleTeam({
+        await operatorClient.handleTeam({
             teams: [
                 {
                     id: 'rcgiyftm7jyrxnmdfdfa1osd8zswby',
@@ -89,11 +109,11 @@ describe('*** Operator: Team Handlers tests ***', () => {
     it('=> HandleTeamMemberships: should write to TEAM_MEMBERSHIP entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'team_handler', setActive: true});
 
-        await DataOperator.handleTeamMemberships({
+        await operatorClient.handleTeamMemberships({
             teamMemberships: [
                 {
                     team_id: 'a',
@@ -134,11 +154,11 @@ describe('*** Operator: Team Handlers tests ***', () => {
     it('=> HandleMyTeam: should write to MY_TEAM entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'team_handler', setActive: true});
 
-        await DataOperator.handleMyTeam({
+        await operatorClient.handleMyTeam({
             myTeams: [
                 {
                     team_id: 'teamA',
@@ -171,11 +191,11 @@ describe('*** Operator: Team Handlers tests ***', () => {
     it('=> HandleTeamChannelHistory: should write to TEAM_CHANNEL_HISTORY entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'team_handler', setActive: true});
 
-        await DataOperator.handleTeamChannelHistory({
+        await operatorClient.handleTeamChannelHistory({
             teamChannelHistories: [
                 {
                     team_id: 'a',
@@ -199,11 +219,11 @@ describe('*** Operator: Team Handlers tests ***', () => {
     it('=> HandleTeamSearchHistory: should write to TEAM_SEARCH_HISTORY entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'team_handler', setActive: true});
 
-        await DataOperator.handleTeamSearchHistory({
+        await operatorClient.handleTeamSearchHistory({
             teamSearchHistories: [
                 {
                     team_id: 'a',
@@ -236,11 +256,11 @@ describe('*** Operator: Team Handlers tests ***', () => {
     it('=> HandleSlashCommand: should write to SLASH_COMMAND entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'team_handler', setActive: true});
 
-        await DataOperator.handleSlashCommand({
+        await operatorClient.handleSlashCommand({
             slashCommands: [
                 {
                     id: 'command_1',
diff --git a/app/database/operator/handlers/team.ts b/app/database/operator/handlers/team.ts
index 5316849ac..457933df2 100644
--- a/app/database/operator/handlers/team.ts
+++ b/app/database/operator/handlers/team.ts
@@ -33,6 +33,7 @@ import SlashCommand from '@typings/database/slash_command';
 import Team from '@typings/database/team';
 import TeamChannelHistory from '@typings/database/team_channel_history';
 import TeamMembership from '@typings/database/team_membership';
+import TeamSearchHistory from '@typings/database/team_search_history';
 
 const {
     MY_TEAM,
@@ -44,11 +45,11 @@ const {
 } = MM_TABLES.SERVER;
 
 export interface TeamHandlerMix {
-    handleTeamMemberships : ({teamMemberships, prepareRecordsOnly}: HandleTeamMembershipArgs) => TeamMembership[] | boolean,
-    handleTeam: ({teams, prepareRecordsOnly}: HandleTeamArgs) => Team[] | boolean
-    handleTeamChannelHistory : ({teamChannelHistories, prepareRecordsOnly}: HandleTeamChannelHistoryArgs) => TeamChannelHistory[]| boolean,
-    handleSlashCommand : ({slashCommands, prepareRecordsOnly} : HandleSlashCommandArgs) => SlashCommand[]| boolean,
-    handleMyTeam : ({myTeams, prepareRecordsOnly}: HandleMyTeamArgs) => MyTeam[]| boolean
+  handleTeamMemberships: ({teamMemberships, prepareRecordsOnly}: HandleTeamMembershipArgs) => TeamMembership[];
+  handleTeam: ({teams, prepareRecordsOnly}: HandleTeamArgs) => Team[];
+  handleTeamChannelHistory: ({teamChannelHistories, prepareRecordsOnly}: HandleTeamChannelHistoryArgs) => TeamChannelHistory[];
+  handleSlashCommand: ({slashCommands, prepareRecordsOnly}: HandleSlashCommandArgs) => SlashCommand[];
+  handleMyTeam: ({myTeams, prepareRecordsOnly}: HandleMyTeamArgs) => MyTeam[];
 }
 
 const TeamHandler = (superclass: any) => class extends superclass {
@@ -58,9 +59,11 @@ const TeamHandler = (superclass: any) => class extends superclass {
      * @param {RawTeamMembership[]} teamMembershipsArgs.teamMemberships
      * @param {boolean} teamMembershipsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {TeamMembership[] | boolean}
+     * @returns {TeamMembership[]}
      */
     handleTeamMemberships = async ({teamMemberships, prepareRecordsOnly = true}: HandleTeamMembershipArgs) => {
+        let records: TeamMembership[] = [];
+
         if (!teamMemberships.length) {
             throw new DataOperatorException(
                 'An empty "teamMemberships" array has been passed to the handleTeamMemberships method',
@@ -69,7 +72,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: teamMemberships, key: 'team_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'user_id',
             findMatchingRecordBy: isRecordTeamMembershipEqualToRaw,
             operator: prepareTeamMembershipRecord,
@@ -78,7 +81,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
             prepareRecordsOnly,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -87,9 +90,11 @@ const TeamHandler = (superclass: any) => class extends superclass {
      * @param {RawTeam[]} teamsArgs.teams
      * @param {boolean} teamsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {Team[] | boolean}
+     * @returns {Team[]}
      */
     handleTeam = async ({teams, prepareRecordsOnly = true}: HandleTeamArgs) => {
+        let records: Team[] = [];
+
         if (!teams.length) {
             throw new DataOperatorException(
                 'An empty "teams" array has been passed to the handleTeam method',
@@ -98,7 +103,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: teams, key: 'id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'id',
             findMatchingRecordBy: isRecordTeamEqualToRaw,
             operator: prepareTeamRecord,
@@ -107,7 +112,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
             tableName: TEAM,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -116,9 +121,11 @@ const TeamHandler = (superclass: any) => class extends superclass {
      * @param {RawTeamChannelHistory[]} teamChannelHistoriesArgs.teamChannelHistories
      * @param {boolean} teamChannelHistoriesArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {TeamChannelHistory[]| boolean}
+     * @returns {TeamChannelHistory[]}
      */
     handleTeamChannelHistory = async ({teamChannelHistories, prepareRecordsOnly = true}: HandleTeamChannelHistoryArgs) => {
+        let records: TeamChannelHistory[] = [];
+
         if (!teamChannelHistories.length) {
             throw new DataOperatorException(
                 'An empty "teamChannelHistories" array has been passed to the handleTeamChannelHistory method',
@@ -127,7 +134,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: teamChannelHistories, key: 'team_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'team_id',
             findMatchingRecordBy: isRecordTeamChannelHistoryEqualToRaw,
             operator: prepareTeamChannelHistoryRecord,
@@ -136,7 +143,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
             tableName: TEAM_CHANNEL_HISTORY,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -145,9 +152,11 @@ const TeamHandler = (superclass: any) => class extends superclass {
      * @param {RawTeamSearchHistory[]} teamSearchHistoriesArgs.teamSearchHistories
      * @param {boolean} teamSearchHistoriesArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {TeamSearchHistory[]| boolean}
+     * @returns {TeamSearchHistory[]}
      */
     handleTeamSearchHistory = async ({teamSearchHistories, prepareRecordsOnly = true}: HandleTeamSearchHistoryArgs) => {
+        let records: TeamSearchHistory[] = [];
+
         if (!teamSearchHistories.length) {
             throw new DataOperatorException(
                 'An empty "teamSearchHistories" array has been passed to the handleTeamSearchHistory method',
@@ -156,7 +165,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: teamSearchHistories, key: 'term'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'team_id',
             findMatchingRecordBy: isRecordTeamSearchHistoryEqualToRaw,
             operator: prepareTeamSearchHistoryRecord,
@@ -165,7 +174,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
             tableName: TEAM_SEARCH_HISTORY,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -174,9 +183,11 @@ const TeamHandler = (superclass: any) => class extends superclass {
      * @param {RawSlashCommand[]} slashCommandsArgs.slashCommands
      * @param {boolean} slashCommandsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {SlashCommand[]| boolean}
+     * @returns {SlashCommand[]}
      */
-    handleSlashCommand = async ({slashCommands, prepareRecordsOnly = true} : HandleSlashCommandArgs) => {
+    handleSlashCommand = async ({slashCommands, prepareRecordsOnly = true}: HandleSlashCommandArgs) => {
+        let records: SlashCommand[] = [];
+
         if (!slashCommands.length) {
             throw new DataOperatorException(
                 'An empty "slashCommands" array has been passed to the handleSlashCommand method',
@@ -185,7 +196,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: slashCommands, key: 'id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'id',
             findMatchingRecordBy: isRecordSlashCommandEqualToRaw,
             operator: prepareSlashCommandRecord,
@@ -194,7 +205,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
             tableName: SLASH_COMMAND,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -203,9 +214,11 @@ const TeamHandler = (superclass: any) => class extends superclass {
      * @param {RawMyTeam[]} myTeamsArgs.myTeams
      * @param {boolean} myTeamsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {MyTeam[]| boolean}
+     * @returns {MyTeam[]}
      */
     handleMyTeam = async ({myTeams, prepareRecordsOnly = true}: HandleMyTeamArgs) => {
+        let records: MyTeam[] = [];
+
         if (!myTeams.length) {
             throw new DataOperatorException(
                 'An empty "myTeams" array has been passed to the handleSlashCommand method',
@@ -214,7 +227,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: myTeams, key: 'team_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'team_id',
             findMatchingRecordBy: isRecordMyTeamEqualToRaw,
             operator: prepareMyTeamRecord,
@@ -223,7 +236,7 @@ const TeamHandler = (superclass: any) => class extends superclass {
             tableName: MY_TEAM,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 };
 
diff --git a/app/database/operator/handlers/user.test.ts b/app/database/operator/handlers/user.test.ts
index d317ca0c4..85e762722 100644
--- a/app/database/operator/handlers/user.test.ts
+++ b/app/database/operator/handlers/user.test.ts
@@ -1,7 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DataOperator} from '@database/operator';
+import DatabaseManager from '@database/manager';
+import Operator from '@database/operator';
 import {
     isRecordChannelMembershipEqualToRaw,
     isRecordPreferenceEqualToRaw,
@@ -13,21 +14,40 @@ import {
     prepareUserRecord,
 } from '@database/operator/prepareRecords/user';
 import {createTestConnection} from '@database/operator/utils/create_test_connection';
+import {DatabaseType} from '@typings/database/enums';
 
 jest.mock('@database/manager');
 
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** Operator: User Handlers tests ***', () => {
+    let databaseManagerClient: DatabaseManager;
+    let operatorClient: Operator;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+        const database = await databaseManagerClient.createDatabaseConnection({
+            shouldAddToDefaultDatabase: true,
+            configs: {
+                actionsEnabled: true,
+                dbName: 'base_handler',
+                dbType: DatabaseType.SERVER,
+                serverUrl: 'baseHandler.test.com',
+            },
+        });
+
+        operatorClient = new Operator(database!);
+    });
+
     it('=> HandleReactions: should write to both Reactions and CustomEmoji entities', async () => {
         expect.assertions(2);
 
         await createTestConnection({databaseName: 'user_handler', setActive: true});
 
-        const spyOnPrepareRecords = jest.spyOn(DataOperator as any, 'prepareRecords');
-        const spyOnBatchOperation = jest.spyOn(DataOperator as any, 'batchOperations');
+        const spyOnPrepareRecords = jest.spyOn(operatorClient as any, 'prepareRecords');
+        const spyOnBatchOperation = jest.spyOn(operatorClient as any, 'batchOperations');
 
-        await DataOperator.handleReactions({
+        await operatorClient.handleReactions({
             reactions: [
                 {
                     create_at: 1608263728086,
@@ -88,16 +108,16 @@ describe('*** Operator: User Handlers tests ***', () => {
                 timezone: {
                     automaticTimezone: 'Indian/Mauritius',
                     manualTimezone: '',
-                    useAutomaticTimezone: true,
+                    useAutomaticTimezone: '',
                 },
             },
         ];
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'user_handler', setActive: true});
 
-        await DataOperator.handleUsers({users, prepareRecordsOnly: false});
+        await operatorClient.handleUsers({users, prepareRecordsOnly: false});
 
         expect(spyOnHandleEntityRecords).toHaveBeenCalledTimes(1);
         expect(spyOnHandleEntityRecords).toHaveBeenCalledWith({
@@ -139,7 +159,7 @@ describe('*** Operator: User Handlers tests ***', () => {
                     timezone: {
                         automaticTimezone: 'Indian/Mauritius',
                         manualTimezone: '',
-                        useAutomaticTimezone: true,
+                        useAutomaticTimezone: '',
                     },
                 },
             ],
@@ -153,11 +173,11 @@ describe('*** Operator: User Handlers tests ***', () => {
     it('=> HandlePreferences: should write to PREFERENCE entity', async () => {
         expect.assertions(2);
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'user_handler', setActive: true});
 
-        await DataOperator.handlePreferences({
+        await operatorClient.handlePreferences({
             preferences: [
                 {
                     user_id: '9ciscaqbrpd6d8s68k76xb9bte',
@@ -269,11 +289,11 @@ describe('*** Operator: User Handlers tests ***', () => {
             },
         ];
 
-        const spyOnHandleEntityRecords = jest.spyOn(DataOperator as any, 'handleEntityRecords');
+        const spyOnHandleEntityRecords = jest.spyOn(operatorClient as any, 'handleEntityRecords');
 
         await createTestConnection({databaseName: 'user_handler', setActive: true});
 
-        await DataOperator.handleChannelMembership({
+        await operatorClient.handleChannelMembership({
             channelMemberships,
             prepareRecordsOnly: false,
         });
diff --git a/app/database/operator/handlers/user.ts b/app/database/operator/handlers/user.ts
index 84566b28f..ea7cc4e09 100644
--- a/app/database/operator/handlers/user.ts
+++ b/app/database/operator/handlers/user.ts
@@ -17,7 +17,6 @@ import {
 } from '@database/operator/prepareRecords/user';
 import {getRawRecordPairs, getUniqueRawsBy} from '@database/operator/utils/general';
 import {sanitizeReactions} from '@database/operator/utils/reaction';
-import Model from '@nozbe/watermelondb/Model';
 import ChannelMembership from '@typings/database/channel_membership';
 import CustomEmoji from '@typings/database/custom_emoji';
 import {
@@ -40,10 +39,10 @@ const {
 } = MM_TABLES.SERVER;
 
 export interface UserHandlerMix {
-    handleChannelMembership : ({channelMemberships, prepareRecordsOnly}: HandleChannelMembershipArgs) => ChannelMembership[] | boolean,
-    handlePreferences : ({preferences, prepareRecordsOnly}: HandlePreferencesArgs) => Preference[] | boolean,
-    handleReactions : ({reactions, prepareRecordsOnly}: HandleReactionsArgs) => boolean | (Reaction | CustomEmoji)[],
-    handleUsers : ({users, prepareRecordsOnly}: HandleUsersArgs) => User[] | boolean
+    handleChannelMembership : ({channelMemberships, prepareRecordsOnly}: HandleChannelMembershipArgs) => ChannelMembership[];
+    handlePreferences : ({preferences, prepareRecordsOnly}: HandlePreferencesArgs) => Preference[];
+    handleReactions : ({reactions, prepareRecordsOnly}: HandleReactionsArgs) =>(Reaction | CustomEmoji)[];
+    handleUsers : ({users, prepareRecordsOnly}: HandleUsersArgs) => User[];
 }
 
 const UserHandler = (superclass: any) => class extends superclass {
@@ -53,21 +52,20 @@ const UserHandler = (superclass: any) => class extends superclass {
      * @param {RawChannelMembership[]} channelMembershipsArgs.channelMemberships
      * @param {boolean} channelMembershipsArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {ChannelMembership[] | boolean}
+     * @returns {ChannelMembership[]}
      */
     handleChannelMembership = async ({channelMemberships, prepareRecordsOnly = true}: HandleChannelMembershipArgs) => {
+        let records: ChannelMembership[] = [];
+
         if (!channelMemberships.length) {
             throw new DataOperatorException(
                 'An empty "channelMemberships" array has been passed to the handleChannelMembership method',
             );
         }
 
-        const rawValues = getUniqueRawsBy({
-            raws: channelMemberships,
-            key: 'channel_id',
-        });
+        const rawValues = getUniqueRawsBy({raws: channelMemberships, key: 'channel_id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'user_id',
             findMatchingRecordBy: isRecordChannelMembershipEqualToRaw,
             operator: prepareChannelMembershipRecord,
@@ -76,7 +74,7 @@ const UserHandler = (superclass: any) => class extends superclass {
             tableName: CHANNEL_MEMBERSHIP,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -85,9 +83,11 @@ const UserHandler = (superclass: any) => class extends superclass {
      * @param {RawPreference[]} preferencesArgs.preferences
      * @param {boolean} preferencesArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {Preference[] | boolean}
+     * @returns {Preference[]}
      */
     handlePreferences = async ({preferences, prepareRecordsOnly = true}: HandlePreferencesArgs) => {
+        let records: Preference[] = [];
+
         if (!preferences.length) {
             throw new DataOperatorException(
                 'An empty "preferences" array has been passed to the handlePreferences method',
@@ -96,7 +96,7 @@ const UserHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: preferences, key: 'name'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'user_id',
             findMatchingRecordBy: isRecordPreferenceEqualToRaw,
             operator: preparePreferenceRecord,
@@ -105,7 +105,7 @@ const UserHandler = (superclass: any) => class extends superclass {
             tableName: PREFERENCE,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 
     /**
@@ -114,9 +114,11 @@ const UserHandler = (superclass: any) => class extends superclass {
      * @param {RawReaction[]} handleReactions.reactions
      * @param {boolean} handleReactions.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {boolean | (Reaction | CustomEmoji)[]}
+     * @returns {(Reaction| CustomEmoji)[]}
      */
     handleReactions = async ({reactions, prepareRecordsOnly}: HandleReactionsArgs) => {
+        let batchRecords: (Reaction| CustomEmoji)[] = [];
+
         if (!reactions.length) {
             throw new DataOperatorException(
                 'An empty "reactions" array has been passed to the handleReactions method',
@@ -137,8 +139,6 @@ const UserHandler = (superclass: any) => class extends superclass {
             rawReactions: rawValues,
         });
 
-        let batchRecords: Model[] = [];
-
         if (createReactions.length) {
             // Prepares record for model Reactions
             const reactionsRecords = (await this.prepareRecords({
@@ -174,7 +174,7 @@ const UserHandler = (superclass: any) => class extends superclass {
             });
         }
 
-        return false;
+        return [];
     };
 
     /**
@@ -183,9 +183,11 @@ const UserHandler = (superclass: any) => class extends superclass {
      * @param {RawUser[]} usersArgs.users
      * @param {boolean} usersArgs.prepareRecordsOnly
      * @throws DataOperatorException
-     * @returns {User[] | boolean}
+     * @returns {User[]}
      */
     handleUsers = async ({users, prepareRecordsOnly = true}: HandleUsersArgs) => {
+        let records: User[] = [];
+
         if (!users.length) {
             throw new DataOperatorException(
                 'An empty "users" array has been passed to the handleUsers method',
@@ -194,7 +196,7 @@ const UserHandler = (superclass: any) => class extends superclass {
 
         const rawValues = getUniqueRawsBy({raws: users, key: 'id'});
 
-        const records = await this.handleEntityRecords({
+        records = await this.handleEntityRecords({
             fieldName: 'id',
             findMatchingRecordBy: isRecordUserEqualToRaw,
             operator: prepareUserRecord,
@@ -203,7 +205,7 @@ const UserHandler = (superclass: any) => class extends superclass {
             prepareRecordsOnly,
         });
 
-        return prepareRecordsOnly && records?.length && records;
+        return records;
     };
 };
 
diff --git a/app/database/operator/index.ts b/app/database/operator/index.ts
index dfc2811c8..54bf8ca9f 100644
--- a/app/database/operator/index.ts
+++ b/app/database/operator/index.ts
@@ -7,18 +7,20 @@ import GroupHandler, {GroupHandlerMix} from '@database/operator/handlers/group';
 import PostHandler, {PostHandlerMix} from '@database/operator/handlers/post';
 import TeamHandler, {TeamHandlerMix} from '@database/operator/handlers/team';
 import UserHandler, {UserHandlerMix} from '@database/operator/handlers/user';
+import {DatabaseInstance} from '@typings/database/database';
 import mix from '@utils/mix';
 
 interface Operator extends BaseHandlerMix, PostHandlerMix, UserHandlerMix, GroupHandlerMix, ChannelHandlerMix, TeamHandlerMix {}
 
-class Operator extends mix(BaseHandler).with(
-    PostHandler,
-    UserHandler,
-    GroupHandler,
-    ChannelHandler,
-    TeamHandler,
-) {}
+class Operator extends mix(BaseHandler).with(PostHandler, UserHandler, GroupHandler, ChannelHandler, TeamHandler) {
+    database: DatabaseInstance;
 
-const DataOperator = new Operator();
+    constructor(activeDatabase?: DatabaseInstance) {
+        super();
+        if (activeDatabase) {
+            this.activeDatabase = activeDatabase;
+        }
+    }
+}
 
-export {DataOperator, Operator};
+export default Operator;
diff --git a/app/database/operator/prepareRecords/general.test.ts b/app/database/operator/prepareRecords/general.test.ts
index 5b86b75b5..7367cf92f 100644
--- a/app/database/operator/prepareRecords/general.test.ts
+++ b/app/database/operator/prepareRecords/general.test.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import DatabaseManager from '@database/manager';
 import {
     prepareAppRecord,
     prepareCustomEmojiRecord,
@@ -11,14 +12,21 @@ import {
     prepareTermsOfServiceRecord,
 } from '@database/operator/prepareRecords/general';
 import {createTestConnection} from '@database/operator/utils/create_test_connection';
-import DatabaseManager from '@database/manager';
 import {OperationType} from '@typings/database/enums';
 
+jest.mock('@database/manager');
+
 describe('*** Isolated Prepare Records Test ***', () => {
+    let databaseManagerClient: DatabaseManager;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+    });
+
     it('=> prepareAppRecord: should return an array of type App', async () => {
         expect.assertions(3);
 
-        const database = await DatabaseManager.getDefaultDatabase();
+        const database = await databaseManagerClient.getDefaultDatabase();
         expect(database).toBeTruthy();
 
         const preparedRecords = await prepareAppRecord({
@@ -41,7 +49,7 @@ describe('*** Isolated Prepare Records Test ***', () => {
     it('=> prepareGlobalRecord: should return an array of type Global', async () => {
         expect.assertions(3);
 
-        const database = await DatabaseManager.getDefaultDatabase();
+        const database = await databaseManagerClient.getDefaultDatabase();
         expect(database).toBeTruthy();
 
         const preparedRecords = await prepareGlobalRecord({
@@ -60,7 +68,7 @@ describe('*** Isolated Prepare Records Test ***', () => {
     it('=> prepareServersRecord: should return an array of type Servers', async () => {
         expect.assertions(3);
 
-        const database = await DatabaseManager.getDefaultDatabase();
+        const database = await databaseManagerClient.getDefaultDatabase();
         expect(database).toBeTruthy();
 
         const preparedRecords = await prepareServersRecord({
diff --git a/app/database/operator/prepareRecords/user.ts b/app/database/operator/prepareRecords/user.ts
index a41f77137..4c107e472 100644
--- a/app/database/operator/prepareRecords/user.ts
+++ b/app/database/operator/prepareRecords/user.ts
@@ -104,7 +104,7 @@ export const preparePreferenceRecord = ({action, database, value}: DataFactoryAr
 
     // id of preference comes from server response
     const generator = (preference: Preference) => {
-        preference._raw.id = isCreateAction ? (raw?.id ?? preference.id) : record.id;
+        preference._raw.id = isCreateAction ? preference.id : record.id;
         preference.category = raw.category;
         preference.name = raw.name;
         preference.userId = raw.user_id;
diff --git a/app/database/operator/utils/create_test_connection.ts b/app/database/operator/utils/create_test_connection.ts
index 24e2d29af..0cc6e0bea 100644
--- a/app/database/operator/utils/create_test_connection.ts
+++ b/app/database/operator/utils/create_test_connection.ts
@@ -9,7 +9,8 @@ jest.mock('@database/manager');
 
 export const createTestConnection = async ({databaseName = 'db_name', setActive = false}) => {
     const serverUrl = 'https://appv2.mattermost.com';
-    const database = await DatabaseManager.createDatabaseConnection({
+    const databaseClient = new DatabaseManager();
+    const database = await databaseClient.createDatabaseConnection({
         shouldAddToDefaultDatabase: true,
         configs: {
             actionsEnabled: true,
@@ -20,10 +21,7 @@ export const createTestConnection = async ({databaseName = 'db_name', setActive
     });
 
     if (setActive) {
-        await DatabaseManager.setActiveServerDatabase({
-            displayName: databaseName,
-            serverUrl,
-        });
+        await databaseClient.setActiveServerDatabase(serverUrl);
     }
 
     return database;
diff --git a/app/database/operator/utils/general.ts b/app/database/operator/utils/general.ts
index c654a9076..8d530d024 100644
--- a/app/database/operator/utils/general.ts
+++ b/app/database/operator/utils/general.ts
@@ -23,7 +23,7 @@ import User from '@typings/database/user';
 const {CHANNEL, POST, SLASH_COMMAND, TEAM, USER} = MM_TABLES.SERVER;
 
 /**
- * hasSimilarUpdateAt: Database Operations on some entities are expensive.  As such, we would like to operate if and only if we are
+ * getValidRecordsForUpdate: Database Operations on some entities are expensive.  As such, we would like to operate if and only if we are
  * 100% sure that the records are actually different from what we already have in the database.
  * @param {IdenticalRecordArgs} identicalRecord
  * @param {string} identicalRecord.tableName
@@ -31,16 +31,26 @@ const {CHANNEL, POST, SLASH_COMMAND, TEAM, USER} = MM_TABLES.SERVER;
  * @param {Model} identicalRecord.existingRecord
  * @returns {boolean}
  */
-export const hasSimilarUpdateAt = ({tableName, newValue, existingRecord}: IdenticalRecordArgs) => {
+export const getValidRecordsForUpdate = ({tableName, newValue, existingRecord}: IdenticalRecordArgs) => {
     const guardTables = [CHANNEL, POST, SLASH_COMMAND, TEAM, USER];
-
     if (guardTables.includes(tableName)) {
         type Raw = RawPost | RawUser | RawTeam | RawSlashCommand | RawChannel;
         type ExistingRecord = Post | User | Team | SlashCommand | Channel;
 
-        return (newValue as Raw).update_at === (existingRecord as ExistingRecord).updateAt;
+        const shouldUpdate = (newValue as Raw).update_at === (existingRecord as ExistingRecord).updateAt;
+
+        if (shouldUpdate) {
+            return {
+                record: existingRecord,
+                raw: newValue,
+            };
+        }
     }
-    return false;
+
+    return {
+        record: existingRecord,
+        raw: newValue,
+    };
 };
 
 /**
@@ -90,7 +100,7 @@ export const getUniqueRawsBy = ({raws, key}:{ raws: RawValue[], key: string}) =>
  * @param {RetrieveRecordsArgs} records
  * @param {Database} records.database
  * @param {string} records.tableName
- * @param {any} records.condition
+ * @param {Clause} records.condition
  * @returns {Promise<Model[]>}
  */
 export const retrieveRecords = ({database, tableName, condition}: RetrieveRecordsArgs) => {
diff --git a/app/database/operator/utils/test.ts b/app/database/operator/utils/test.ts
index e34189347..e07e67f53 100644
--- a/app/database/operator/utils/test.ts
+++ b/app/database/operator/utils/test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DataOperator} from '@database/operator';
+import Operator from '@database/operator';
 import {createPostsChain, sanitizePosts} from '@database/operator/utils/post';
 import {sanitizeReactions} from '@database/operator/utils/reaction';
 import DatabaseManager from '@database/manager';
@@ -71,7 +71,8 @@ describe('DataOperator: Utils tests', () => {
     it('=> sanitizeReactions: should triage between reactions that needs creation/deletion and emojis to be created', async () => {
         const dbName = 'server_schema_connection';
         const serverUrl = 'https://appv2.mattermost.com';
-        const database = await DatabaseManager.createDatabaseConnection({
+        const databaseManagerClient = new DatabaseManager();
+        const database = await databaseManagerClient.createDatabaseConnection({
             shouldAddToDefaultDatabase: true,
             configs: {
                 actionsEnabled: true,
@@ -80,13 +81,12 @@ describe('DataOperator: Utils tests', () => {
                 serverUrl,
             },
         });
-        await DatabaseManager.setActiveServerDatabase({
-            displayName: dbName,
-            serverUrl,
-        });
+        await databaseManagerClient.setActiveServerDatabase(serverUrl);
+
+        const operatorClient = new Operator(database!);
 
         // we commit one Reaction to our database
-        const prepareRecords = await DataOperator.handleReactions({
+        const prepareRecords = await operatorClient.handleReactions({
             reactions: [
                 {
                     user_id: 'beqkgo4wzbn98kjzjgc1p5n91o',
diff --git a/app/database/operator/wrapper/index.ts b/app/database/operator/wrapper/index.ts
index 97fb68931..4e0185623 100644
--- a/app/database/operator/wrapper/index.ts
+++ b/app/database/operator/wrapper/index.ts
@@ -1,38 +1,19 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {Database} from '@nozbe/watermelondb';
-
-import {Operator} from '@database/operator/index';
+import Operator from '@database/operator/index';
 import DatabaseManager from '@database/manager';
 import DatabaseConnectionException from '@database/exceptions/database_connection_exception';
 
 export const createDataOperator = async (serverUrl: string) => {
-    // Retrieves the connection matching serverUrl
-    const connections = await DatabaseManager.retrieveDatabaseInstances([
-        serverUrl,
-    ]);
+    const databaseManagerClient = new DatabaseManager();
 
-    if (connections?.length) {
-        // finds the connection that corresponds to the serverUrl value
-        const index = connections.findIndex((databaseInstance) => {
-            return databaseInstance.url === serverUrl;
-        });
-
-        if (!connections?.[index]?.dbInstance) {
-            throw new DatabaseConnectionException(
-                `An instance of a database connection was found but we could not create a connection out of it for url: ${serverUrl}`,
-            );
-        }
-
-        const connection = connections[index].dbInstance as Database;
-
-        const operator = new Operator();
-        operator.setActiveDatabase(connection);
+    const connection = await databaseManagerClient.getDatabaseConnection({serverUrl, setAsActiveDatabase: false});
 
+    if (connection) {
+        const operator = new Operator(connection);
         return operator;
     }
-
     throw new DatabaseConnectionException(
         `No database has been registered with this url: ${serverUrl}`,
     );
diff --git a/app/database/operator/wrapper/test.ts b/app/database/operator/wrapper/test.ts
index 7aaff6451..82db35dfc 100644
--- a/app/database/operator/wrapper/test.ts
+++ b/app/database/operator/wrapper/test.ts
@@ -3,7 +3,6 @@
 
 import DatabaseManager from '@database/manager';
 import {createDataOperator} from '@database/operator/wrapper/index';
-import DatabaseConnectionException from '@database/exceptions/database_connection_exception';
 import {DatabaseType} from '@typings/database/enums';
 
 jest.mock('@database/manager');
@@ -11,13 +10,19 @@ jest.mock('@database/manager');
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
 describe('*** DataOperator Wrapper ***', () => {
+    let databaseManagerClient: DatabaseManager;
+
+    beforeAll(async () => {
+        databaseManagerClient = new DatabaseManager();
+    });
+
     it('=> wrapper should return an instance of DataOperator ', async () => {
         expect.assertions(1);
 
         const serverUrl = 'https://wrapper.mattermost.com';
 
         // first we create the connection and save it into default database
-        await DatabaseManager.createDatabaseConnection({
+        await databaseManagerClient.createDatabaseConnection({
             configs: {
                 actionsEnabled: true,
                 dbName: 'community mattermost',
@@ -32,29 +37,6 @@ describe('*** DataOperator Wrapper ***', () => {
         expect(dataOperator).toBeTruthy();
     });
 
-    it('=> wrapper should throw an error due to invalid server url', async () => {
-        expect.assertions(2);
-
-        const serverUrl = 'https://wrapper.mattermost.com';
-
-        // first we create the connection and save it into default database
-        await DatabaseManager.createDatabaseConnection({
-            configs: {
-                actionsEnabled: true,
-                dbName: 'test_database',
-                dbType: DatabaseType.SERVER,
-                serverUrl,
-            },
-            shouldAddToDefaultDatabase: true,
-        });
-
-        await expect(createDataOperator('https://error.com')).rejects.toThrow(
-            'No database has been registered with this url: https://error.com',
-        );
-
-        await expect(createDataOperator('https://error.com')).rejects.toThrow(DatabaseConnectionException);
-    });
-
     it('=> wrapper to handlePosts [OTHER DATABASE]: should write to Post and its sub-child entities', async () => {
         expect.assertions(12);
 
@@ -212,7 +194,7 @@ describe('*** DataOperator Wrapper ***', () => {
         ];
 
         // create connection to other server in default db
-        await DatabaseManager.createDatabaseConnection({
+        await databaseManagerClient.createDatabaseConnection({
             shouldAddToDefaultDatabase: true,
             configs: {
                 actionsEnabled: true,
diff --git a/app/database/schema/server/table_schemas/user.ts b/app/database/schema/server/table_schemas/user.ts
index 82476b087..e5cced586 100644
--- a/app/database/schema/server/table_schemas/user.ts
+++ b/app/database/schema/server/table_schemas/user.ts
@@ -27,7 +27,6 @@ export default tableSchema({
         {name: 'roles', type: 'string'},
         {name: 'status', type: 'string'},
         {name: 'timezone', type: 'string'},
-        {name: 'user_id', type: 'string'},
         {name: 'username', type: 'string'},
     ],
 });
diff --git a/app/database/schema/server/test.ts b/app/database/schema/server/test.ts
index 9bd46c43f..b9e75480c 100644
--- a/app/database/schema/server/test.ts
+++ b/app/database/schema/server/test.ts
@@ -492,7 +492,6 @@ describe('*** Test schema for SERVER database ***', () => {
                         roles: {name: 'roles', type: 'string'},
                         status: {name: 'status', type: 'string'},
                         timezone: {name: 'timezone', type: 'string'},
-                        user_id: {name: 'user_id', type: 'string'},
                         username: {name: 'username', type: 'string'},
                     },
                     columnArray: [
@@ -513,7 +512,6 @@ describe('*** Test schema for SERVER database ***', () => {
                         {name: 'roles', type: 'string'},
                         {name: 'status', type: 'string'},
                         {name: 'timezone', type: 'string'},
-                        {name: 'user_id', type: 'string'},
                         {name: 'username', type: 'string'},
                     ],
                 },
diff --git a/app/i18n/index.ts b/app/i18n/index.ts
index 3a1b952a7..a02afd30d 100644
--- a/app/i18n/index.ts
+++ b/app/i18n/index.ts
@@ -2,82 +2,172 @@
 // See LICENSE.txt for license information.
 
 import moment from 'moment';
+import {Platform} from 'react-native';
+import {getLocales} from 'react-native-localize';
 
 import en from '@assets/i18n/en.json';
 
-export const DEFAULT_LOCALE = 'en';
+const deviceLocale = getLocales()[0].languageCode;
+export const DEFAULT_LOCALE = deviceLocale;
 
-function loadTranslation(locale: string) {
+function loadTranslation(locale?: string) {
     try {
         let translations;
         let momentData;
+
         switch (locale) {
             case 'de':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/de');
+                    require('@formatjs/intl-numberformat/locale-data/de');
+                    require('@formatjs/intl-datetimeformat/locale-data/de');
+                }
+
                 translations = require('@assets/i18n/de.json');
                 momentData = require('moment/locale/de');
                 break;
             case 'es':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/es');
+                    require('@formatjs/intl-numberformat/locale-data/es');
+                    require('@formatjs/intl-datetimeformat/locale-data/es');
+                }
+
                 translations = require('@assets/i18n/es.json');
                 momentData = require('moment/locale/es');
                 break;
             case 'fr':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/fr');
+                    require('@formatjs/intl-numberformat/locale-data/fr');
+                    require('@formatjs/intl-datetimeformat/locale-data/fr');
+                }
+
                 translations = require('@assets/i18n/fr.json');
                 momentData = require('moment/locale/fr');
                 break;
             case 'it':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/it');
+                    require('@formatjs/intl-numberformat/locale-data/it');
+                    require('@formatjs/intl-datetimeformat/locale-data/it');
+                }
+
                 translations = require('@assets/i18n/it.json');
                 momentData = require('moment/locale/it');
                 break;
             case 'ja':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/ja');
+                    require('@formatjs/intl-numberformat/locale-data/ja');
+                    require('@formatjs/intl-datetimeformat/locale-data/ja');
+                }
+
                 translations = require('@assets/i18n/ja.json');
                 momentData = require('moment/locale/ja');
                 break;
             case 'ko':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/ko');
+                    require('@formatjs/intl-numberformat/locale-data/ko');
+                    require('@formatjs/intl-datetimeformat/locale-data/ko');
+                }
+
                 translations = require('@assets/i18n/ko.json');
                 momentData = require('moment/locale/ko');
                 break;
             case 'nl':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/nl');
+                    require('@formatjs/intl-numberformat/locale-data/nl');
+                    require('@formatjs/intl-datetimeformat/locale-data/nl');
+                }
+
                 translations = require('@assets/i18n/nl.json');
                 momentData = require('moment/locale/nl');
                 break;
             case 'pl':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/pl');
+                    require('@formatjs/intl-numberformat/locale-data/pl');
+                    require('@formatjs/intl-datetimeformat/locale-data/pl');
+                }
+
                 translations = require('@assets/i18n/pl.json');
                 momentData = require('moment/locale/pl');
                 break;
             case 'pt-BR':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/pt');
+                    require('@formatjs/intl-numberformat/locale-data/pt');
+                    require('@formatjs/intl-datetimeformat/locale-data/pt');
+                }
+
                 translations = require('@assets/i18n/pt-BR.json');
                 momentData = require('moment/locale/pt-br');
                 break;
             case 'ro':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/ro');
+                    require('@formatjs/intl-numberformat/locale-data/ro');
+                    require('@formatjs/intl-datetimeformat/locale-data/ro');
+                }
+
                 translations = require('@assets/i18n/ro.json');
                 momentData = require('moment/locale/ro');
                 break;
             case 'ru':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/ru');
+                    require('@formatjs/intl-numberformat/locale-data/ru');
+                    require('@formatjs/intl-datetimeformat/locale-data/ru');
+                }
+
                 translations = require('@assets/i18n/ru.json');
                 momentData = require('moment/locale/ru');
                 break;
             case 'tr':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/tr');
+                    require('@formatjs/intl-numberformat/locale-data/tr');
+                    require('@formatjs/intl-datetimeformat/locale-data/tr');
+                }
+
                 translations = require('@assets/i18n/tr.json');
                 momentData = require('moment/locale/tr');
                 break;
             case 'uk':
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/uk');
+                    require('@formatjs/intl-numberformat/locale-data/uk');
+                    require('@formatjs/intl-datetimeformat/locale-data/uk');
+                }
+
                 translations = require('@assets/i18n/uk.json');
                 momentData = require('moment/locale/uk');
                 break;
             case 'zh-CN':
+                loadChinesePolyfills();
                 translations = require('@assets/i18n/zh-CN.json');
                 momentData = require('moment/locale/zh-cn');
                 break;
             case 'zh-TW':
+                loadChinesePolyfills();
                 translations = require('@assets/i18n/zh-TW.json');
                 momentData = require('moment/locale/zh-tw');
                 break;
             default:
+                if (Platform.OS === 'android') {
+                    require('@formatjs/intl-pluralrules/locale-data/en');
+                    require('@formatjs/intl-numberformat/locale-data/en');
+                    require('@formatjs/intl-datetimeformat/locale-data/en');
+                }
+
                 translations = en;
                 break;
         }
 
-        if (momentData) {
+        if (momentData && locale) {
             moment.updateLocale(locale.toLowerCase(), momentData);
         } else {
             resetMomentLocale();
@@ -89,11 +179,19 @@ function loadTranslation(locale: string) {
     }
 }
 
+function loadChinesePolyfills() {
+    if (Platform.OS === 'android') {
+        require('@formatjs/intl-pluralrules/locale-data/zh');
+        require('@formatjs/intl-numberformat/locale-data/zh');
+        require('@formatjs/intl-datetimeformat/locale-data/zh');
+    }
+}
+
 export function resetMomentLocale() {
     moment.locale(DEFAULT_LOCALE);
 }
 
-export function getTranslations(locale: string) {
+export function getTranslations(locale?: string) {
     return loadTranslation(locale);
 }
 
diff --git a/app/init/analytics.ts b/app/init/analytics.ts
index 93419b84b..228936598 100644
--- a/app/init/analytics.ts
+++ b/app/init/analytics.ts
@@ -13,7 +13,7 @@ const isSystemAdmin = (roles: string) => {
 
 const clientMap: Record<string, Analytics> = {};
 
-class Analytics {
+export class Analytics {
     analytics: RudderClient | null = null;
     context: any;
     diagnosticId: string | undefined;
diff --git a/app/init/credentials.ts b/app/init/credentials.ts
index fdf572394..4b44cb281 100644
--- a/app/init/credentials.ts
+++ b/app/init/credentials.ts
@@ -1,90 +1,112 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {Platform} from 'react-native';
 import AsyncStorage from '@react-native-community/async-storage';
 import * as KeyChain from 'react-native-keychain';
 
+import DatabaseManager from '@database/manager';
 import * as analytics from '@init/analytics';
-import emmProvider from '@init/emm_provider';
-import EphemeralStore from '@store/ephemeral_store';
+import {getIOSAppGroupDetails} from '@utils/mattermost_managed';
 import {getCSRFFromCookie} from '@utils/security';
 
+import type {ServerCredentials} from '@typings/credentials';
+
 const ASYNC_STORAGE_CURRENT_SERVER_KEY = '@currentServerUrl';
 
-export const getCurrentServerUrl = async () => {
-    // TODO: Use default database to retrieve the current server url
-    // and fallback to AsyncStorage if needed
+// TODO: This function is only necessary to support pre-Gekidou
+// versions as the active server URL may be stored in AsyncStorage.
+// At some point we can remove this function and rely solely on
+// the database manager's `getActiveServerUrl`.
+export const getActiveServerUrl = async () => {
+    let serverUrl: string | null | undefined;
+
+    const databaseManager = new DatabaseManager();
+    serverUrl = await databaseManager.getActiveServerUrl(); // TODO: need funciton to get active server url
+    if (!serverUrl) {
+        // If upgrading from non-Gekidou, the server URL might be in
+        // AsyncStorage. If so, retrieve the server URL, create a DB for it,
+        // then delete the AsyncStorage item.
+        serverUrl = await AsyncStorage.getItem(ASYNC_STORAGE_CURRENT_SERVER_KEY);
+        if (serverUrl) {
+            databaseManager.setActiveServerDatabase(serverUrl);
+            AsyncStorage.removeItem(ASYNC_STORAGE_CURRENT_SERVER_KEY);
+        }
+    }
 
-    const serverUrl = await AsyncStorage.getItem(ASYNC_STORAGE_CURRENT_SERVER_KEY);
-    EphemeralStore.currentServerUrl = serverUrl;
     return serverUrl;
 };
 
-export const setAppCredentials = (deviceToken: string, currentUserId: string, token: string, url: string) => {
-    if (!currentUserId) {
+export const setServerCredentials = (serverUrl: string, userId: string, token: string) => {
+    if (!(serverUrl && userId && token)) {
         return;
     }
 
-    // Only save to keychain if the url and token are set
-    if (url && token) {
-        try {
-            const username = `${deviceToken}, ${currentUserId}`;
-            const accessGroup = emmProvider.getAppGroupIdentifier();
-
-            EphemeralStore.deviceToken = deviceToken;
-            EphemeralStore.currentServerUrl = url;
-            AsyncStorage.setItem(ASYNC_STORAGE_CURRENT_SERVER_KEY, url);
-            const options: KeyChain.Options = {
-                accessGroup,
-                securityLevel: KeyChain.SECURITY_LEVEL.SECURE_SOFTWARE,
-            };
-            KeyChain.setInternetCredentials(url, username, token, options);
-        } catch (e) {
-            console.warn('could not set credentials', e); //eslint-disable-line no-console
+    try {
+        let accessGroup;
+        if (Platform.OS === 'ios') {
+            const appGroup = getIOSAppGroupDetails();
+            accessGroup = appGroup.appGroupIdentifier;
         }
+
+        const options: KeyChain.Options = {
+            accessGroup,
+            securityLevel: KeyChain.SECURITY_LEVEL.SECURE_SOFTWARE,
+        };
+        KeyChain.setInternetCredentials(serverUrl, userId, token, options);
+    } catch (e) {
+        console.warn('could not set credentials', e); //eslint-disable-line no-console
     }
 };
 
-export const getAppCredentials = async () => {
-    const serverUrl = await getCurrentServerUrl();
+export const getActiveServerCredentials = async () => {
+    const serverUrl = await getActiveServerUrl();
+    if (serverUrl) {
+        return getServerCredentials(serverUrl);
+    }
 
-    return getInternetCredentials(serverUrl || '');
+    return null;
 };
 
-export const removeAppCredentials = async () => {
-    const url = await getCurrentServerUrl();
-
+export const removeServerCredentials = async (serverUrl: string) => {
     // TODO: invalidate client and remove tokens
 
-    if (url) {
-        KeyChain.resetInternetCredentials(url);
-    }
+    KeyChain.resetInternetCredentials(serverUrl);
 
-    EphemeralStore.currentServerUrl = null;
     AsyncStorage.removeItem(ASYNC_STORAGE_CURRENT_SERVER_KEY);
 };
 
-export async function getInternetCredentials(url: string) {
+export const removeActiveServerCredentials = async () => {
+    const serverUrl = await getActiveServerUrl();
+    if (serverUrl) {
+        removeServerCredentials(serverUrl);
+    }
+};
+
+export const getServerCredentials = async (serverUrl: string): Promise<ServerCredentials|null> => {
     try {
-        const credentials = await KeyChain.getInternetCredentials(url);
+        const credentials = await KeyChain.getInternetCredentials(serverUrl);
 
         if (credentials) {
-            const usernameParsed = credentials.username.split(',');
+            // TODO: Pre-Gekidou we were concatenating the deviceToken and the userId in
+            // credentials.username so we need to check the length of credentials.username.split(',').
+            // This check should be removed at some point.
+            const parts = credentials.username.split(',');
+            const userId = parts[parts.length - 1];
+
             const token = credentials.password;
-            const [deviceToken, currentUserId] = usernameParsed;
 
             if (token && token !== 'undefined') {
-                EphemeralStore.deviceToken = deviceToken;
-                const analyticsClient = analytics.get(url);
-                analyticsClient?.setUserId(currentUserId);
+                const analyticsClient = analytics.get(serverUrl);
+                analyticsClient?.setUserId(userId);
 
-                const csrf = await getCSRFFromCookie(url);
+                const csrf = await getCSRFFromCookie(serverUrl);
                 // eslint-disable-next-line no-console
                 console.log('CSRF', csrf);
 
                 // TODO: Create client and set token / CSRF
 
-                return credentials;
+                return {userId, token};
             }
         }
 
@@ -92,4 +114,4 @@ export async function getInternetCredentials(url: string) {
     } catch (e) {
         return null;
     }
-}
+};
diff --git a/app/init/emm_provider.ts b/app/init/emm_provider.ts
deleted file mode 100644
index 0c7bc3007..000000000
--- a/app/init/emm_provider.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import Emm from '@mattermost/react-native-emm';
-import {Alert, AlertButton, AppState, AppStateStatus, NativeModules, Platform} from 'react-native';
-import JailMonkey from 'jail-monkey';
-
-import LocalConfig from '@assets/config.json';
-import {DEFAULT_LOCALE, getTranslations, t} from '@i18n';
-
-import {getAppCredentials} from './credentials';
-
-const PROMPT_IN_APP_PIN_CODE_AFTER = 5 * 1000;
-
-class EMMProvider {
-    allowOtherServers = true;
-    appGroupIdentifier: string | undefined;
-    backgroundSince = 0;
-    blurApplicationScreen = false;
-    enabled = false;
-    inAppPinCode = false;
-    jailbreakProtection = false;
-    performingAuthentication = false;
-    previousAppState: AppStateStatus | undefined;
-    vendor = 'Mattermost';
-
-    constructor() {
-        Emm.addListener(this.handleManagedConfig);
-        AppState.addEventListener('change', this.onAppStateChange);
-
-        if (Platform.OS === 'ios') {
-            const {MattermostManaged} = NativeModules;
-            if (MattermostManaged) {
-                this.appGroupIdentifier = MattermostManaged.appGroupIdentifier;
-            }
-
-            if (this.appGroupIdentifier) {
-                Emm.setAppGroupId(this.appGroupIdentifier);
-            }
-        }
-    }
-
-    checkIfDeviceIsTrusted = () => {
-        const isTrusted = this.isTrustedDevice();
-
-        if (!isTrusted) {
-            const locale = DEFAULT_LOCALE; // TODO: Get current user or system locale
-            const translations = getTranslations(locale);
-            Alert.alert(
-                translations[t('mobile.managed.blocked_by')].replace('{vendor}', this.vendor),
-                translations[t('mobile.managed.jailbreak')].replace('{vendor}', this.vendor),
-                [{
-                    text: translations[t('mobile.managed.exit')],
-                    style: 'destructive',
-                    onPress: () => {
-                        Emm.exitApp();
-                    },
-                }],
-                {cancelable: false},
-            );
-        }
-    };
-
-    getAppGroupIdentifier = () => {
-        return this.appGroupIdentifier;
-    };
-
-    handleAuthentication = async (prompt = true) => {
-        this.performingAuthentication = true;
-        const isSecured = await Emm.isDeviceSecured();
-        const locale = DEFAULT_LOCALE;
-        const translations = getTranslations(locale);
-
-        if (isSecured) {
-            try {
-                if (prompt) {
-                    await Emm.authenticate({
-                        reason: translations[t('mobile.managed.secured_by')].replace('{vendor}', this.vendor),
-                        fallback: true,
-                        supressEnterPassword: true,
-                    });
-                }
-            } catch (err) {
-                Emm.exitApp();
-                return false;
-            }
-        } else {
-            await this.showNotSecuredAlert(translations);
-
-            Emm.exitApp();
-            return false;
-        }
-
-        this.performingAuthentication = false;
-        return true;
-    };
-
-    handleManagedConfig = async () => {
-        if (this.performingAuthentication) {
-            return true;
-        }
-
-        if (LocalConfig.AutoSelectServerUrl) {
-            // TODO: Set server url based on EMM config
-            this.allowOtherServers = false;
-        }
-
-        const managedConfig = await Emm.getManagedConfig();
-
-        if (managedConfig && Object.keys(managedConfig).length) {
-            this.enabled = true;
-            this.inAppPinCode = managedConfig.inAppPinCode === 'true';
-
-            this.blurApplicationScreen = managedConfig.blurApplicationScreen === 'true';
-            this.jailbreakProtection = managedConfig.jailbreakProtection === 'true';
-            if (managedConfig.vendor) {
-                this.vendor = managedConfig.vendor;
-            }
-
-            const credentials = await getAppCredentials();
-            if (!credentials) {
-                if (managedConfig.serverUrl) {
-                    // TODO: Set server url based on EMM config
-                }
-
-                if (managedConfig.allowOtherServers && managedConfig.allowOtherServers === 'false') {
-                    this.allowOtherServers = false;
-                }
-            }
-
-            if (this.blurApplicationScreen) {
-                Emm.enableBlurScreen(true);
-            }
-        }
-
-        return true;
-    };
-
-    isTrustedDevice = () => {
-        if (__DEV__) {
-            return true;
-        }
-
-        return JailMonkey.trustFall();
-    };
-
-    onAppStateChange = async (appState: AppStateStatus) => {
-        const isActive = appState === 'active';
-        const isBackground = appState === 'background';
-
-        if (isActive && (!this.enabled || this.previousAppState === 'background')) {
-            // if the app is being controlled by an EMM provider
-            if (this.enabled && this.inAppPinCode) {
-                const authExpired = (Date.now() - this.backgroundSince) >= PROMPT_IN_APP_PIN_CODE_AFTER;
-
-                // Once the app becomes active we check if the device needs to have a passcode set
-                // if more than 5 minutes have passed prompt for passcode
-                const prompt = this.backgroundSince > 0 && authExpired;
-                await this.handleAuthentication(prompt);
-            }
-
-            this.backgroundSince = 0;
-        } else if (isBackground) {
-            this.backgroundSince = Date.now();
-        }
-
-        this.previousAppState = appState;
-    };
-
-    showNotSecuredAlert = (translations: Record<string, string>) => {
-        return new Promise(async (resolve) => { /* eslint-disable-line no-async-promise-executor */
-            const buttons: AlertButton[] = [];
-
-            if (Platform.OS === 'android') {
-                buttons.push({
-                    text: translations[t('mobile.managed.settings')],
-                    onPress: () => {
-                        Emm.openSecuritySettings();
-                    },
-                });
-            }
-
-            buttons.push({
-                text: translations[t('mobile.managed.exit')],
-                onPress: resolve,
-                style: 'cancel',
-            });
-
-            let message;
-            if (Platform.OS === 'ios') {
-                const {face} = await Emm.deviceSecureWith();
-
-                if (face) {
-                    message = translations[t('mobile.managed.not_secured.ios')];
-                } else {
-                    message = translations[t('mobile.managed.not_secured.ios.touchId')];
-                }
-            } else {
-                message = translations[t('mobile.managed.not_secured.android')];
-            }
-
-            Alert.alert(
-                translations[t('mobile.managed.blocked_by')].replace('{vendor}', this.vendor),
-                message,
-                buttons,
-                {cancelable: false, onDismiss: () => resolve},
-            );
-        });
-    };
-}
-
-export default new EMMProvider();
diff --git a/app/init/fetch.js b/app/init/fetch.js
new file mode 100644
index 000000000..70d768fe9
--- /dev/null
+++ b/app/init/fetch.js
@@ -0,0 +1,145 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import DeviceInfo from 'react-native-device-info';
+import RNFetchBlob from 'rn-fetch-blob';
+import urlParse from 'url-parse';
+
+import LocalConfig from '@assets/config';
+import {Client4} from '@client/rest';
+import {HEADER_TOKEN, HEADER_X_CLUSTER_ID, HEADER_X_VERSION_ID} from '@client/rest/constants';
+import ClientError from '@client/rest/error';
+
+// import EventEmitter from '@mm-redux/utils/event_emitter';
+// import {General} from '@mm-redux/constants';
+import {t} from '@utils/i18n';
+
+/* eslint-disable no-throw-literal */
+
+const DEFAULT_TIMEOUT = 10000;
+
+const handleRedirectProtocol = (url, response) => {
+    const serverUrl = Client4.getUrl();
+    const parsed = urlParse(url);
+    const {redirects} = response.rnfbRespInfo;
+    if (redirects) {
+        const redirectUrl = urlParse(redirects[redirects.length - 1]);
+
+        if (serverUrl === parsed.origin && parsed.host === redirectUrl.host && parsed.protocol !== redirectUrl.protocol) {
+            Client4.setUrl(serverUrl.replace(parsed.protocol, redirectUrl.protocol));
+        }
+    }
+};
+
+Client4.doFetchWithResponse = async (url, options) => {
+    // eslint-disable-next-line no-console
+    console.log('Request endpoint', url);
+    const customHeaders = LocalConfig.CustomRequestHeaders;
+
+    let requestOptions = {
+        ...Client4.getOptions(options),
+    };
+
+    if (customHeaders && Object.keys(customHeaders).length > 0) {
+        requestOptions = {
+            ...requestOptions,
+            headers: {
+                ...requestOptions.headers,
+                ...LocalConfig.CustomRequestHeaders,
+            },
+        };
+    }
+
+    let response;
+    let headers;
+
+    let data;
+    try {
+        response = await fetch(url, requestOptions);
+        headers = response.headers;
+        if (!url.startsWith('https') && response.rnfbRespInfo && response.rnfbRespInfo.redirects && response.rnfbRespInfo.redirects.length > 1) {
+            handleRedirectProtocol(url, response);
+        }
+
+        data = await response.json();
+    } catch (err) {
+        if (response && response.resp && response.resp.data && response.resp.data.includes('SSL certificate')) {
+            throw new ClientError(Client4.getUrl(), {
+                message: 'You need to use a valid client certificate in order to connect to this Mattermost server',
+                status_code: 401,
+                url,
+                details: err,
+            });
+        }
+
+        throw new ClientError(Client4.getUrl(), {
+            message: 'Received invalid response from the server.',
+            intl: {
+                id: t('mobile.request.invalid_response'),
+                defaultMessage: 'Received invalid response from the server.',
+            },
+            url,
+            details: err,
+        });
+    }
+
+    const clusterId = headers[HEADER_X_CLUSTER_ID] || headers[HEADER_X_CLUSTER_ID.toLowerCase()];
+    if (clusterId && Client4.clusterId !== clusterId) {
+        Client4.clusterId = clusterId; /* eslint-disable-line require-atomic-updates */
+    }
+
+    const token = headers[HEADER_TOKEN] || headers[HEADER_TOKEN.toLowerCase()];
+    if (token) {
+        Client4.setToken(token);
+    }
+
+    const serverVersion = headers[HEADER_X_VERSION_ID] || headers[HEADER_X_VERSION_ID.toLowerCase()];
+    if (serverVersion && !headers['Cache-Control'] && Client4.serverVersion !== serverVersion) {
+        Client4.serverVersion = serverVersion; /* eslint-disable-line require-atomic-updates */
+        // EventEmitter.emit(General.SERVER_VERSION_CHANGED, serverVersion);
+    }
+
+    if (response.ok) {
+        const headersMap = new Map();
+        Object.keys(headers).forEach((key) => {
+            headersMap.set(key, headers[key]);
+        });
+
+        return {
+            response,
+            headers: headersMap,
+            data,
+        };
+    }
+
+    const msg = data.message || '';
+
+    if (Client4.logToConsole) {
+        console.error(msg); // eslint-disable-line no-console
+    }
+
+    throw new ClientError(Client4.getUrl(), {
+        message: msg,
+        server_error_id: data.id,
+        status_code: data.status_code,
+        url,
+    });
+};
+
+const initFetchConfig = async () => {
+    const fetchConfig = {
+        auto: true,
+        timeout: DEFAULT_TIMEOUT, // Set the base timeout for every request to 5s
+    };
+
+    const userAgent = await DeviceInfo.getUserAgent();
+    Client4.setUserAgent(userAgent);
+
+    window.fetch = new RNFetchBlob.polyfill.Fetch(fetchConfig).build();
+
+    return true;
+};
+
+initFetchConfig();
+
+export default initFetchConfig;
diff --git a/app/init/global_event_handler.ts b/app/init/global_event_handler.ts
index 6dc98c974..1c971d104 100644
--- a/app/init/global_event_handler.ts
+++ b/app/init/global_event_handler.ts
@@ -10,14 +10,15 @@ import LocalConfig from '@assets/config.json';
 import {Navigation} from '@constants';
 import {DEFAULT_LOCALE, getTranslations, resetMomentLocale, t} from '@i18n';
 import * as analytics from '@init/analytics';
-import {getAppCredentials, removeAppCredentials} from '@init/credentials';
+import {getServerCredentials, removeServerCredentials} from '@init/credentials';
+import {getLaunchPropsFromDeepLink, relaunchApp} from '@init/launch';
 import PushNotifications from '@init/push_notifications';
+import {LaunchType} from '@typings/launch';
 import {deleteFileCache} from '@utils/file';
 
 type LinkingCallbackArg = {url: string};
 
 class GlobalEventHandler {
-    launchApp: launchAppFunc | undefined;
     JavascriptAndNativeErrorHandler: jsAndNativeErrorHandler | undefined;
 
     constructor() {
@@ -29,9 +30,7 @@ class GlobalEventHandler {
         Linking.addEventListener('url', this.onDeepLink);
     }
 
-    configure = (opts: GlobalEventHandlerOpts) => {
-        this.launchApp = opts.launchApp;
-
+    init = () => {
         this.JavascriptAndNativeErrorHandler = require('@utils/error_handling').default;
         this.JavascriptAndNativeErrorHandler?.initializeErrorHandling();
     };
@@ -48,11 +47,9 @@ class GlobalEventHandler {
     };
 
     onDeepLink = (event: LinkingCallbackArg) => {
-        const {url} = event;
-        if (url) {
-            // TODO: Handle deeplink
-            // if server is not added go to add new server screen
-            // if server is added but no credentials found take to server login screen
+        if (event.url) {
+            const props = getLaunchPropsFromDeepLink(event.url);
+            relaunchApp(props);
         }
     };
 
@@ -125,8 +122,9 @@ class GlobalEventHandler {
             analytics.invalidate(serverUrl);
         }
 
-        // TODO: remove credentials and files for the server
-        removeAppCredentials();
+        removeServerCredentials(serverUrl);
+
+        // TODO: remove files for the server
         deleteFileCache();
         PushNotifications.clearNotifications();
 
@@ -136,11 +134,7 @@ class GlobalEventHandler {
 
         await this.clearCookiesAndWebData();
 
-        if (this.launchApp) {
-            this.launchApp(true);
-        }
-
-        // TODO: Remove the database
+        relaunchApp({launchType: LaunchType.Normal});
     };
 
     onServerConfigChanged = (serverUrl: string, config: ClientConfig) => {
@@ -178,7 +172,7 @@ class GlobalEventHandler {
     };
 
     serverUpgradeNeeded = async (serverUrl: string) => {
-        const credentials = await getAppCredentials();
+        const credentials = await getServerCredentials(serverUrl);
 
         if (credentials) {
             this.onLogout(serverUrl);
diff --git a/app/init/launch.ts b/app/init/launch.ts
new file mode 100644
index 000000000..1310501aa
--- /dev/null
+++ b/app/init/launch.ts
@@ -0,0 +1,146 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Linking} from 'react-native';
+import {Notifications} from 'react-native-notifications';
+
+import {Screens} from '@constants';
+import {getActiveServerCredentials, getServerCredentials} from '@init/credentials';
+import {goToScreen, resetToChannel, resetToSelectServer} from '@screens/navigation';
+import {DeepLinkChannel, DeepLinkDM, DeepLinkGM, DeepLinkPermalink, DeepLinkType, DeepLinkWithData, LaunchProps, LaunchType} from '@typings/launch';
+import {parseDeepLink} from '@utils/url';
+
+export const initialLaunch = async () => {
+    const deepLinkUrl = await Linking.getInitialURL();
+    if (deepLinkUrl) {
+        launchAppFromDeepLink(deepLinkUrl);
+        return;
+    }
+
+    const notification = await Notifications.getInitialNotification();
+    if (notification) {
+        launchAppFromNotification(notification);
+        return;
+    }
+
+    launchApp({launchType: LaunchType.Normal});
+};
+
+const launchAppFromDeepLink = (deepLinkUrl: string) => {
+    const props = getLaunchPropsFromDeepLink(deepLinkUrl);
+    launchApp(props);
+};
+
+const launchAppFromNotification = (notification: NotificationWithData) => {
+    const props = getLaunchPropsFromNotification(notification);
+    launchApp(props);
+};
+
+const launchApp = async (props: LaunchProps, resetNavigation = true) => {
+    let serverUrl;
+    switch (props?.launchType) {
+        case LaunchType.DeepLink:
+            if (props.extra?.type !== DeepLinkType.Invalid) {
+                const extra = props.extra as DeepLinkWithData;
+                serverUrl = extra.data?.serverUrl;
+            }
+            break;
+        case LaunchType.Notification: {
+            const extra = props.extra as NotificationWithData;
+            serverUrl = extra.payload?.server_url;
+            break;
+        }
+    }
+
+    const credentials = serverUrl ? await getServerCredentials(serverUrl) : await getActiveServerCredentials();
+
+    if (credentials) {
+        launchToChannel(props, resetNavigation);
+        return;
+    }
+
+    launchToServer(props, resetNavigation);
+};
+
+const launchToChannel = (props: LaunchProps, resetNavigation: Boolean) => {
+    // TODO: Use LaunchProps to fetch posts for channel and then load user profile, etc...
+
+    const passProps = {
+        skipMetrics: true,
+        ...props,
+    };
+
+    if (resetNavigation) {
+        // eslint-disable-next-line no-console
+        console.log('Launch app in Channel screen');
+        resetToChannel(passProps);
+        return;
+    }
+
+    const title = '';
+    goToScreen(Screens.CHANNEL, title, passProps);
+};
+
+const launchToServer = (props: LaunchProps, resetNavigation: Boolean) => {
+    if (resetNavigation) {
+        resetToSelectServer(props);
+        return;
+    }
+
+    const title = '';
+    goToScreen(Screens.SERVER, title, {...props});
+};
+
+export const relaunchApp = (props: LaunchProps) => {
+    launchApp(props, false);
+};
+
+export const getLaunchPropsFromDeepLink = (deepLinkUrl: string): LaunchProps => {
+    const parsed = parseDeepLink(deepLinkUrl);
+    const launchProps: LaunchProps = {
+        launchType: LaunchType.DeepLink,
+    };
+
+    switch (parsed.type) {
+        case DeepLinkType.Invalid:
+            launchProps.launchError = true;
+            break;
+        case DeepLinkType.Channel: {
+            const parsedData = parsed.data as DeepLinkChannel;
+            (launchProps.extra as DeepLinkWithData).data = parsedData;
+            break;
+        }
+        case DeepLinkType.DirectMessage: {
+            const parsedData = parsed.data as DeepLinkDM;
+            (launchProps.extra as DeepLinkWithData).data = parsedData;
+            break;
+        }
+        case DeepLinkType.GroupMessage: {
+            const parsedData = parsed.data as DeepLinkGM;
+            (launchProps.extra as DeepLinkWithData).data = parsedData;
+            break;
+        }
+        case DeepLinkType.Permalink: {
+            const parsedData = parsed.data as DeepLinkPermalink;
+            (launchProps.extra as DeepLinkWithData).data = parsedData;
+            break;
+        }
+    }
+
+    return launchProps;
+};
+
+export const getLaunchPropsFromNotification = (notification: NotificationWithData): LaunchProps => {
+    const {payload} = notification;
+    const launchProps: LaunchProps = {
+        launchType: LaunchType.Notification,
+    };
+
+    if (payload?.server_url) {
+        (launchProps.extra as NotificationWithData) = notification;
+    } else {
+        launchProps.launchError = true;
+    }
+
+    return launchProps;
+};
diff --git a/app/init/managed_app.ts b/app/init/managed_app.ts
new file mode 100644
index 000000000..6c5bc8ba7
--- /dev/null
+++ b/app/init/managed_app.ts
@@ -0,0 +1,190 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import Emm, {ManagedConfig} from '@mattermost/react-native-emm';
+import {Alert, AlertButton, AppState, AppStateStatus, Platform} from 'react-native';
+import JailMonkey from 'jail-monkey';
+
+import {DEFAULT_LOCALE, getTranslations, t} from '@i18n';
+import {getIOSAppGroupDetails} from '@utils/mattermost_managed';
+
+const PROMPT_IN_APP_PIN_CODE_AFTER = 5 * 1000;
+
+class ManagedApp {
+    backgroundSince = 0;
+    enabled = false;
+    inAppPinCode = false;
+    performingAuthentication = false;
+    previousAppState?: AppStateStatus;
+    processConfigTimeout?: NodeJS.Timeout;
+    vendor = 'Mattermost';
+
+    constructor() {
+        Emm.addListener(this.processConfig);
+
+        this.setIOSAppGroupIdentifier();
+
+        AppState.addEventListener('change', this.onAppStateChange);
+    }
+
+    init() {
+        Emm.getManagedConfig().then(this.processConfig);
+    }
+
+    setIOSAppGroupIdentifier = () => {
+        if (Platform.OS === 'ios') {
+            const {appGroupIdentifier} = getIOSAppGroupDetails();
+
+            if (appGroupIdentifier) {
+                Emm.setAppGroupId(appGroupIdentifier);
+            }
+        }
+    }
+
+    processConfig = async (config?: ManagedConfig) => {
+        // If the managed configuration changed while authentication was
+        // being performed, delay the processing of this new configuration
+        // until authentication is complete.
+        if (this.performingAuthentication) {
+            if (this.processConfigTimeout) {
+                clearTimeout(this.processConfigTimeout);
+            }
+
+            this.processConfigTimeout = setTimeout(() => this.processConfig(config), 500);
+        }
+
+        this.enabled = Boolean(config && Object.keys(config).length);
+        if (!this.enabled) {
+            return;
+        }
+
+        const blurScreen = config!.blurApplicationScreen === 'true';
+        Emm.enableBlurScreen(blurScreen);
+
+        const vendor = config!.vendor;
+        if (vendor) {
+            this.vendor = vendor;
+        }
+
+        const jailbreakProtection = config!.jailbreakProtection === 'true';
+        if (jailbreakProtection && !this.isTrustedDevice()) {
+            this.alertDeviceIsUntrusted();
+            return;
+        }
+
+        const inAppPinCode = config!.inAppPinCode === 'true';
+        if (inAppPinCode) {
+            this.handleDeviceAuthentication();
+        }
+    };
+
+    alertDeviceIsUntrusted = () => {
+        const locale = DEFAULT_LOCALE; // TODO: Get current user or system locale
+        const translations = getTranslations(locale);
+        Alert.alert(
+            translations[t('mobile.managed.blocked_by')].replace('{vendor}', this.vendor),
+            translations[t('mobile.managed.jailbreak')].replace('{vendor}', this.vendor),
+            [{
+                text: translations[t('mobile.managed.exit')],
+                style: 'destructive',
+                onPress: () => {
+                    Emm.exitApp();
+                },
+            }],
+            {cancelable: false},
+        );
+    };
+
+    handleDeviceAuthentication = async (authExpired = true) => {
+        this.performingAuthentication = true;
+        const isSecured = await Emm.isDeviceSecured();
+        const locale = DEFAULT_LOCALE;
+        const translations = getTranslations(locale);
+
+        if (!isSecured) {
+            await this.showNotSecuredAlert(translations);
+            Emm.exitApp();
+            return;
+        }
+
+        if (authExpired) {
+            try {
+                await Emm.authenticate({
+                    reason: translations[t('mobile.managed.secured_by')].replace('{vendor}', this.vendor),
+                    fallback: true,
+                    supressEnterPassword: true,
+                });
+            } catch (err) {
+                Emm.exitApp();
+                return;
+            }
+        }
+
+        this.performingAuthentication = false;
+    };
+
+    isTrustedDevice = () => {
+        return __DEV__ || JailMonkey.trustFall();
+    };
+
+    onAppStateChange = async (appState: AppStateStatus) => {
+        const isActive = appState === 'active';
+        const isBackground = appState === 'background';
+
+        if (isActive && this.previousAppState === 'background') {
+            if (this.enabled && this.inAppPinCode) {
+                const authExpired = this.backgroundSince > 0 && (Date.now() - this.backgroundSince) >= PROMPT_IN_APP_PIN_CODE_AFTER;
+                await this.handleDeviceAuthentication(authExpired);
+            }
+
+            this.backgroundSince = 0;
+        } else if (isBackground) {
+            this.backgroundSince = Date.now();
+        }
+
+        this.previousAppState = appState;
+    };
+
+    showNotSecuredAlert = (translations: Record<string, string>) => {
+        return new Promise(async (resolve) => { /* eslint-disable-line no-async-promise-executor */
+            const buttons: AlertButton[] = [];
+
+            if (Platform.OS === 'android') {
+                buttons.push({
+                    text: translations[t('mobile.managed.settings')],
+                    onPress: () => {
+                        Emm.openSecuritySettings();
+                    },
+                });
+            }
+
+            buttons.push({
+                text: translations[t('mobile.managed.exit')],
+                onPress: resolve,
+                style: 'cancel',
+            });
+
+            let message;
+            if (Platform.OS === 'ios') {
+                const {face} = await Emm.deviceSecureWith();
+
+                if (face) {
+                    message = translations[t('mobile.managed.not_secured.ios')];
+                } else {
+                    message = translations[t('mobile.managed.not_secured.ios.touchId')];
+                }
+            } else {
+                message = translations[t('mobile.managed.not_secured.android')];
+            }
+
+            Alert.alert(
+                translations[t('mobile.managed.blocked_by')].replace('{vendor}', this.vendor),
+                message,
+                buttons,
+                {cancelable: false, onDismiss: () => resolve},
+            );
+        });
+    };
+}
+
+export default new ManagedApp();
diff --git a/app/init/push_notifications.ts b/app/init/push_notifications.ts
index 6eeb99c0a..782ff44ca 100644
--- a/app/init/push_notifications.ts
+++ b/app/init/push_notifications.ts
@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {DEFAULT_LOCALE, getLocalizedMessage, t} from '@i18n';
+import {getActiveServerDatabase} from '@utils/database';
 import {AppState, AppStateStatus, DeviceEventEmitter, EmitterSubscription, Platform} from 'react-native';
 import DeviceInfo from 'react-native-device-info';
 import {
@@ -14,11 +16,12 @@ import {
     Registered,
 } from 'react-native-notifications';
 
-import {dismissAllModals, popToRoot, showOverlay} from '@screens/navigation';
 import {Device, Navigation, View} from '@constants';
-import {DEFAULT_LOCALE, getLocalizedMessage, t} from '@i18n';
-import EphemeralStore from '@store/ephemeral_store';
+import Operator from '@database/operator';
+import {getLaunchPropsFromNotification, relaunchApp} from '@init/launch';
 import NativeNotifications from '@notifications';
+import {showOverlay} from '@screens/navigation';
+import {IsolatedEntities} from '@typings/database/enums';
 
 const CATEGORY = 'CAN_REPLY';
 const REPLY_ACTION = 'REPLY_ACTION';
@@ -28,217 +31,217 @@ const NOTIFICATION_TYPE = {
     SESSION: 'session',
 };
 
+//todo:  Do we need Ephemeral store?  Should we refactor this file ?
+
 class PushNotifications {
-    configured = false;
-    pushNotificationListener: EmitterSubscription | undefined;
+  configured = false;
+  pushNotificationListener: EmitterSubscription | undefined;
 
-    constructor() {
-        Notifications.registerRemoteNotifications();
-        Notifications.events().registerNotificationOpened(this.onNotificationOpened);
-        Notifications.events().registerRemoteNotificationsRegistered(this.onRemoteNotificationsRegistered);
-        Notifications.events().registerNotificationReceivedBackground(this.onNotificationReceivedBackground);
-        Notifications.events().registerNotificationReceivedForeground(this.onNotificationReceivedForeground);
-        AppState.addEventListener('change', this.onAppStateChange);
+  constructor() {
+      Notifications.registerRemoteNotifications();
+      Notifications.events().registerNotificationOpened(this.onNotificationOpened);
+      Notifications.events().registerRemoteNotificationsRegistered(this.onRemoteNotificationsRegistered);
+      Notifications.events().registerNotificationReceivedBackground(this.onNotificationReceivedBackground);
+      Notifications.events().registerNotificationReceivedForeground(this.onNotificationReceivedForeground);
+      AppState.addEventListener('change', this.onAppStateChange);
+  }
 
-        this.getInitialNotification();
-    }
+  cancelAllLocalNotifications = () => {
+      Notifications.cancelAllLocalNotifications();
+  };
 
-    cancelAllLocalNotifications = () => {
-        Notifications.cancelAllLocalNotifications();
-    };
+  clearNotifications = () => {
+      this.setApplicationIconBadgeNumber(0);
 
-    clearNotifications = () => {
-        this.setApplicationIconBadgeNumber(0);
+      // TODO: Only cancel the local notifications that belong to this server
+      this.cancelAllLocalNotifications();
+  };
 
-        // TODO: Only cancel the local notifications that belong to this server
-        this.cancelAllLocalNotifications();
-    };
+  clearChannelNotifications = async (channelId: string) => {
+      const notifications = await NativeNotifications.getDeliveredNotifications();
+      if (Platform.OS === 'android') {
+          const notificationForChannel = notifications.find(
+              (n: NotificationWithChannel) => n.channel_id === channelId,
+          );
+          if (notificationForChannel) {
+              NativeNotifications.removeDeliveredNotifications(
+                  notificationForChannel.identifier,
+                  channelId,
+              );
+          }
+      } else {
+          const ids: string[] = [];
+          const badgeCount = notifications.length;
 
-    clearChannelNotifications = async (channelId: string) => {
-        const notifications = await NativeNotifications.getDeliveredNotifications();
-        if (Platform.OS === 'android') {
-            const notificationForChannel = notifications.find((n: NotificationWithChannel) => n.channel_id === channelId);
-            if (notificationForChannel) {
-                NativeNotifications.removeDeliveredNotifications(notificationForChannel.identifier, channelId);
-            }
-        } else {
-            const ids: string[] = [];
-            const badgeCount = notifications.length;
+          // TODO: Set the badgeCount with default database mention count aggregate
 
-            // TODO: Set the badgeCount with default database mention count aggregate
+          for (const notification of notifications) {
+              if (notification.channel_id === channelId) {
+                  ids.push(notification.identifier);
+              }
+          }
 
-            for (let i = 0; i < notifications.length; i++) {
-                const notification = notifications[i];
-                if (notification.channel_id === channelId) {
-                    ids.push(notification.identifier);
-                }
-            }
+          if (ids.length) {
+              NativeNotifications.removeDeliveredNotifications(ids);
+          }
 
-            if (ids.length) {
-                NativeNotifications.removeDeliveredNotifications(ids);
-            }
+          this.setApplicationIconBadgeNumber(badgeCount);
+      }
+  };
 
-            this.setApplicationIconBadgeNumber(badgeCount);
-        }
-    };
+  createReplyCategory = () => {
+      const locale = DEFAULT_LOCALE; // TODO: Get the current user locale to replace the old getCurrentLocale(state);
 
-    createReplyCategory = () => {
-        const locale = DEFAULT_LOCALE; // TODO: Get the current user locale to replace the old getCurrentLocale(state);
+      const replyTitle = getLocalizedMessage(locale, t('mobile.push_notification_reply.title'));
+      const replyButton = getLocalizedMessage(locale, t('mobile.push_notification_reply.button'));
+      const replyPlaceholder = getLocalizedMessage(locale, t('mobile.push_notification_reply.placeholder'));
+      const replyTextInput: NotificationTextInput = {buttonTitle: replyButton, placeholder: replyPlaceholder};
+      const replyAction = new NotificationAction(REPLY_ACTION, 'background', replyTitle, true, replyTextInput);
+      return new NotificationCategory(CATEGORY, [replyAction]);
+  };
 
-        const replyTitle = getLocalizedMessage(locale, t('mobile.push_notification_reply.title'));
-        const replyButton = getLocalizedMessage(locale, t('mobile.push_notification_reply.button'));
-        const replyPlaceholder = getLocalizedMessage(locale, t('mobile.push_notification_reply.placeholder'));
-        const replyTextInput: NotificationTextInput = {
-            buttonTitle: replyButton,
-            placeholder: replyPlaceholder,
-        };
-        const replyAction = new NotificationAction(REPLY_ACTION, 'background', replyTitle, true, replyTextInput);
-        return new NotificationCategory(CATEGORY, [replyAction]);
-    };
+  handleNotification = async (notification: NotificationWithData) => {
+      const {payload, foreground, userInteraction} = notification;
 
-    getInitialNotification = async () => {
-        const notification: NotificationWithData | undefined = await Notifications.getInitialNotification();
+      if (payload) {
+          switch (payload.type) {
+              case NOTIFICATION_TYPE.CLEAR:
+                  // Mark the channel as read
+                  break;
+              case NOTIFICATION_TYPE.MESSAGE:
+                  // fetch the posts for the channel
 
-        if (notification) {
-            EphemeralStore.setStartFromNotification(true);
-            notification.userInteraction = true;
-            this.handleNotification(notification);
-        }
-    };
+                  if (foreground) {
+                      // Show the in-app notification
+                  } else if (userInteraction && !payload.userInfo?.local) {
+                      const props = getLaunchPropsFromNotification(notification);
+                      relaunchApp(props);
+                  }
+                  break;
+              case NOTIFICATION_TYPE.SESSION:
+                  // eslint-disable-next-line no-console
+                  console.log('Session expired notification');
 
-    handleNotification = async (notification: NotificationWithData) => {
-        const {payload, foreground, userInteraction} = notification;
+                  // Logout the user from the server that matches the notification
 
-        if (payload) {
-            switch (payload.type) {
-                case NOTIFICATION_TYPE.CLEAR:
-                // Mark the channel as read
-                    break;
-                case NOTIFICATION_TYPE.MESSAGE:
-                // fetch the posts for the channel
+                  break;
+          }
+      }
+  };
 
-                    if (foreground) {
-                    // Show the in-app notification
-                    } else if (userInteraction && !payload.userInfo?.local) {
-                    // Swith to the server / team / channel that matches the notification
+  handleInAppNotification = async (notification: NotificationWithData) => {
+      const {payload} = notification;
 
-                        const componentId = EphemeralStore.getNavigationTopComponentId();
-                        if (componentId) {
-                        // Emit events to close the sidebars
+      // TODO: Get current channel from the database
+      const currentChannelId = '';
 
-                            await dismissAllModals();
-                            await popToRoot();
-                        }
-                    }
-                    break;
-                case NOTIFICATION_TYPE.SESSION:
-                // eslint-disable-next-line no-console
-                    console.log('Session expired notification');
+      if (payload?.channel_id !== currentChannelId) {
+          const screen = 'Notification';
+          const passProps = {
+              notification,
+          };
 
-                    // Logout the user from the server that matches the notification
+          DeviceEventEmitter.emit(Navigation.NAVIGATION_SHOW_OVERLAY);
+          showOverlay(screen, passProps);
+      }
+  };
 
-                    break;
-            }
-        }
-    };
+  localNotification = (notification: Notification) => {
+      Notifications.postLocalNotification(notification);
+  };
 
-    handleInAppNotification = async (notification: NotificationWithData) => {
-        const {payload} = notification;
+  onAppStateChange = (appState: AppStateStatus) => {
+      const isActive = appState === 'active';
+      const isBackground = appState === 'background';
 
-        // TODO: Get current channel from the database
-        const currentChannelId = '';
+      if (isActive) {
+          if (!this.pushNotificationListener) {
+              this.pushNotificationListener = DeviceEventEmitter.addListener(
+                  View.NOTIFICATION_IN_APP,
+                  this.handleInAppNotification,
+              );
+          }
+      } else if (isBackground) {
+          this.pushNotificationListener?.remove();
+          this.pushNotificationListener = undefined;
+      }
+  };
 
-        if (payload?.channel_id !== currentChannelId) {
-            const screen = 'Notification';
-            const passProps = {
-                notification,
-            };
+  onNotificationOpened = (notification: NotificationWithData, completion: () => void) => {
+      notification.userInteraction = true;
+      this.handleNotification(notification);
+      completion();
+  };
 
-            DeviceEventEmitter.emit(Navigation.NAVIGATION_SHOW_OVERLAY);
-            showOverlay(screen, passProps);
-        }
-    }
+  onNotificationReceivedBackground = (notification: NotificationWithData, completion: (response: NotificationBackgroundFetchResult) => void) => {
+      this.handleNotification(notification);
+      completion(NotificationBackgroundFetchResult.NO_DATA);
+  };
 
-    localNotification = (notification: Notification) => {
-        Notifications.postLocalNotification(notification);
-    };
+  onNotificationReceivedForeground = (notification: NotificationWithData, completion: (response: NotificationCompletion) => void) => {
+      notification.foreground = AppState.currentState === 'active';
+      completion({alert: false, sound: true, badge: true});
+      this.handleNotification(notification);
+  };
 
-    onAppStateChange = (appState: AppStateStatus) => {
-        const isActive = appState === 'active';
-        const isBackground = appState === 'background';
+  onRemoteNotificationsRegistered = async (event: Registered) => {
+      if (!this.configured) {
+          this.configured = true;
+          const {deviceToken} = event;
+          let prefix;
 
-        if (isActive) {
-            if (!this.pushNotificationListener) {
-                this.pushNotificationListener = DeviceEventEmitter.addListener(View.NOTIFICATION_IN_APP, this.handleInAppNotification);
-            }
-        } else if (isBackground) {
-            this.pushNotificationListener?.remove();
-            this.pushNotificationListener = undefined;
-        }
-    };
+          if (Platform.OS === 'ios') {
+              prefix = Device.PUSH_NOTIFY_APPLE_REACT_NATIVE;
+              if (DeviceInfo.getBundleId().includes('rnbeta')) {
+                  prefix = `${prefix}beta`;
+              }
+          } else {
+              prefix = Device.PUSH_NOTIFY_ANDROID_REACT_NATIVE;
+          }
 
-    onNotificationOpened = (notification: NotificationWithData, completion: () => void) => {
-        notification.userInteraction = true;
-        this.handleNotification(notification);
-        completion();
-    };
+          const {activeServerDatabase, error} = await getActiveServerDatabase();
 
-    onNotificationReceivedBackground = (notification: NotificationWithData, completion: (response: NotificationBackgroundFetchResult) => void) => {
-        this.handleNotification(notification);
-        completion(NotificationBackgroundFetchResult.NO_DATA);
-    };
+          if (!activeServerDatabase) {
+              return {error};
+          }
 
-    onNotificationReceivedForeground = (notification: NotificationWithData, completion: (response: NotificationCompletion) => void) => {
-        notification.foreground = AppState.currentState === 'active';
-        completion({alert: false, sound: true, badge: true});
-        this.handleNotification(notification);
-    };
+          const operator = new Operator(activeServerDatabase);
 
-    onRemoteNotificationsRegistered = (event: Registered) => {
-        if (!this.configured) {
-            this.configured = true;
-            const {deviceToken} = event;
-            let prefix;
+          operator.handleIsolatedEntity({
+              tableName: IsolatedEntities.GLOBAL,
+              values: [{name: 'deviceToken', value: `${prefix}:${deviceToken}`}],
+              prepareRecordsOnly: false,
+          });
 
-            if (Platform.OS === 'ios') {
-                prefix = Device.PUSH_NOTIFY_APPLE_REACT_NATIVE;
-                if (DeviceInfo.getBundleId().includes('rnbeta')) {
-                    prefix = `${prefix}beta`;
-                }
-            } else {
-                prefix = Device.PUSH_NOTIFY_ANDROID_REACT_NATIVE;
-            }
+          // Store the device token in the default database
+          this.requestNotificationReplyPermissions();
+      }
+      return null;
+  };
 
-            EphemeralStore.deviceToken = `${prefix}:${deviceToken}`;
+  requestNotificationReplyPermissions = () => {
+      if (Platform.OS === 'ios') {
+          const replyCategory = this.createReplyCategory();
+          Notifications.setCategories([replyCategory]);
+      }
+  };
 
-            // Store the device token in the default database
-            this.requestNotificationReplyPermissions();
-        }
-    };
+  setApplicationIconBadgeNumber = (value: number) => {
+      if (Platform.OS === 'ios') {
+          const count = value < 0 ? 0 : value;
+          Notifications.ios.setBadgeCount(count);
+      }
+  };
 
-    requestNotificationReplyPermissions = () => {
-        if (Platform.OS === 'ios') {
-            const replyCategory = this.createReplyCategory();
-            Notifications.setCategories([replyCategory]);
-        }
-    };
+  scheduleNotification = (notification: Notification) => {
+      if (notification.fireDate) {
+          if (Platform.OS === 'ios') {
+              notification.fireDate = new Date(notification.fireDate).toISOString();
+          }
 
-    setApplicationIconBadgeNumber = (value: number) => {
-        if (Platform.OS === 'ios') {
-            const count = value < 0 ? 0 : value;
-            Notifications.ios.setBadgeCount(count);
-        }
-    };
-
-    scheduleNotification = (notification: Notification) => {
-        if (notification.fireDate) {
-            if (Platform.OS === 'ios') {
-                notification.fireDate = new Date(notification.fireDate).toISOString();
-            }
-
-            Notifications.postLocalNotification(notification);
-        }
-    };
+          Notifications.postLocalNotification(notification);
+      }
+  };
 }
 
 export default new PushNotifications();
diff --git a/app/mattermost.ts b/app/mattermost.ts
deleted file mode 100644
index 93af8b932..000000000
--- a/app/mattermost.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import {DeviceEventEmitter, Linking} from 'react-native';
-import {ComponentDidAppearEvent, ComponentDidDisappearEvent, Navigation} from 'react-native-navigation';
-
-import {Navigation as NavigationConstants, Screens} from '@constants';
-import {getAppCredentials} from '@init/credentials';
-import emmProvider from '@init/emm_provider';
-import globalEventHandler from '@init/global_event_handler';
-import {registerScreens} from '@screens/index';
-import {resetToChannel, resetToSelectServer} from '@screens/navigation';
-import EphemeralStore from '@store/ephemeral_store';
-
-const init = () => {
-    if (EphemeralStore.appStarted) {
-        launchApp(true);
-        return;
-    }
-
-    globalEventHandler.configure({
-        launchApp,
-    });
-
-    registerScreens();
-
-    if (!EphemeralStore.appStarted) {
-        launchApp(false);
-    }
-};
-
-const launchApp = async (skipEmm: boolean) => {
-    if (!skipEmm) {
-        await emmProvider.handleManagedConfig();
-        if (emmProvider.enabled) {
-            if (emmProvider.jailbreakProtection) {
-                emmProvider.checkIfDeviceIsTrusted();
-            }
-
-            if (emmProvider.inAppPinCode) {
-                await emmProvider.handleAuthentication();
-            }
-        }
-    }
-
-    Linking.getInitialURL().then((url) => {
-        if (url) {
-            // TODO: Handle deeplink
-            // if server is not added go to add new server screen
-            // if server is added but no credentials found take to server login screen
-        }
-    });
-
-    const credentials = await getAppCredentials();
-    if (credentials) {
-        // TODO: Fetch posts for current channel and then load user profile, etc..
-
-        // eslint-disable-next-line no-console
-        console.log('Launch app in Channel screen');
-        resetToChannel({skipMetrics: true});
-    } else {
-        resetToSelectServer(emmProvider.allowOtherServers);
-    }
-
-    EphemeralStore.appStarted = true;
-};
-
-Navigation.events().registerAppLaunchedListener(() => {
-    init();
-
-    // Keep track of the latest componentId to appear/disappear
-    Navigation.events().registerComponentDidAppearListener(componentDidAppearListener);
-    Navigation.events().registerComponentDidDisappearListener(componentDidDisappearListener);
-});
-
-export function componentDidAppearListener({componentId}: ComponentDidAppearEvent) {
-    EphemeralStore.addNavigationComponentId(componentId);
-
-    switch (componentId) {
-        case 'MainSidebar':
-            DeviceEventEmitter.emit(NavigationConstants.MAIN_SIDEBAR_DID_OPEN, this.handleSidebarDidOpen);
-            DeviceEventEmitter.emit(NavigationConstants.BLUR_POST_DRAFT);
-            break;
-        case 'SettingsSidebar':
-            DeviceEventEmitter.emit(NavigationConstants.BLUR_POST_DRAFT);
-            break;
-    }
-}
-
-export function componentDidDisappearListener({componentId}: ComponentDidDisappearEvent) {
-    if (componentId !== Screens.CHANNEL) {
-        EphemeralStore.removeNavigationComponentId(componentId);
-    }
-
-    if (componentId === 'MainSidebar') {
-        DeviceEventEmitter.emit(NavigationConstants.MAIN_SIDEBAR_DID_CLOSE);
-    }
-}
diff --git a/app/queries/global.ts b/app/queries/global.ts
new file mode 100644
index 000000000..981d7ece4
--- /dev/null
+++ b/app/queries/global.ts
@@ -0,0 +1,13 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {MM_TABLES} from '@constants/database';
+import {Database, Q} from '@nozbe/watermelondb';
+import Global from '@typings/database/global';
+
+const {DEFAULT: {GLOBAL}} = MM_TABLES;
+
+export const getDeviceToken = async (defaultDatabase: Database) => {
+    const tokens = (await defaultDatabase.collections.get(GLOBAL).query(Q.where('name', 'deviceToken')).fetch()) as Global[];
+    return tokens?.[0]?.value ?? '';
+};
diff --git a/app/queries/role.ts b/app/queries/role.ts
new file mode 100644
index 000000000..ec89b0f5b
--- /dev/null
+++ b/app/queries/role.ts
@@ -0,0 +1,14 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Database} from '@nozbe/watermelondb';
+
+import {MM_TABLES} from '@constants/database';
+import Role from '@typings/database/role';
+
+const {SERVER: {ROLE}} = MM_TABLES;
+
+export const getRoles = async (database: Database) => {
+    const roles = await database.collections.get(ROLE).query().fetch() as Role[];
+    return roles;
+};
diff --git a/app/queries/system.ts b/app/queries/system.ts
new file mode 100644
index 000000000..f28da57e5
--- /dev/null
+++ b/app/queries/system.ts
@@ -0,0 +1,38 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Database, Q} from '@nozbe/watermelondb';
+
+import {MM_TABLES} from '@constants/database';
+import System from '@typings/database/system';
+
+const {SERVER: {SYSTEM}} = MM_TABLES;
+
+export const getCurrentUserId = async (serverDatabase: Database) => {
+    const currentUserId = await serverDatabase.collections.get(SYSTEM).query(Q.where('name', 'currentUserId')).fetch() as System[];
+    return currentUserId?.[0] ?? '';
+};
+
+export const getCommonSystemValues = async (database: Database) => {
+    const systemRecords = (await database.collections.get(SYSTEM).query(Q.where('name', Q.oneOf(['config', 'license', 'currentUserId']))).fetch()) as System[];
+    let config = {};
+    let license = {};
+    let currentUserId = '';
+    systemRecords.forEach((systemRecord) => {
+        if (systemRecord.name === 'config') {
+            config = systemRecord.value;
+        }
+        if (systemRecord.name === 'license') {
+            license = systemRecord.value;
+        }
+        if (systemRecord.name === 'currentUserId') {
+            currentUserId = systemRecord.value;
+        }
+    });
+
+    return {
+        currentUserId,
+        config,
+        license,
+    };
+};
diff --git a/app/queries/user.ts b/app/queries/user.ts
new file mode 100644
index 000000000..6612cbcb6
--- /dev/null
+++ b/app/queries/user.ts
@@ -0,0 +1,12 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Database, Q} from '@nozbe/watermelondb';
+
+import {MM_TABLES} from '@constants/database';
+import User from '@typings/database/user';
+
+export const getUserById = async ({userId, database}: { userId: string, database: Database}) => {
+    const userRecords = (await database.collections.get(MM_TABLES.SERVER.USER).query(Q.where('id', userId)).fetch()) as User[];
+    return userRecords?.[0];
+};
diff --git a/app/requests/local/systems.ts b/app/requests/local/systems.ts
new file mode 100644
index 000000000..1a5fda5b1
--- /dev/null
+++ b/app/requests/local/systems.ts
@@ -0,0 +1,84 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import Operator from '@database/operator';
+import {ServerUrlChangedArgs} from '@typings/database/database';
+import {IsolatedEntities} from '@typings/database/enums';
+import System from '@typings/database/system';
+import {getActiveServerDatabase} from '@utils/database';
+
+/**
+ * setLastUpgradeCheck: Takes in 'config' record from System entity and update its lastUpdateCheck to Date.now()
+ * @param {System} configRecord
+ * @returns {Promise<void>}
+ */
+export const setLastUpgradeCheck = async (configRecord: System) => {
+    const {activeServerDatabase: database, error} = await getActiveServerDatabase();
+    if (!database) {
+        return {error};
+    }
+
+    await database.action(async () => {
+        await configRecord.update((config) => {
+            config.value = {...configRecord.value, lastUpdateCheck: Date.now()};
+        });
+    });
+
+    return null;
+};
+
+export const handleServerUrlChanged = async ({configRecord, licenseRecord, selectServerRecord, serverUrl}: ServerUrlChangedArgs) => {
+    const {activeServerDatabase: database, error} = await getActiveServerDatabase();
+    if (!database) {
+        return {error};
+    }
+
+    await database.action(async () => {
+        await database.batch(
+            ...[
+                configRecord.prepareUpdate((config: System) => {
+                    config.value = {};
+                }),
+                licenseRecord.prepareUpdate((license: System) => {
+                    license.value = {};
+                }),
+                selectServerRecord.prepareUpdate((server: System) => {
+                    server.value = {...server.value, serverUrl};
+                }),
+            ],
+        );
+    });
+
+    return null;
+};
+
+export const createSessions = async (sessions: any) => {
+    const {activeServerDatabase: database, error} = await getActiveServerDatabase();
+    if (!database) {
+        return {error};
+    }
+    const operator = new Operator(database);
+    await operator.handleIsolatedEntity({
+        tableName: IsolatedEntities.SYSTEM,
+        values: [{
+
+            // id: string; // todo: to confirm value for session id ?
+            name: 'sessions',
+            value: sessions,
+        }],
+        prepareRecordsOnly: false,
+    });
+    return null;
+};
+
+export const setDeepLinkUrl = async (url: string) => {
+    const operator = new Operator();
+    await operator.handleIsolatedEntity({
+        tableName: IsolatedEntities.GLOBAL,
+        values: [{
+            name: 'deepLinkUrl',
+            value: url,
+        }],
+        prepareRecordsOnly: false,
+    });
+};
diff --git a/app/requests/local/timezone.ts b/app/requests/local/timezone.ts
new file mode 100644
index 000000000..ea4a17244
--- /dev/null
+++ b/app/requests/local/timezone.ts
@@ -0,0 +1,56 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {getTimeZone} from 'react-native-localize';
+
+import {getUserById} from '@queries/user';
+import {updateMe} from '@requests/remote/user';
+import {Config} from '@typings/database/config';
+import User from '@typings/database/user';
+import {getActiveServerDatabase} from '@utils/database';
+
+export const isTimezoneEnabled = (config: Partial<Config>) => {
+    return config?.ExperimentalTimezone === 'true';
+};
+
+export function getDeviceTimezone() {
+    return getTimeZone();
+}
+
+export const autoUpdateTimezone = async ({deviceTimezone, userId}: {deviceTimezone: string, userId: string}) => {
+    const {activeServerDatabase, error} = await getActiveServerDatabase();
+    if (!activeServerDatabase) {
+        return {error};
+    }
+
+    const currentUser = await getUserById({userId, database: activeServerDatabase}) ?? null;
+
+    if (!currentUser) {
+        return null;
+    }
+
+    const currentTimezone = getUserTimezone(currentUser);
+    const newTimezoneExists = currentTimezone.automaticTimezone !== deviceTimezone;
+
+    if (currentTimezone.useAutomaticTimezone && newTimezoneExists) {
+        const timezone = {useAutomaticTimezone: 'true', automaticTimezone: deviceTimezone, manualTimezone: currentTimezone.manualTimezone};
+        const updatedUser = {...currentUser, timezone} as User;
+        await updateMe(updatedUser);
+    }
+    return null;
+};
+
+export const getUserTimezone = (currentUser: User) => {
+    if (currentUser?.timezone) {
+        return {
+            ...currentUser?.timezone,
+            useAutomaticTimezone: currentUser?.timezone?.useAutomaticTimezone === 'true',
+        };
+    }
+
+    return {
+        useAutomaticTimezone: true,
+        automaticTimezone: '',
+        manualTimezone: '',
+    };
+};
diff --git a/app/requests/remote/error.ts b/app/requests/remote/error.ts
new file mode 100644
index 000000000..52adbeb51
--- /dev/null
+++ b/app/requests/remote/error.ts
@@ -0,0 +1,39 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+//fixme: to be completed in next PR.
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const logError = (_e: any) => null;
+
+// export const logError = async (error: Error, displayable = false) => {
+// if (error?.server_error_id === 'api.context.session_expired.app_error') {
+//     return {data: true};
+// }
+//
+// const serializedError = serializeError(error);
+//
+// let sendToServer = true;
+// if (error.stack && error.stack.includes('TypeError: Failed to fetch')) {
+//     sendToServer = false;
+// }
+// if (error?.server_error_id) {
+//     sendToServer = false;
+// }
+//
+// if (sendToServer) {
+//     try {
+//         const stringifiedSerializedError = JSON.stringify(serializedError).toString();
+//         await Client4.logClientError(stringifiedSerializedError);
+//     } catch (err) {
+//         // avoid crashing the app if an error sending
+//         // the error occurs.
+//     }
+// }
+//
+// EventEmitter.emit(ErrorTypes.LOG_ERROR, error);
+// dispatch(getLogErrorAction(serializedError, displayable));
+
+//     return {data: true};
+// };
+
diff --git a/app/requests/remote/general.ts b/app/requests/remote/general.ts
new file mode 100644
index 000000000..432deefda
--- /dev/null
+++ b/app/requests/remote/general.ts
@@ -0,0 +1,46 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Client4} from '@client/rest';
+
+export const doPing = async (serverUrl?: string) => {
+    let data;
+    const pingError = {
+        id: 'mobile.server_ping_failed',
+        defaultMessage: 'Cannot connect to the server. Please check your server URL and internet connection.',
+    };
+
+    try {
+        if (serverUrl) {
+            Client4.setUrl(serverUrl);
+        }
+
+        data = await Client4.ping();
+        if (data.status !== 'OK') {
+            // successful ping but not the right return {data}
+            return {error: {intl: pingError}};
+        }
+    } catch (error) {
+    // Client4Error
+        if (error.status_code === 401) {
+            // When the server requires a client certificate to connect.
+            return {error};
+        }
+        return {error: {intl: pingError}};
+    }
+
+    return {data};
+};
+
+export const fetchConfigAndLicense = async () => {
+    try {
+        const [config, license] = await Promise.all<ClientConfig, ClientLicense>([
+            Client4.getClientConfigOld(),
+            Client4.getClientLicenseOld(),
+        ]);
+
+        return {config, license};
+    } catch (error) {
+        return {error};
+    }
+};
diff --git a/app/requests/remote/push_notification.ts b/app/requests/remote/push_notification.ts
new file mode 100644
index 000000000..ed408d4fb
--- /dev/null
+++ b/app/requests/remote/push_notification.ts
@@ -0,0 +1,82 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import moment from 'moment-timezone';
+import {IntlShape} from 'react-intl';
+
+import {Client4} from '@client/rest';
+import PushNotifications from '@init/push_notifications';
+import {getCommonSystemValues} from '@queries/system';
+import {getSessions} from '@requests/remote/user';
+import {Config} from '@typings/database/config';
+import {getActiveServerDatabase} from '@utils/database';
+import {isMinimumServerVersion} from '@utils/helpers';
+
+const MAJOR_VERSION = 5;
+const MINOR_VERSION = 24;
+
+const sortByNewest = (a: any, b: any) => {
+    if (a.create_at > b.create_at) {
+        return -1;
+    }
+
+    return 1;
+};
+
+export const scheduleExpiredNotification = async (intl: IntlShape) => {
+    const {activeServerDatabase: database, error} = await getActiveServerDatabase();
+    if (!database) {
+        return {error};
+    }
+
+    const {currentUserId, config}: {currentUserId: string, config: Partial<Config>} = await getCommonSystemValues(database);
+
+    if (isMinimumServerVersion(Client4.serverVersion, MAJOR_VERSION, MINOR_VERSION) && config.ExtendSessionLengthWithActivity === 'true') {
+        PushNotifications.cancelAllLocalNotifications();
+        return null;
+    }
+
+    const timeOut = setTimeout(async () => {
+        clearTimeout(timeOut);
+        let sessions: any;
+
+        try {
+            sessions = await getSessions(currentUserId);
+        } catch (e) {
+            // console.warn('Failed to get current session', e);
+            return;
+        }
+
+        if (!Array.isArray(sessions?.data)) {
+            return;
+        }
+
+        const session = sessions.data.sort(sortByNewest)[0];
+        const expiresAt = session?.expires_at || 0; //eslint-disable-line camelcase
+        const expiresInDays = parseInt(String(Math.ceil(Math.abs(moment.duration(moment().diff(expiresAt)).asDays()))), 10);
+
+        const message = intl.formatMessage(
+            {
+                id: 'mobile.session_expired',
+                defaultMessage: 'Session Expired: Please log in to continue receiving notifications. Sessions for {siteName} are configured to expire every {daysCount, number} {daysCount, plural, one {day} other {days}}.'},
+            {
+                siteName: config.SiteName,
+                daysCount: expiresInDays,
+            },
+        );
+
+        if (expiresAt) {
+            PushNotifications.scheduleNotification({
+                fireDate: expiresAt,
+                body: message,
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                userInfo: {
+                    local: true,
+                },
+            });
+        }
+    }, 20000);
+
+    return null;
+};
diff --git a/app/requests/remote/role.ts b/app/requests/remote/role.ts
new file mode 100644
index 000000000..47fe72460
--- /dev/null
+++ b/app/requests/remote/role.ts
@@ -0,0 +1,39 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Client4} from '@client/rest';
+import Operator from '@database/operator';
+import {getRoles} from '@queries/role';
+import {IsolatedEntities} from '@typings/database/enums';
+import {getActiveServerDatabase} from '@utils/database';
+
+export const loadRolesIfNeeded = async (updatedRoles: string[]) => {
+    const {activeServerDatabase: database, error: e} = await getActiveServerDatabase();
+    if (!database) {
+        return {error: e};
+    }
+
+    const existingRoles = ((await getRoles(database)) as unknown) as Role[];
+
+    const roleNames = existingRoles.map((role) => {
+        return role.name;
+    });
+
+    const newRoles = updatedRoles.filter((newRole) => {
+        return !roleNames.includes(newRole);
+    });
+
+    try {
+        const operator = new Operator(database);
+        const data = await Client4.getRolesByNames(newRoles);
+        await operator.handleIsolatedEntity({
+            tableName: IsolatedEntities.ROLE,
+            values: data,
+            prepareRecordsOnly: false,
+        });
+    } catch (error) {
+        return {error};
+    }
+
+    return null;
+};
diff --git a/app/requests/remote/systems.ts b/app/requests/remote/systems.ts
new file mode 100644
index 000000000..11ee34b2f
--- /dev/null
+++ b/app/requests/remote/systems.ts
@@ -0,0 +1,22 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Client4} from '@client/rest';
+import {logError} from '@requests/remote/error';
+import {forceLogoutIfNecessary} from '@requests/remote/user';
+
+export const getDataRetentionPolicy = async () => {
+    let data = {};
+    try {
+        data = await Client4.getDataRetentionPolicy();
+    } catch (error) {
+        forceLogoutIfNecessary(error);
+
+        //fixme: do we care for the below line ?  It seems that the `error` object is never read ??
+        // dispatch(batchActions([{type: GeneralTypes.RECEIVED_DATA_RETENTION_POLICY, error,},]));
+        logError(error);
+        return {error};
+    }
+
+    return data;
+};
diff --git a/app/requests/remote/user.ts b/app/requests/remote/user.ts
new file mode 100644
index 000000000..40c6c9ffc
--- /dev/null
+++ b/app/requests/remote/user.ts
@@ -0,0 +1,386 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Client4} from '@client/rest';
+import Operator from '@database/operator';
+import analytics from '@init/analytics';
+import {setServerCredentials} from '@init/credentials';
+import {getDeviceToken} from '@queries/global';
+import {getCommonSystemValues, getCurrentUserId} from '@queries/system';
+import {createSessions} from '@requests/local/systems';
+import {autoUpdateTimezone, getDeviceTimezone, isTimezoneEnabled} from '@requests/local/timezone';
+import {logError} from '@requests/remote/error';
+import {loadRolesIfNeeded} from '@requests/remote/role';
+import {getDataRetentionPolicy} from '@requests/remote/systems';
+import {Client4Error} from '@typings/api/client4';
+import {Config} from '@typings/database/config';
+import {
+    LoadMeArgs,
+    LoginArgs,
+    RawMyTeam,
+    RawPreference,
+    RawRole,
+    RawTeam,
+    RawTeamMembership,
+    RawUser,
+} from '@typings/database/database';
+import {IsolatedEntities} from '@typings/database/enums';
+import {License} from '@typings/database/license';
+import Role from '@typings/database/role';
+import User from '@typings/database/user';
+import {createAndSetActiveDatabase, getActiveServerDatabase, getDefaultDatabase} from '@utils/database';
+import {getCSRFFromCookie} from '@utils/security';
+
+const HTTP_UNAUTHORIZED = 401;
+
+export const logout = async (skipServerLogout = false) => {
+    return async () => {
+        if (!skipServerLogout) {
+            try {
+                await Client4.logout();
+            } catch {
+                // Do nothing
+            }
+        }
+
+        //fixme: uncomment below EventEmitter.emit
+        // EventEmitter.emit(NavigationTypes.NAVIGATION_RESET);
+
+        return {data: true};
+    };
+};
+
+export const forceLogoutIfNecessary = async (err: Client4Error) => {
+    const {activeServerDatabase, error} = await getActiveServerDatabase();
+
+    if (!activeServerDatabase) {
+        return {error};
+    }
+
+    const currentUserId = await getCurrentUserId(activeServerDatabase);
+
+    if ('status_code' in err && err.status_code === HTTP_UNAUTHORIZED && err?.url?.indexOf('/login') === -1 && currentUserId) {
+        await logout(false);
+    }
+
+    return {error: null};
+};
+
+export const login = async ({ldapOnly = false, loginId, mfaToken, password}: LoginArgs) => {
+    let deviceToken;
+    let user;
+
+    const {error, defaultDatabase} = await getDefaultDatabase();
+    if (!defaultDatabase) {
+        return {error};
+    }
+
+    const url = Client4.getUrl();
+
+    try {
+        deviceToken = await getDeviceToken(defaultDatabase);
+        user = ((await Client4.login(
+            loginId,
+            password,
+            mfaToken,
+            deviceToken,
+            ldapOnly,
+        )) as unknown) as RawUser;
+
+        await createAndSetActiveDatabase({serverUrl: url});
+        await getCSRFFromCookie(Client4.getUrl());
+    } catch (e) {
+        return {error: e};
+    }
+
+    const result = await loadMe({user, deviceToken});
+
+    if (!result?.error) {
+        await completeLogin(user);
+    }
+
+    return result;
+};
+
+export const loadMe = async ({deviceToken, user}: LoadMeArgs) => {
+    let currentUser = user;
+
+    const {activeServerDatabase, error} = await getActiveServerDatabase();
+    if (!activeServerDatabase) {
+        return {
+            error,
+            currentUser: undefined,
+        };
+    }
+
+    try {
+        if (deviceToken) {
+            await Client4.attachDevice(deviceToken);
+        }
+
+        if (!currentUser) {
+            currentUser = ((await Client4.getMe()) as unknown) as RawUser;
+        }
+    } catch (e) {
+        await forceLogoutIfNecessary(e);
+        return {
+            error: e,
+            currentUser: undefined,
+        };
+    }
+
+    try {
+        const analyticsClient = analytics.create(Client4.getUrl());
+        analyticsClient.setUserId(currentUser.id);
+        analyticsClient.setUserRoles(currentUser.roles);
+
+        //todo: Ask for a unified endpoint that will serve all those values in one go.( while ensuring backward-compatibility through fallbacks to previous code-path)
+        const teamsRequest = Client4.getMyTeams();
+
+        // Goes into myTeam table
+        const teamMembersRequest = Client4.getMyTeamMembers();
+        const teamUnreadRequest = Client4.getMyTeamUnreads();
+
+        const preferencesRequest = Client4.getMyPreferences();
+        const configRequest = Client4.getClientConfigOld();
+        const licenseRequest = Client4.getClientLicenseOld();
+
+        const [
+            teams,
+            teamMembers,
+            teamUnreads,
+            preferences,
+            config,
+            license,
+        ] = await Promise.all([
+            teamsRequest,
+            teamMembersRequest,
+            teamUnreadRequest,
+            preferencesRequest,
+            configRequest,
+            licenseRequest,
+        ]);
+
+        const operator = new Operator(activeServerDatabase);
+
+        const teamRecords = operator.handleTeam({prepareRecordsOnly: true, teams: teams as RawTeam[]});
+
+        const teamMembershipRecords = operator.handleTeamMemberships({prepareRecordsOnly: true, teamMemberships: (teamMembers as unknown) as RawTeamMembership[]});
+
+        const myTeams = teamUnreads.map((unread) => {
+            const matchingTeam = teamMembers.find((team) => team.team_id === unread.team_id);
+            return {team_id: unread.team_id, roles: matchingTeam?.roles ?? '', is_unread: unread.msg_count > 0, mentions_count: unread.mention_count};
+        });
+
+        const myTeamRecords = operator.handleMyTeam({
+            prepareRecordsOnly: true,
+            myTeams: (myTeams as unknown) as RawMyTeam[],
+        });
+
+        const systemRecords = operator.handleIsolatedEntity({
+            tableName: IsolatedEntities.SYSTEM,
+            values: [
+                {
+                    name: 'config',
+                    value: config,
+                },
+                {
+                    name: 'license',
+                    value: license,
+                },
+                {
+                    name: 'currentUserId',
+                    value: currentUser.id,
+                },
+                {
+                    name: 'url',
+                    value: Client4.getUrl(),
+                },
+            ],
+            prepareRecordsOnly: true,
+        });
+
+        const userRecords = operator.handleUsers({
+            users: [currentUser],
+            prepareRecordsOnly: true,
+        });
+
+        const preferenceRecords = operator.handlePreferences({
+            prepareRecordsOnly: true,
+            preferences: (preferences as unknown) as RawPreference[],
+        });
+
+        let roles: string[] = [];
+        for (const role of currentUser.roles.split(' ')) {
+            roles = roles.concat(role);
+        }
+
+        for (const teamMember of teamMembers) {
+            roles = roles.concat(teamMember.roles.split(' '));
+        }
+
+        const rolesToLoad = new Set<string>(roles);
+
+        let rolesRecords: Role[] = [];
+        if (rolesToLoad.size > 0) {
+            const rolesByName = ((await Client4.getRolesByNames(Array.from(rolesToLoad))) as unknown) as RawRole[];
+
+            if (rolesByName?.length) {
+                rolesRecords = operator.handleIsolatedEntity({tableName: IsolatedEntities.ROLE, prepareRecordsOnly: true, values: rolesByName}) as Role[];
+            }
+        }
+
+        const models = await Promise.all([teamRecords, teamMembershipRecords, myTeamRecords, systemRecords, preferenceRecords, rolesRecords, userRecords]);
+
+        const flattenedModels = models.flat();
+        if (flattenedModels?.length > 0) {
+            await operator.batchOperations({database: activeServerDatabase, models: flattenedModels});
+        }
+    } catch (e) {
+        return {error: e, currentUser: undefined};
+    }
+
+    return {currentUser, error: undefined};
+};
+
+export const completeLogin = async (user: RawUser) => {
+    const {activeServerDatabase, error} = await getActiveServerDatabase();
+    if (!activeServerDatabase) {
+        return {error};
+    }
+
+    const {config, license}: { config: Partial<Config>; license: Partial<License>; } = await getCommonSystemValues(activeServerDatabase);
+
+    if (!Object.keys(config)?.length || !Object.keys(license)?.length) {
+        return null;
+    }
+
+    const token = Client4.getToken();
+    const serverUrl = Client4.getUrl();
+
+    setServerCredentials(serverUrl, user.id, token);
+
+    // Set timezone
+    if (isTimezoneEnabled(config)) {
+        const timezone = getDeviceTimezone();
+        await autoUpdateTimezone({deviceTimezone: timezone, userId: user.id});
+    }
+
+    let dataRetentionPolicy: any;
+    const operator = new Operator(activeServerDatabase);
+
+    // Data retention
+    if (config?.DataRetentionEnableMessageDeletion === 'true' && license?.IsLicensed === 'true' && license?.DataRetention === 'true') {
+        dataRetentionPolicy = await getDataRetentionPolicy();
+        await operator.handleIsolatedEntity({tableName: IsolatedEntities.SYSTEM, values: [{name: 'dataRetentionPolicy', value: dataRetentionPolicy}], prepareRecordsOnly: false});
+    }
+
+    return null;
+};
+
+export const updateMe = async (user: User) => {
+    const {activeServerDatabase, error} = await getActiveServerDatabase();
+    if (!activeServerDatabase) {
+        return {error};
+    }
+    let data;
+    try {
+        data = ((await Client4.patchMe(user._raw)) as unknown) as RawUser;
+    } catch (e) {
+        logError(e);
+        return {error: e};
+    }
+
+    const operator = new Operator(activeServerDatabase);
+    const systemRecords = operator.handleIsolatedEntity({
+        tableName: IsolatedEntities.SYSTEM,
+        values: [
+            {name: 'currentUserId', value: data.id},
+            {name: 'locale', value: data?.locale},
+        ],
+        prepareRecordsOnly: true,
+    });
+
+    const userRecord = operator.handleUsers({prepareRecordsOnly: true, users: [data]});
+
+    //todo: ?? Do we need to write to TOS entity ? See app/mm-redux/reducers/entities/users.ts/profiles/line 152 const
+    // tosRecords = await DataOperator.handleIsolatedEntity({ tableName: TERMS_OF_SERVICE, values: [{}], });
+    const models = await Promise.all([
+        ...systemRecords,
+        ...userRecord,
+
+    // ...tosRecords,
+    ]);
+
+    if (models?.length) {
+        await operator.batchOperations({database: activeServerDatabase, models: models.flat()});
+    }
+
+    const updatedRoles: string[] = data.roles.split(' ');
+    if (updatedRoles.length) {
+        await loadRolesIfNeeded(updatedRoles);
+    }
+
+    return {data};
+};
+
+export const getSessions = async (currentUserId: string) => {
+    try {
+        const sessions = await Client4.getSessions(currentUserId);
+        await createSessions(sessions);
+    } catch (e) {
+        logError(e);
+        await forceLogoutIfNecessary(e);
+    }
+};
+
+type LoadedUser = {
+    currentUser?: RawUser,
+    error?: Client4Error
+}
+
+export const ssoLogin = async (serverUrl: string) => {
+    let deviceToken;
+
+    const {error, defaultDatabase} = await getDefaultDatabase();
+
+    if (!defaultDatabase) {
+        return {error};
+    }
+
+    // Setting up active database for this SSO login flow
+    try {
+        await createAndSetActiveDatabase({serverUrl});
+        deviceToken = await getDeviceToken(defaultDatabase);
+    } catch (e) {
+        return {error: e};
+    }
+
+    let result;
+
+    try {
+        result = await loadMe({deviceToken}) as unknown as LoadedUser;
+        if (!result?.error && result?.currentUser) {
+            await completeLogin(result.currentUser);
+        }
+    } catch (e) {
+        return {error: e};
+    }
+
+    return result;
+};
+
+export const sendPasswordResetEmail = async (email: string) => {
+    let data;
+    try {
+        data = await Client4.sendPasswordResetEmail(email);
+    } catch (e) {
+        return {
+            error: e,
+        };
+    }
+    return {
+        data,
+        error: undefined,
+    };
+};
diff --git a/app/screens/channel/index.tsx b/app/screens/channel/index.tsx
index 2eeee611e..0eb61203e 100644
--- a/app/screens/channel/index.tsx
+++ b/app/screens/channel/index.tsx
@@ -11,9 +11,27 @@ import {
     ReloadInstructions,
 } from 'react-native/Libraries/NewAppScreen';
 
+import type {LaunchProps} from '@typings/launch';
+
 declare const global: {HermesInternal: null | {}};
 
-const Channel = () => {
+type ChannelProps = LaunchProps
+
+const Channel = (props: ChannelProps) => {
+    // TODO: If we have LaunchProps, ensure we load the correct channel/post/modal.
+    const {launchType} = props;
+    console.log(launchType); // eslint-disable-line no-console
+    // TODO: If LaunchProps.error is true, use the LaunchProps.launchType to determine which
+    // error message to display. For example:
+    // if (props.launchError) {
+    //     let erroMessage;
+    //     if (props.launchType === LaunchType.DeepLink) {
+    //         errorMessage = intl.formatMessage({id: 'mobile.launchError.deepLink', defaultMessage: 'Did not find a server for this deep link'});
+    //     } else if (props.launchType === LaunchType.Notification) {
+    //         errorMessage = intl.formatMessage({id: 'mobile.launchError.notification', defaultMessage: 'Did not find a server for this notification'});
+    //     }
+    // }
+
     return (
         <>
             <StatusBar barStyle='dark-content'/>
diff --git a/app/screens/forgot_password/__snapshots__/forgot_password.test.tsx.snap b/app/screens/forgot_password/__snapshots__/forgot_password.test.tsx.snap
new file mode 100644
index 000000000..825d308b3
--- /dev/null
+++ b/app/screens/forgot_password/__snapshots__/forgot_password.test.tsx.snap
@@ -0,0 +1,152 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ForgotPassword should match snapshot 1`] = `
+<RNCSafeAreaView
+  style={
+    Object {
+      "flex": 1,
+    }
+  }
+  testID="forgot.password.screen"
+>
+  <View
+    accessible={true}
+    focusable={true}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onStartShouldSetResponder={[Function]}
+    style={
+      Object {
+        "alignItems": "center",
+        "flexDirection": "column",
+        "justifyContent": "center",
+        "paddingHorizontal": 15,
+        "paddingVertical": 50,
+      }
+    }
+  >
+    <Image
+      source={
+        Object {
+          "testUri": "../../../dist/assets/images/logo.png",
+        }
+      }
+      style={
+        Object {
+          "height": 72,
+          "resizeMode": "contain",
+        }
+      }
+    />
+    <Text
+      style={
+        Array [
+          Object {
+            "color": "#fd5960",
+            "fontSize": 12,
+            "marginBottom": 15,
+            "marginTop": 15,
+            "textAlign": "left",
+          },
+          undefined,
+        ]
+      }
+      testID="forgot.password.error.text"
+    >
+      
+    </Text>
+    <View
+      testID="password_send.link.prepare"
+    >
+      <Text
+        style={
+          Array [
+            Object {
+              "color": "rgba(61,60,64,0.6)",
+              "fontSize": 16,
+              "fontWeight": "300",
+              "lineHeight": 22,
+              "marginBottom": 15,
+              "textAlign": "center",
+            },
+            Object {
+              "paddingTop": 15,
+            },
+          ]
+        }
+      >
+        To reset your password, enter the email address you used to sign up
+      </Text>
+      <TextInput
+        allowFontScaling={true}
+        autoCapitalize="none"
+        autoCorrect={false}
+        blurOnSubmit={false}
+        disableFullscreenUI={true}
+        keyboardType="email-address"
+        onChangeText={[Function]}
+        placeholder="Email"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        rejectResponderTermination={true}
+        style={
+          Object {
+            "alignSelf": "stretch",
+            "borderColor": "gainsboro",
+            "borderRadius": 3,
+            "borderWidth": 1,
+            "color": "#3d3c40",
+            "fontSize": 16,
+            "height": 45,
+            "marginBottom": 5,
+            "marginTop": 5,
+            "paddingLeft": 10,
+          }
+        }
+        testID="forgot.password.email"
+        underlineColorAndroid="transparent"
+      />
+      <View
+        accessibilityRole="button"
+        accessible={true}
+        focusable={false}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "alignItems": "center",
+            "alignSelf": "stretch",
+            "borderColor": "#166de0",
+            "borderRadius": 3,
+            "borderWidth": 1,
+            "marginTop": 10,
+            "opacity": 1,
+            "padding": 15,
+          }
+        }
+        testID="forgot.password.button"
+      >
+        <Text
+          style={
+            Object {
+              "color": "#166de0",
+              "fontSize": 17,
+              "textAlign": "center",
+            }
+          }
+        >
+          Reset my password
+        </Text>
+      </View>
+    </View>
+  </View>
+</RNCSafeAreaView>
+`;
diff --git a/app/screens/forgot_password/forgot_password.test.tsx b/app/screens/forgot_password/forgot_password.test.tsx
new file mode 100644
index 000000000..9f75f0c6e
--- /dev/null
+++ b/app/screens/forgot_password/forgot_password.test.tsx
@@ -0,0 +1,52 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {act, waitFor} from '@testing-library/react-native';
+import React from 'react';
+
+import {Preferences} from '@constants';
+import * as UserAPICalls from '@requests/remote/user';
+import {renderWithIntl, fireEvent} from '@test/intl-test-helper';
+
+import ForgotPassword from './index';
+
+describe('ForgotPassword', () => {
+    const baseProps = {
+        componentId: 'ForgotPassword',
+        theme: Preferences.THEMES.default,
+    };
+
+    test('should match snapshot', () => {
+        const {toJSON} = renderWithIntl(<ForgotPassword {...baseProps}/>);
+        expect(toJSON()).toMatchSnapshot();
+    });
+
+    test('Error on failure of email regex', async () => {
+        const {getByTestId} = renderWithIntl(<ForgotPassword {...baseProps}/>);
+        const emailTextInput = getByTestId('forgot.password.email');
+        const resetButton = getByTestId('forgot.password.button');
+
+        fireEvent.changeText(emailTextInput, 'bar');
+
+        act(() => {
+            fireEvent.press(resetButton);
+        });
+
+        expect(getByTestId('forgot.password.error.text')).toBeDefined();
+    });
+
+    test('Should show password link sent texts', async () => {
+        const spyOnResetAPICall = jest.spyOn(UserAPICalls, 'sendPasswordResetEmail');
+        const {getByTestId} = renderWithIntl(<ForgotPassword {...baseProps}/>);
+        const emailTextInput = getByTestId('forgot.password.email');
+        const resetButton = getByTestId('forgot.password.button');
+
+        fireEvent.changeText(emailTextInput, 'test@test.com');
+
+        await waitFor(() => {
+            fireEvent.press(resetButton);
+        });
+
+        expect(spyOnResetAPICall).toHaveBeenCalled();
+    });
+});
diff --git a/app/screens/forgot_password/index.tsx b/app/screens/forgot_password/index.tsx
new file mode 100644
index 000000000..24138334c
--- /dev/null
+++ b/app/screens/forgot_password/index.tsx
@@ -0,0 +1,223 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {useCallback, useRef, useState} from 'react';
+import {useIntl} from 'react-intl';
+import {Image, Text, TextInput, TouchableWithoutFeedback, View} from 'react-native';
+import Button from 'react-native-button';
+import {SafeAreaView} from 'react-native-safe-area-context';
+
+import ErrorText from '@components/error_text';
+import FormattedText from '@components/formatted_text';
+import {sendPasswordResetEmail} from '@requests/remote/user';
+import {isEmail} from '@utils/helpers';
+import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+
+type Props = {
+    theme: Theme;
+}
+
+const ForgotPassword = ({theme}: Props) => {
+    const [email, setEmail] = useState<string>('');
+    const [error, setError] = useState<string>('');
+    const [isPasswordLinkSent, setIsPasswordLinkSent] = useState<boolean>(false);
+    const {formatMessage} = useIntl();
+    const emailIdRef = useRef<TextInput>(null);
+    const styles = getStyleSheet(theme);
+
+    const changeEmail = (emailAddress: string) => {
+        setEmail(emailAddress);
+    };
+
+    const submitResetPassword = async () => {
+        if (!isEmail(email)) {
+            setError(
+                formatMessage({
+                    id: 'password_send.error',
+                    defaultMessage: 'Please enter a valid email address.',
+                }),
+            );
+            return;
+        }
+
+        const {data, error: apiError = undefined} = await sendPasswordResetEmail(email);
+
+        if (data) {
+            setIsPasswordLinkSent(true);
+        }
+
+        setError(apiError);
+    };
+
+    const onBlur = useCallback(() => {
+        emailIdRef.current?.blur();
+    }, []);
+
+    const getDisplayErrorView = () => {
+        return (
+            <ErrorText
+                error={error}
+                testID='forgot.password.error.text'
+                textStyle={styles.errorText}
+                theme={theme}
+            />
+        );
+    };
+
+    const getCenterContent = () => {
+        if (isPasswordLinkSent) {
+            return (
+                <View
+                    style={styles.resetSuccessContainer}
+                    testID={'password_send.link.sent'}
+                >
+                    <FormattedText
+                        style={styles.successTxtColor}
+                        id='password_send.link'
+                        defaultMessage='If the account exists, a password reset email will be sent to:'
+                    />
+                    <Text style={[styles.successTxtColor, styles.emailId]}>
+                        {email}
+                    </Text>
+                    <FormattedText
+                        style={[
+                            styles.successTxtColor,
+                            styles.defaultTopPadding,
+                        ]}
+                        id='password_send.checkInbox'
+                        defaultMessage='Please check your inbox.'
+                    />
+                </View>
+            );
+        }
+
+        return (
+            <View testID={'password_send.link.prepare'}>
+                <FormattedText
+                    style={[styles.subheader, styles.defaultTopPadding]}
+                    id='password_send.description'
+                    defaultMessage='To reset your password, enter the email address you used to sign up'
+                />
+                <TextInput
+                    ref={emailIdRef}
+                    style={styles.inputBox}
+                    onChangeText={changeEmail}
+                    placeholder={formatMessage({
+                        id: 'login.email',
+                        defaultMessage: 'Email',
+                    })}
+                    placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                    autoCorrect={false}
+                    autoCapitalize='none'
+                    keyboardType='email-address'
+                    underlineColorAndroid='transparent'
+                    blurOnSubmit={false}
+                    disableFullscreenUI={true}
+                    testID={'forgot.password.email'}
+                />
+                <Button
+                    testID='forgot.password.button'
+                    containerStyle={styles.signupButton}
+                    disabled={!email}
+                    onPress={submitResetPassword}
+                >
+                    <FormattedText
+                        id='password_send.reset'
+                        defaultMessage='Reset my password'
+                        style={styles.signupButtonText}
+                    />
+                </Button>
+            </View>
+        );
+    };
+
+    return (
+        <SafeAreaView
+            testID='forgot.password.screen'
+            style={styles.container}
+        >
+            <TouchableWithoutFeedback onPress={onBlur}>
+                <View style={styles.innerContainer}>
+                    <Image
+                        source={require('@assets/images/logo.png')}
+                        style={styles.innerContainerImage}
+                    />
+                    {getDisplayErrorView()}
+                    {getCenterContent()}
+                </View>
+            </TouchableWithoutFeedback>
+        </SafeAreaView>
+    );
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
+    container: {
+        flex: 1,
+    },
+    innerContainer: {
+        alignItems: 'center',
+        flexDirection: 'column',
+        justifyContent: 'center',
+        paddingHorizontal: 15,
+        paddingVertical: 50,
+    },
+    forgotPasswordBtn: {
+        borderColor: 'transparent',
+        marginTop: 15,
+    },
+    resetSuccessContainer: {
+        marginTop: 15,
+        padding: 10,
+        backgroundColor: '#dff0d8',
+        borderColor: '#d6e9c6',
+    },
+    emailId: {
+        fontWeight: 'bold',
+    },
+    successTxtColor: {
+        color: '#3c763d',
+    },
+    defaultTopPadding: {
+        paddingTop: 15,
+    },
+    subheader: {
+        textAlign: 'center',
+        fontSize: 16,
+        fontWeight: '300',
+        color: changeOpacity(theme.centerChannelColor, 0.6),
+        marginBottom: 15,
+        lineHeight: 22,
+    },
+    inputBox: {
+        fontSize: 16,
+        height: 45,
+        borderColor: 'gainsboro',
+        borderWidth: 1,
+        marginTop: 5,
+        marginBottom: 5,
+        paddingLeft: 10,
+        alignSelf: 'stretch',
+        borderRadius: 3,
+        color: theme.centerChannelColor,
+    },
+    signupButton: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        borderWidth: 1,
+        alignItems: 'center',
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    signupButtonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+    innerContainerImage: {
+        height: 72,
+        resizeMode: 'contain',
+    },
+}));
+
+export default ForgotPassword;
diff --git a/app/screens/index.ts b/app/screens/index.tsx
similarity index 82%
rename from app/screens/index.ts
rename to app/screens/index.tsx
index 986fd593f..93e825fb7 100644
--- a/app/screens/index.ts
+++ b/app/screens/index.tsx
@@ -2,18 +2,20 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
+import {IntlProvider} from 'react-intl';
+import {Navigation, NavigationFunctionComponent} from 'react-native-navigation';
 import {Platform, StyleProp, ViewStyle} from 'react-native';
-import {withManagedConfig} from '@mattermost/react-native-emm';
-
-import {Navigation} from 'react-native-navigation';
 import {gestureHandlerRootHOC} from 'react-native-gesture-handler';
 
+import {withManagedConfig} from '@mattermost/react-native-emm';
+
 import {Screens} from '@constants';
+import {DEFAULT_LOCALE, getTranslations} from '@i18n';
 
 // TODO: Remove this and uncomment screens as they get added
 /* eslint-disable */
 
-const withGestures = (screen: React.ComponentType<any>, styles: StyleProp<ViewStyle>) => {
+const withGestures = (screen: NavigationFunctionComponent, styles: StyleProp<ViewStyle>) => {
     if (Platform.OS === 'android') {
         return gestureHandlerRootHOC(screen, styles);
     }
@@ -21,10 +23,23 @@ const withGestures = (screen: React.ComponentType<any>, styles: StyleProp<ViewSt
     return screen;
 };
 
+const withIntl = (Screen: React.ComponentType) => {
+    return function IntlEnabledComponent(props: any) {
+        return (
+            <IntlProvider
+                locale={DEFAULT_LOCALE}
+                messages={getTranslations()}
+            >
+                <Screen {...props}/>
+            </IntlProvider>
+    );
+        }
+}
+
 Navigation.setLazyComponentRegistrator((screenName) => {
-    // let screen: any;
-    // let extraStyles: StyleProp<ViewStyle>;
-    // switch (screenName) {
+    let screen: any|undefined;
+    let extraStyles: StyleProp<ViewStyle>;
+    switch (screenName) {
     // case 'About':
     //     screen = require('@screens/about').default;
     //     break;
@@ -79,30 +94,30 @@ Navigation.setLazyComponentRegistrator((screenName) => {
     // case 'FlaggedPosts':
     //     screen = require('@screens/flagged_posts').default;
     //     break;
-    // case 'ForgotPassword':
-    //     screen = require('@screens/forgot_password').default;
-    //     break;
+    case 'ForgotPassword':
+        screen = require('@screens/forgot_password').default;
+        break;
     // case 'Gallery':
     //     screen = require('@screens/gallery').default;
     //     break;
     // case 'InteractiveDialog':
     //     screen = require('@screens/interactive_dialog').default;
     //     break;
-    // case 'Login':
-    //     screen = require('@screens/login').default;
-    //     break;
-    // case 'LoginOptions':
-    //     screen = require('@screens/login_options').default;
-    //     break;
+    case 'Login':
+        screen = require('@screens/login').default;
+        break;
+    case 'LoginOptions':
+        screen = require('@screens/login_options').default;
+        break;
     // case 'LongPost':
     //     screen = require('@screens/long_post').default;
     //     break;
     // case 'MainSidebar':
     //     screen = require('app/components/sidebars/main').default;
     //     break;
-    // case 'MFA':
-    //     screen = require('@screens/mfa').default;
-    //     break;
+    case 'MFA':
+        screen = require('@screens/mfa').default;
+        break;
     // case 'MoreChannels':
     //     screen = require('@screens/more_channels').default;
     //     break;
@@ -170,9 +185,9 @@ Navigation.setLazyComponentRegistrator((screenName) => {
     // case 'SidebarSettings':
     //     screen = require('@screens/settings/sidebar').default;
     //     break;
-    // case 'SSO':
-    //     screen = require('@screens/sso').default;
-    //     break;
+    case 'SSO':
+        screen = require('@screens/sso').default;
+        break;
     // case 'Table':
     //     screen = require('@screens/table').default;
     //     break;
@@ -191,11 +206,11 @@ Navigation.setLazyComponentRegistrator((screenName) => {
     // case 'UserProfile':
     //     screen = require('@screens/user_profile').default;
     //     break;
-    // }
+    }
 
-    // if (screen) {
-    //     Navigation.registerComponent(screenName, () => withGestures(withManagedConfig(screen), extraStyles));
-    // }
+    if (screen) {
+        Navigation.registerComponent(screenName, () => withGestures(withIntl(withManagedConfig(screen)), extraStyles));
+    }
 });
 
 export function registerScreens() {
@@ -203,5 +218,5 @@ export function registerScreens() {
     const serverScreen = require('@screens/server').default;
 
     Navigation.registerComponent(Screens.CHANNEL, () => withManagedConfig(channelScreen));
-    Navigation.registerComponent(Screens.SERVER, () => withManagedConfig(serverScreen));
+    Navigation.registerComponent(Screens.SERVER, () => withIntl(withManagedConfig(serverScreen)));
 }
diff --git a/app/screens/login/__snapshots__/login.test.tsx.snap b/app/screens/login/__snapshots__/login.test.tsx.snap
new file mode 100644
index 000000000..1ede26042
--- /dev/null
+++ b/app/screens/login/__snapshots__/login.test.tsx.snap
@@ -0,0 +1,213 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Login Login screen should match snapshot 1`] = `
+<RCTSafeAreaView
+  emulateUnlessSupported={true}
+  style={
+    Object {
+      "flex": 1,
+    }
+  }
+>
+  <RCTScrollView
+    accessible={false}
+    automaticallyAdjustContentInsets={false}
+    contentContainerStyle={
+      Object {
+        "alignItems": "center",
+        "flexDirection": "column",
+        "justifyContent": "center",
+        "paddingHorizontal": 15,
+        "paddingVertical": 50,
+      }
+    }
+    contentInset={
+      Object {
+        "bottom": 0,
+      }
+    }
+    enableAutomaticScroll={true}
+    enableOnAndroid={true}
+    enableResetScrollToCoords={true}
+    extraHeight={75}
+    extraScrollHeight={0}
+    focusable={true}
+    getScrollResponder={[Function]}
+    handleOnScroll={[Function]}
+    keyboardDismissMode="interactive"
+    keyboardOpeningTime={250}
+    keyboardShouldPersistTaps="handled"
+    keyboardSpace={0}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onScroll={[Function]}
+    onStartShouldSetResponder={[Function]}
+    resetKeyboardSpace={[Function]}
+    scrollEventThrottle={1}
+    scrollForExtraHeightOnAndroid={[Function]}
+    scrollIntoView={[Function]}
+    scrollToEnd={[Function]}
+    scrollToFocusedInput={[Function]}
+    scrollToPosition={[Function]}
+    showsVerticalScrollIndicator={true}
+    style={
+      Object {
+        "flex": 1,
+      }
+    }
+    update={[Function]}
+    viewIsInsideTabBar={false}
+  >
+    <View>
+      <Image
+        source={
+          Object {
+            "testUri": "../../../dist/assets/images/logo.png",
+          }
+        }
+        style={
+          Object {
+            "height": 72,
+            "resizeMode": "contain",
+          }
+        }
+      />
+      <TextInput
+        allowFontScaling={true}
+        autoCapitalize="none"
+        autoCorrect={false}
+        blurOnSubmit={false}
+        disableFullscreenUI={true}
+        keyboardType="email-address"
+        onChangeText={[Function]}
+        onSubmitEditing={[Function]}
+        placeholder="Email or Username"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        rejectResponderTermination={true}
+        returnKeyType="next"
+        style={
+          Object {
+            "alignSelf": "stretch",
+            "borderColor": "gainsboro",
+            "borderRadius": 3,
+            "borderWidth": 1,
+            "color": "#3d3c40",
+            "fontSize": 16,
+            "height": 45,
+            "marginBottom": 5,
+            "marginTop": 5,
+            "paddingLeft": 10,
+          }
+        }
+        testID="login.username.input"
+        underlineColorAndroid="transparent"
+        value=""
+      />
+      <TextInput
+        allowFontScaling={true}
+        autoCapitalize="none"
+        autoCorrect={false}
+        disableFullscreenUI={true}
+        onChangeText={[Function]}
+        onSubmitEditing={[Function]}
+        placeholder="Password"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        rejectResponderTermination={true}
+        returnKeyType="go"
+        secureTextEntry={true}
+        style={
+          Object {
+            "alignSelf": "stretch",
+            "borderColor": "gainsboro",
+            "borderRadius": 3,
+            "borderWidth": 1,
+            "color": "#3d3c40",
+            "fontSize": 16,
+            "height": 45,
+            "marginBottom": 5,
+            "marginTop": 5,
+            "paddingLeft": 10,
+          }
+        }
+        testID="login.password.input"
+        underlineColorAndroid="transparent"
+        value=""
+      />
+      <View
+        accessibilityRole="button"
+        accessible={true}
+        focusable={true}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "alignItems": "center",
+            "alignSelf": "stretch",
+            "borderColor": "#166de0",
+            "borderRadius": 3,
+            "borderWidth": 1,
+            "marginTop": 10,
+            "opacity": 1,
+            "padding": 15,
+          }
+        }
+        testID="login.signin.button"
+      >
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#166de0",
+                "fontSize": 17,
+                "textAlign": "center",
+              },
+              Object {},
+            ]
+          }
+        >
+          Sign in
+        </Text>
+      </View>
+      <View
+        accessibilityRole="button"
+        accessible={true}
+        focusable={true}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "borderColor": "transparent",
+            "marginTop": 15,
+            "opacity": 1,
+          }
+        }
+      >
+        <Text
+          style={
+            Object {
+              "color": "#2389d7",
+            }
+          }
+          testID="login.forgot"
+        >
+          I forgot my password
+        </Text>
+      </View>
+    </View>
+  </RCTScrollView>
+</RCTSafeAreaView>
+`;
diff --git a/app/screens/login/index.tsx b/app/screens/login/index.tsx
new file mode 100644
index 000000000..e6a4e0f62
--- /dev/null
+++ b/app/screens/login/index.tsx
@@ -0,0 +1,452 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import {useIntl} from 'react-intl';
+import {
+    ActivityIndicator,
+    Image,
+    InteractionManager,
+    Keyboard,
+    SafeAreaView,
+    StatusBar,
+    StyleProp,
+    Text,
+    TextInput,
+    TextStyle,
+    TouchableWithoutFeedback,
+    View,
+    ViewStyle,
+} from 'react-native';
+import Button from 'react-native-button';
+import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view';
+import {NavigationFunctionComponent} from 'react-native-navigation';
+
+import ErrorText, {ClientErrorWithIntl} from '@components/error_text';
+import {FORGOT_PASSWORD, MFA} from '@constants/screens';
+import FormattedText from '@components/formatted_text';
+import {useManagedConfig} from '@mattermost/react-native-emm';
+import {scheduleExpiredNotification} from '@requests/remote/push_notification';
+import {login} from '@requests/remote/user';
+import {goToScreen, resetToChannel} from '@screens/navigation';
+import {t} from '@utils/i18n';
+import {preventDoubleTap} from '@utils/tap';
+import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+
+type LoginProps = {
+    componentId: string;
+    config: ClientConfig;
+    license: ClientLicense;
+    theme: Theme;
+};
+
+export const MFA_EXPECTED_ERRORS = ['mfa.validate_token.authenticate.app_error', 'ent.mfa.validate_token.authenticate.app_error'];
+
+const Login: NavigationFunctionComponent = ({config, license, theme}: LoginProps) => {
+    const styles = getStyleSheet(theme);
+
+    const loginRef = useRef<TextInput>(null);
+    const passwordRef = useRef<TextInput>(null);
+    const scrollRef = useRef<KeyboardAwareScrollView>(null);
+
+    const intl = useIntl();
+    const managedConfig = useManagedConfig();
+    const [isLoading, setIsLoading] = useState<boolean>(false);
+    const [error, setError] = useState<ClientErrorWithIntl | string | undefined | null>();
+
+    const [loginId, setLoginId] = useState<string>('');
+    const [password, setPassword] = useState<string>('');
+
+    // useEffect to set userName for EMM
+    useEffect(() => {
+        const setEmmUsernameIfAvailable = async () => {
+            if (managedConfig?.username && loginRef.current) {
+                loginRef.current.setNativeProps({text: managedConfig.username});
+                setLoginId(managedConfig.username);
+            }
+        };
+
+        setEmmUsernameIfAvailable();
+    }, []);
+
+    const preSignIn = preventDoubleTap(async () => {
+        setIsLoading(true);
+        setError(null);
+
+        Keyboard.dismiss();
+        InteractionManager.runAfterInteractions(async () => {
+            if (!loginId) {
+                t('login.noEmail');
+                t('login.noEmailLdapUsername');
+                t('login.noEmailUsername');
+                t('login.noEmailUsernameLdapUsername');
+                t('login.noLdapUsername');
+                t('login.noUsername');
+                t('login.noUsernameLdapUsername');
+
+                // it's slightly weird to be constructing the message ID, but it's a bit nicer than triply nested if statements
+                let msgId = 'login.no';
+                if (config.EnableSignInWithEmail === 'true') {
+                    msgId += 'Email';
+                }
+                if (config.EnableSignInWithUsername === 'true') {
+                    msgId += 'Username';
+                }
+                if (license.IsLicensed === 'true' && config.EnableLdap === 'true') {
+                    msgId += 'LdapUsername';
+                }
+
+                const ldapUsername = intl.formatMessage({
+                    id: 'login.ldapUsernameLower',
+                    defaultMessage: 'AD/LDAP username',
+                });
+
+                setIsLoading(false);
+                setError(intl.formatMessage(
+                    {
+                        id: msgId,
+                        defaultMessage: '',
+                    },
+                    {
+                        ldapUsername: config.LdapLoginFieldName || ldapUsername,
+                    },
+                ));
+                return;
+            }
+
+            if (!password) {
+                setIsLoading(false);
+                setError(intl.formatMessage({
+                    id: t('login.noPassword'),
+                    defaultMessage: 'Please enter your password',
+                }));
+
+                return;
+            }
+
+            signIn();
+        });
+    });
+
+    const signIn = async () => {
+        const result = await login({loginId: loginId.toLowerCase(), password, config, license});
+        if (checkLoginResponse(result)) {
+            await goToChannel();
+        }
+    };
+
+    const goToChannel = async () => {
+        await scheduleExpiredNotification(intl);
+        resetToChannel();
+    };
+
+    const checkLoginResponse = (data: any) => {
+        if (MFA_EXPECTED_ERRORS.includes(data?.error?.server_error_id)) {
+            goToMfa();
+            setIsLoading(false);
+            return false;
+        }
+
+        if (data?.error) {
+            setIsLoading(false);
+            setError(getLoginErrorMessage(data.error));
+            return false;
+        }
+
+        setIsLoading(false);
+
+        return true;
+    };
+
+    const goToMfa = () => {
+        const screen = MFA;
+        const title = intl.formatMessage({id: 'mobile.routes.mfa', defaultMessage: 'Multi-factor Authentication'});
+        goToScreen(screen, title, {goToChannel, loginId, password, config, license, theme});
+    };
+
+    const getLoginErrorMessage = (loginError: any) => {
+        return (getServerErrorForLogin(loginError) || loginError);
+    };
+
+    const getServerErrorForLogin = (serverError: any) => {
+        if (!serverError) {
+            return null;
+        }
+
+        const errorId = serverError.server_error_id;
+
+        if (!errorId) {
+            return serverError.message;
+        }
+
+        if (errorId === 'store.sql_user.get_for_login.app_error' || errorId === 'ent.ldap.do_login.user_not_registered.app_error') {
+            return {
+                intl: {
+                    id: t('login.userNotFound'),
+                    defaultMessage: 'We couldn\'t find an account matching your login credentials.',
+                },
+            };
+        }
+
+        if (errorId === 'api.user.check_user_password.invalid.app_error' || errorId === 'ent.ldap.do_login.invalid_password.app_error') {
+            return {
+                intl: {
+                    id: t('login.invalidPassword'),
+                    defaultMessage: 'Your password is incorrect.',
+                },
+            };
+        }
+
+        return serverError.message;
+    };
+
+    const onPressForgotPassword = () => {
+        const screen = FORGOT_PASSWORD;
+        const title = intl.formatMessage({id: 'password_form.title', defaultMessage: 'Password Reset'});
+
+        goToScreen(screen, title, {theme});
+    };
+
+    const createLoginPlaceholder = () => {
+        const {formatMessage} = intl;
+        const loginPlaceholders = [];
+
+        if (config.EnableSignInWithEmail === 'true') {
+            loginPlaceholders.push(formatMessage({id: 'login.email', defaultMessage: 'Email'}));
+        }
+
+        if (config.EnableSignInWithUsername === 'true') {
+            loginPlaceholders.push(formatMessage({id: 'login.username', defaultMessage: 'Username'}));
+        }
+
+        if (license.IsLicensed === 'true' && license.LDAP === 'true' && config.EnableLdap === 'true') {
+            if (config.LdapLoginFieldName) {
+                loginPlaceholders.push(config.LdapLoginFieldName);
+            } else {
+                loginPlaceholders.push(formatMessage({id: 'login.ldapUsername', defaultMessage: 'AD/LDAP Username'}));
+            }
+        }
+
+        if (loginPlaceholders.length >= 2) {
+            return loginPlaceholders.slice(0, loginPlaceholders.length - 1).join(', ') +
+                ` ${formatMessage({id: 'login.or', defaultMessage: 'or'})} ` +
+                loginPlaceholders[loginPlaceholders.length - 1];
+        }
+
+        if (loginPlaceholders.length === 1) {
+            return loginPlaceholders[0];
+        }
+
+        return '';
+    };
+
+    const onBlur = () => {
+        loginRef?.current?.blur();
+        passwordRef?.current?.blur();
+        Keyboard.dismiss();
+    };
+
+    const onLoginChange = useCallback((text) => {
+        setLoginId(text);
+    }, []);
+
+    const onPasswordChange = useCallback((text) => {
+        setPassword(text);
+    }, []);
+
+    const onPasswordFocus = useCallback(() => {
+        passwordRef?.current?.focus();
+    }, []);
+
+    // **** **** ****   RENDER METHOD **** **** ****
+
+    const renderProceedButton = () => {
+        if (isLoading) {
+            return (
+                <ActivityIndicator
+                    animating={true}
+                    size='small'
+                />
+            );
+        }
+
+        const additionalStyle: StyleProp<ViewStyle> = {
+            ...(config.EmailLoginButtonColor && {
+                backgroundColor: config.EmailLoginButtonColor,
+            }),
+            ...(config.EmailLoginButtonBorderColor && {
+                borderColor: config.EmailLoginButtonBorderColor,
+            }),
+        };
+
+        const additionalTextStyle: StyleProp<TextStyle> = {
+            ...(config.EmailLoginButtonTextColor && {
+                color: config.EmailLoginButtonTextColor,
+            }),
+        };
+
+        return (
+            <Button
+                testID='login.signin.button'
+                onPress={preSignIn}
+                containerStyle={[styles.signupButton, additionalStyle]}
+            >
+                <FormattedText
+                    id='login.signIn'
+                    defaultMessage='Sign in'
+                    style={[styles.signupButtonText, additionalTextStyle]}
+                />
+            </Button>
+        );
+    };
+
+    return (
+        <SafeAreaView style={styles.container}>
+            <StatusBar/>
+            <TouchableWithoutFeedback
+                onPress={onBlur}
+                accessible={false}
+            >
+                <KeyboardAwareScrollView
+                    ref={scrollRef}
+                    style={styles.container}
+                    contentContainerStyle={styles.innerContainer}
+                    keyboardShouldPersistTaps='handled'
+                    enableOnAndroid={true}
+                >
+                    <Image
+                        source={require('@assets/images/logo.png')}
+                        style={{height: 72, resizeMode: 'contain'}}
+                    />
+                    {config?.SiteName && (<View testID='login.screen'>
+                        <Text style={styles.header}>{config?.SiteName}</Text>
+                        <FormattedText
+                            style={styles.subheader}
+                            id='web.root.signup_info'
+                            defaultMessage='All team communication in one place, searchable and accessible anywhere'
+                        />
+                    </View>)}
+                    {error && (
+                        <ErrorText
+                            testID='login.error.text'
+                            error={error}
+                            theme={theme}
+                        />
+                    )}
+                    <TextInput
+                        testID='login.username.input'
+                        autoCapitalize='none'
+                        autoCorrect={false}
+                        blurOnSubmit={false}
+                        disableFullscreenUI={true}
+                        keyboardType='email-address'
+                        onChangeText={onLoginChange}
+                        onSubmitEditing={onPasswordFocus}
+                        placeholder={createLoginPlaceholder()}
+                        placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                        ref={loginRef}
+                        returnKeyType='next'
+                        style={styles.inputBox}
+                        underlineColorAndroid='transparent'
+                        value={loginId} //to remove
+                    />
+                    <TextInput
+                        testID='login.password.input'
+                        autoCapitalize='none'
+                        autoCorrect={false}
+                        disableFullscreenUI={true}
+                        onChangeText={onPasswordChange}
+                        onSubmitEditing={preSignIn}
+                        style={styles.inputBox}
+                        placeholder={intl.formatMessage({
+                            id: 'login.password',
+                            defaultMessage: 'Password',
+                        })}
+                        placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                        ref={passwordRef}
+                        returnKeyType='go'
+                        secureTextEntry={true}
+                        underlineColorAndroid='transparent'
+                        value={password} //to remove
+                    />
+                    {renderProceedButton()}
+                    {(config.EnableSignInWithEmail === 'true' || config.EnableSignInWithUsername === 'true') && (
+                        <Button
+                            onPress={onPressForgotPassword}
+                            containerStyle={[styles.forgotPasswordBtn]}
+                        >
+                            <FormattedText
+                                id='login.forgot'
+                                defaultMessage='I forgot my password'
+                                style={styles.forgotPasswordTxt}
+                                testID={'login.forgot'}
+                            />
+                        </Button>
+                    )}
+                </KeyboardAwareScrollView>
+            </TouchableWithoutFeedback>
+        </SafeAreaView>
+    );
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
+    container: {
+        flex: 1,
+    },
+    innerContainer: {
+        alignItems: 'center',
+        flexDirection: 'column',
+        justifyContent: 'center',
+        paddingHorizontal: 15,
+        paddingVertical: 50,
+    },
+    forgotPasswordBtn: {
+        borderColor: 'transparent',
+        marginTop: 15,
+    },
+    forgotPasswordTxt: {
+        color: theme.linkColor,
+    },
+    inputBox: {
+        fontSize: 16,
+        height: 45,
+        borderColor: 'gainsboro',
+        borderWidth: 1,
+        marginTop: 5,
+        marginBottom: 5,
+        paddingLeft: 10,
+        alignSelf: 'stretch',
+        borderRadius: 3,
+        color: theme.centerChannelColor,
+    },
+    subheader: {
+        textAlign: 'center',
+        fontSize: 16,
+        fontWeight: '300',
+        color: changeOpacity(theme.centerChannelColor, 0.6),
+        marginBottom: 15,
+        lineHeight: 22,
+    },
+    signupButton: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        borderWidth: 1,
+        alignItems: 'center',
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    signupButtonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+    header: {
+        textAlign: 'center',
+        marginTop: 15,
+        marginBottom: 15,
+        fontSize: 32,
+        fontWeight: '600',
+    },
+}));
+
+export default Login;
diff --git a/app/screens/login/login.test.tsx b/app/screens/login/login.test.tsx
new file mode 100644
index 000000000..a5e9c2100
--- /dev/null
+++ b/app/screens/login/login.test.tsx
@@ -0,0 +1,141 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import {Preferences, Screens} from '@constants';
+import * as NavigationActions from '@screens/navigation';
+import {waitFor, renderWithIntl, fireEvent} from '@test/intl-test-helper';
+
+import Login from './index';
+
+jest.mock('@requests/remote/user', () => {
+    return {
+        login: () => {
+            return {
+                data: undefined,
+                error: {
+                    server_error_id: 'mfa.validate_token.authenticate.app_error',
+                },
+            };
+        },
+    };
+});
+
+describe('Login', () => {
+    const baseProps = {
+        componentId: Screens.LOGIN,
+        config: {
+            EnableSignInWithEmail: 'true',
+            EnableSignInWithUsername: 'true',
+        },
+        license: {
+            IsLicensed: 'false',
+        },
+        theme: Preferences.THEMES.default,
+    };
+
+    test('Login screen should match snapshot', () => {
+        const {toJSON} = renderWithIntl(
+            <Login {...baseProps}/>,
+        );
+
+        expect(toJSON()).toMatchSnapshot();
+    });
+
+    test('should show "I forgot my password" with only email login enabled', () => {
+        const props = {
+            ...baseProps,
+            config: {
+                ...baseProps.config,
+                EnableSignInWithUsername: 'false',
+            },
+        };
+
+        const {getByTestId} = renderWithIntl(<Login {...props}/>, {locale: 'es'});
+
+        expect(getByTestId('login.forgot')).toBeDefined();
+    });
+
+    test('should show "I forgot my password" with only username login enabled', () => {
+        const props = {
+            ...baseProps,
+            config: {
+                ...baseProps.config,
+                EnableSignInWithEmail: 'false',
+            },
+        };
+
+        const {getByTestId} = renderWithIntl(<Login {...props}/>, {locale: 'fr'});
+
+        expect(getByTestId('login.forgot')).toBeDefined();
+    });
+
+    test('should not show "I forgot my password" without email or username login enabled', () => {
+        const props = {
+            ...baseProps,
+            config: {
+                ...baseProps.config,
+                EnableSignInWithEmail: 'false',
+                EnableSignInWithUsername: 'false',
+            },
+        };
+
+        const {getByTestId} = renderWithIntl(<Login {...props}/>);
+        let forgot;
+
+        try {
+            forgot = getByTestId('login.forgot');
+        } catch {
+            // do nothing
+        }
+
+        expect(forgot).toBeUndefined();
+    });
+
+    test('should go to MFA screen when login response returns MFA error', async () => {
+        const goToScreen = jest.spyOn(NavigationActions, 'goToScreen');
+
+        const {getByTestId} = renderWithIntl(<Login {...baseProps}/>);
+        const loginInput = getByTestId('login.username.input');
+        const passwordInput = getByTestId('login.password.input');
+        const loginButton = getByTestId('login.signin.button');
+        const loginId = 'user';
+        const password = 'password';
+
+        fireEvent.changeText(loginInput, loginId);
+        fireEvent.changeText(passwordInput, password);
+
+        await waitFor(() => fireEvent.press(loginButton), {timeout: 300});
+
+        expect(goToScreen).
+            toHaveBeenCalledWith(
+                'MFA',
+                'Multi-factor Authentication',
+                {
+                    goToChannel: expect.anything(),
+                    loginId,
+                    password,
+                    config: {EnableSignInWithEmail: 'true', EnableSignInWithUsername: 'true'},
+                    license: {IsLicensed: 'false'},
+                    theme: baseProps.theme,
+                },
+            );
+    });
+
+    test('should go to ForgotPassword screen when forgotPassword is called', () => {
+        const goToScreen = jest.spyOn(NavigationActions, 'goToScreen');
+
+        const {getByTestId} = renderWithIntl(<Login {...baseProps}/>);
+        const forgot = getByTestId('login.forgot');
+
+        fireEvent.press(forgot);
+
+        expect(goToScreen).
+            toHaveBeenCalledWith(
+                'ForgotPassword',
+                'Password Reset',
+                {theme: baseProps.theme},
+            );
+    });
+});
diff --git a/app/screens/login_options/email.tsx b/app/screens/login_options/email.tsx
new file mode 100644
index 000000000..f3f2fa438
--- /dev/null
+++ b/app/screens/login_options/email.tsx
@@ -0,0 +1,63 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {StyleProp, ViewStyle} from 'react-native';
+import Button from 'react-native-button';
+
+import LocalConfig from '@assets/config.json';
+import FormattedText from '@components/formatted_text';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+const EmailOption = ({config, onPress, theme}: LoginOptionWithConfigProps) => {
+    const styles = getStyleSheet(theme);
+    const forceHideFromLocal = LocalConfig.HideEmailLoginExperimental;
+
+    if (!forceHideFromLocal && (config.EnableSignInWithEmail === 'true' || config.EnableSignInWithUsername === 'true')) {
+        const backgroundColor = config.EmailLoginButtonColor || '#2389d7';
+        const additionalStyle: StyleProp<ViewStyle> = {
+            backgroundColor,
+        };
+
+        if (config.EmailLoginButtonBorderColor) {
+            additionalStyle.borderColor = config.EmailLoginButtonBorderColor;
+        }
+
+        const textColor = config.EmailLoginButtonTextColor || 'white';
+
+        return (
+            <Button
+                key='email'
+                onPress={onPress}
+                containerStyle={[styles.button, additionalStyle]}
+            >
+                <FormattedText
+                    id='signup.email'
+                    defaultMessage='Email and Password'
+                    style={[styles.buttonText, {color: textColor}]}
+                />
+            </Button>
+        );
+    }
+
+    return null;
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+    button: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    buttonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+}));
+
+export default EmailOption;
diff --git a/app/screens/login_options/gitlab.tsx b/app/screens/login_options/gitlab.tsx
new file mode 100644
index 000000000..9f463dc13
--- /dev/null
+++ b/app/screens/login_options/gitlab.tsx
@@ -0,0 +1,73 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {Image, Text} from 'react-native';
+import Button from 'react-native-button';
+
+import LocalConfig from '@assets/config.json';
+import {SSO} from '@constants';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+const GitLabOption = ({config, onPress, theme}: LoginOptionWithConfigProps) => {
+    const styles = getStyleSheet(theme);
+    const forceHideFromLocal = LocalConfig.HideGitLabLoginExperimental;
+
+    const handlePress = () => {
+        onPress(SSO.GITLAB);
+    };
+
+    if (!forceHideFromLocal && config.EnableSignUpWithGitLab === 'true') {
+        const additionalButtonStyle = {
+            backgroundColor: '#548',
+            borderColor: 'transparent',
+            borderWidth: 0,
+        };
+
+        const logoStyle = {
+            height: 18,
+            marginRight: 5,
+            width: 18,
+        };
+
+        const textColor = 'white';
+        return (
+            <Button
+                key='gitlab'
+                onPress={handlePress}
+                containerStyle={[styles.button, additionalButtonStyle]}
+            >
+                <Image
+                    source={require('@assets/images/gitlab.png')}
+                    style={logoStyle}
+                />
+                <Text
+                    style={[styles.buttonText, {color: textColor}]}
+                >
+                    {'GitLab'}
+                </Text>
+            </Button>
+        );
+    }
+
+    return null;
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+    button: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    buttonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+}));
+
+export default GitLabOption;
diff --git a/app/screens/login_options/google.tsx b/app/screens/login_options/google.tsx
new file mode 100644
index 000000000..6879014cd
--- /dev/null
+++ b/app/screens/login_options/google.tsx
@@ -0,0 +1,72 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {Image} from 'react-native';
+import Button from 'react-native-button';
+
+import FormattedText from '@components/formatted_text';
+import {SSO} from '@constants';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+const GoogleOption = ({config, onPress, theme}: LoginOptionWithConfigProps) => {
+    const styles = getStyleSheet(theme);
+
+    const handlePress = () => {
+        onPress(SSO.GOOGLE);
+    };
+
+    if (config.EnableSignUpWithGoogle === 'true') {
+        const additionalButtonStyle = {
+            backgroundColor: '#c23321',
+            borderColor: 'transparent',
+            borderWidth: 0,
+        };
+
+        const logoStyle = {
+            height: 18,
+            marginRight: 5,
+            width: 18,
+        };
+
+        const textColor = 'white';
+        return (
+            <Button
+                key='google'
+                onPress={handlePress}
+                containerStyle={[styles.button, additionalButtonStyle]}
+            >
+                <Image
+                    source={require('@assets/images/google.png')}
+                    style={logoStyle}
+                />
+                <FormattedText
+                    id='signup.google'
+                    defaultMessage='Google Apps'
+                    style={[styles.buttonText, {color: textColor}]}
+                />
+            </Button>
+        );
+    }
+
+    return null;
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+    button: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    buttonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+}));
+
+export default GoogleOption;
diff --git a/app/screens/login_options/index.tsx b/app/screens/login_options/index.tsx
new file mode 100644
index 000000000..86e86cc4e
--- /dev/null
+++ b/app/screens/login_options/index.tsx
@@ -0,0 +1,145 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {LOGIN, SSO} from '@constants/screens';
+import React from 'react';
+import {useIntl} from 'react-intl';
+import {Image, ScrollView, StatusBar, Text} from 'react-native';
+import {NavigationFunctionComponent} from 'react-native-navigation';
+import {SafeAreaView} from 'react-native-safe-area-context';
+
+import FormattedText from '@components/formatted_text';
+import {goToScreen} from '@screens/navigation';
+import {preventDoubleTap} from '@utils/tap';
+import {changeOpacity, makeStyleSheetFromTheme} from '@app/utils/theme';
+
+import EmailOption from './email';
+import GitLabOption from './gitlab';
+import GoogleOption from './google';
+import LdapOption from './ldap';
+import Office365Option from './office365';
+import OpenIdOption from './open_id';
+import SamlOption from './saml';
+
+type LoginOptionsProps = {
+    componentId: string;
+    serverUrl: string;
+    config: ClientConfig;
+    license: ClientLicense;
+    theme: Theme;
+}
+
+const getStyles = makeStyleSheetFromTheme((theme: Theme) => ({
+    container: {
+        flex: 1,
+    },
+    header: {
+        textAlign: 'center',
+        marginTop: 15,
+        marginBottom: 15,
+        fontSize: 32,
+        fontWeight: '600',
+    },
+    subheader: {
+        textAlign: 'center',
+        fontSize: 16,
+        fontWeight: '300',
+        color: changeOpacity(theme.centerChannelColor, 0.6),
+        marginBottom: 15,
+        lineHeight: 22,
+    },
+    innerContainer: {
+        alignItems: 'center',
+        flexDirection: 'column',
+        justifyContent: 'center',
+        paddingHorizontal: 15,
+        flex: 1,
+    },
+}));
+
+const LoginOptions: NavigationFunctionComponent = ({config, license, theme, serverUrl}: LoginOptionsProps) => {
+    const intl = useIntl();
+    const styles = getStyles(theme);
+
+    const displayLogin = preventDoubleTap(() => {
+        const screen = LOGIN;
+        const title = intl.formatMessage({id: 'mobile.routes.login', defaultMessage: 'Login'});
+
+        goToScreen(screen, title, {config, license, theme});
+    });
+
+    const displaySSO = preventDoubleTap((ssoType: string) => {
+        const screen = SSO;
+        const title = intl.formatMessage({id: 'mobile.routes.sso', defaultMessage: 'Single Sign-On'});
+        goToScreen(screen, title, {config, license, theme, ssoType, serverUrl});
+    });
+
+    return (
+        <SafeAreaView style={styles.container}>
+            <ScrollView
+                style={styles.container}
+                contentContainerStyle={styles.innerContainer}
+            >
+                <StatusBar/>
+                <Image
+                    source={require('@assets/images/logo.png')}
+                    style={{height: 72, resizeMode: 'contain'}}
+                />
+                <Text style={styles.header}>
+                    {config.SiteName}
+                </Text>
+                <FormattedText
+                    style={styles.subheader}
+                    id='web.root.signup_info'
+                    defaultMessage='All team communication in one place, searchable and accessible anywhere'
+                />
+                <FormattedText
+                    style={[styles.subheader, {fontWeight: 'bold', marginTop: 10}]}
+                    id='mobile.login_options.choose_title'
+                    defaultMessage='Choose your login method'
+                />
+                <EmailOption
+                    config={config}
+                    onPress={displayLogin}
+                    theme={theme}
+                />
+                <LdapOption
+                    config={config}
+                    license={license}
+                    onPress={displayLogin}
+                    theme={theme}
+                />
+                <GitLabOption
+                    config={config}
+                    onPress={displaySSO}
+                    theme={theme}
+                />
+                <GoogleOption
+                    config={config}
+                    onPress={displaySSO}
+                    theme={theme}
+                />
+                <Office365Option
+                    config={config}
+                    license={license}
+                    onPress={displaySSO}
+                    theme={theme}
+                />
+                <OpenIdOption
+                    config={config}
+                    license={license}
+                    onPress={displaySSO}
+                    theme={theme}
+                />
+                <SamlOption
+                    config={config}
+                    license={license}
+                    onPress={displaySSO}
+                    theme={theme}
+                />
+            </ScrollView>
+        </SafeAreaView>
+    );
+};
+
+export default LoginOptions;
diff --git a/app/screens/login_options/ldap.tsx b/app/screens/login_options/ldap.tsx
new file mode 100644
index 000000000..0c2f0a810
--- /dev/null
+++ b/app/screens/login_options/ldap.tsx
@@ -0,0 +1,78 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {Text} from 'react-native';
+import Button from 'react-native-button';
+
+import LocalConfig from '@assets/config.json';
+import FormattedText from '@components/formatted_text';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+const LdapOption = ({config, license, onPress, theme}: LoginOptionWithConfigAndLicenseProps) => {
+    const styles = getStyleSheet(theme);
+    const forceHideFromLocal = LocalConfig.HideLDAPLoginExperimental;
+
+    if (!forceHideFromLocal && license.IsLicensed === 'true' && config.EnableLdap === 'true') {
+        const backgroundColor = config.LdapLoginButtonColor || '#2389d7';
+        const additionalButtonStyle = {
+            backgroundColor,
+            borderColor: 'transparent',
+            borderWidth: 1,
+        };
+
+        if (config.LdapLoginButtonBorderColor) {
+            additionalButtonStyle.borderColor = config.LdapLoginButtonBorderColor;
+        }
+
+        const textColor = config.LdapLoginButtonTextColor || 'white';
+
+        let buttonText;
+        if (config.LdapLoginFieldName) {
+            buttonText = (
+                <Text style={[styles.buttonText, {color: textColor}]}>
+                    {config.LdapLoginFieldName}
+                </Text>
+            );
+        } else {
+            buttonText = (
+                <FormattedText
+                    id='login.ldapUsernameLower'
+                    defaultMessage='AD/LDAP username'
+                    style={[styles.buttonText, {color: textColor}]}
+                />
+            );
+        }
+
+        return (
+            <Button
+                key='ldap'
+                onPress={onPress}
+                containerStyle={[styles.button, additionalButtonStyle]}
+            >
+                {buttonText}
+            </Button>
+        );
+    }
+
+    return null;
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+    button: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    buttonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+}));
+
+export default LdapOption;
diff --git a/app/screens/login_options/office365.tsx b/app/screens/login_options/office365.tsx
new file mode 100644
index 000000000..f71941251
--- /dev/null
+++ b/app/screens/login_options/office365.tsx
@@ -0,0 +1,66 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import Button from 'react-native-button';
+
+import LocalConfig from '@assets/config.json';
+import FormattedText from '@components/formatted_text';
+import {SSO} from '@constants';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+const Office365Option = ({config, license, onPress, theme}: LoginOptionWithConfigAndLicenseProps) => {
+    const styles = getStyleSheet(theme);
+    const forceHideFromLocal = LocalConfig.HideO365LoginExperimental;
+    const o365Enabled = config.EnableSignUpWithOffice365 === 'true' && license.IsLicensed === 'true' &&
+        license.Office365OAuth === 'true';
+
+    const handlePress = () => {
+        onPress(SSO.OFFICE365);
+    };
+
+    if (!forceHideFromLocal && o365Enabled) {
+        const additionalButtonStyle = {
+            backgroundColor: '#2389d7',
+            borderColor: 'transparent',
+            borderWidth: 0,
+        };
+
+        const textColor = 'white';
+
+        return (
+            <Button
+                key='o365'
+                onPress={handlePress}
+                containerStyle={[styles.button, additionalButtonStyle]}
+            >
+                <FormattedText
+                    id='signup.office365'
+                    defaultMessage='Office 365'
+                    style={[styles.buttonText, {color: textColor}]}
+                />
+            </Button>
+        );
+    }
+
+    return null;
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+    button: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    buttonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+}));
+
+export default Office365Option;
diff --git a/app/screens/login_options/open_id.tsx b/app/screens/login_options/open_id.tsx
new file mode 100644
index 000000000..2392d17d4
--- /dev/null
+++ b/app/screens/login_options/open_id.tsx
@@ -0,0 +1,64 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import Button from 'react-native-button';
+
+import FormattedText from '@components/formatted_text';
+import {SSO} from '@constants';
+import {isMinimumServerVersion} from '@utils/helpers';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+const OpenIdOption = ({config, license, onPress, theme}: LoginOptionWithConfigAndLicenseProps) => {
+    const styles = getStyleSheet(theme);
+    const openIdEnabled = config.EnableSignUpWithOpenId === 'true' && license.IsLicensed === 'true' && isMinimumServerVersion(config.Version, 5, 33, 0);
+
+    const handlePress = () => {
+        onPress(SSO.OPENID);
+    };
+
+    if (openIdEnabled) {
+        const additionalButtonStyle = {
+            backgroundColor: config.OpenIdButtonColor || '#145DBF',
+            borderColor: 'transparent',
+            borderWidth: 0,
+        };
+
+        const textColor = 'white';
+
+        return (
+            <Button
+                key='openId'
+                onPress={handlePress}
+                containerStyle={[styles.button, additionalButtonStyle]}
+            >
+                <FormattedText
+                    id='signup.openid'
+                    defaultMessage={config.OpenIdButtonText || 'OpenID'}
+                    style={[styles.buttonText, {color: textColor}]}
+                />
+            </Button>
+        );
+    }
+
+    return null;
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+    button: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    buttonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+}));
+
+export default OpenIdOption;
diff --git a/app/screens/login_options/saml.tsx b/app/screens/login_options/saml.tsx
new file mode 100644
index 000000000..2a3a372ed
--- /dev/null
+++ b/app/screens/login_options/saml.tsx
@@ -0,0 +1,71 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {Text} from 'react-native';
+import Button from 'react-native-button';
+
+import LocalConfig from '@assets/config.json';
+import {SSO} from '@constants';
+import {makeStyleSheetFromTheme} from '@utils/theme';
+
+const SamlOption = ({config, license, onPress, theme}: LoginOptionWithConfigAndLicenseProps) => {
+    const styles = getStyleSheet(theme);
+    const forceHideFromLocal = LocalConfig.HideSAMLLoginExperimental;
+    const enabled = config.EnableSaml === 'true' && license.IsLicensed === 'true' && license.SAML === 'true';
+
+    const handlePress = () => {
+        onPress(SSO.SAML);
+    };
+
+    if (!forceHideFromLocal && enabled) {
+        const backgroundColor = config.SamlLoginButtonColor || '#34a28b';
+
+        const additionalStyle = {
+            backgroundColor,
+            borderColor: 'transparent',
+            borderWidth: 0,
+        };
+
+        if (config.SamlLoginButtonBorderColor) {
+            additionalStyle.borderColor = config.SamlLoginButtonBorderColor;
+        }
+
+        const textColor = config.SamlLoginButtonTextColor || 'white';
+
+        return (
+            <Button
+                key='saml'
+                onPress={handlePress}
+                containerStyle={[styles.button, additionalStyle]}
+            >
+                <Text
+                    style={[styles.buttonText, {color: textColor}]}
+                >
+                    {config.SamlLoginButtonText}
+                </Text>
+            </Button>
+        );
+    }
+
+    return null;
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme) => ({
+    button: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    buttonText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
+    },
+}));
+
+export default SamlOption;
diff --git a/app/screens/login_options/types.d.ts b/app/screens/login_options/types.d.ts
new file mode 100644
index 000000000..0e7fb5e80
--- /dev/null
+++ b/app/screens/login_options/types.d.ts
@@ -0,0 +1,12 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type LoginOptionWithConfigProps = {
+    config: ClientConfig;
+    onPress: (type: string|GestureResponderEvent) => void | (() => void);
+    theme: Theme;
+}
+
+type LoginOptionWithConfigAndLicenseProps = LoginOptionWithConfigProps & {
+    license: ClientLicense;
+};
diff --git a/app/screens/mfa/__snapshots__/mfa.test.tsx.snap b/app/screens/mfa/__snapshots__/mfa.test.tsx.snap
new file mode 100644
index 000000000..87eff5c15
--- /dev/null
+++ b/app/screens/mfa/__snapshots__/mfa.test.tsx.snap
@@ -0,0 +1,172 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`*** MFA Screen *** MFA screen should match snapshot 1`] = `
+<RNCSafeAreaView
+  style={
+    Object {
+      "flex": 1,
+    }
+  }
+  testID="mfa.screen"
+>
+  <View
+    onLayout={[Function]}
+    style={
+      Array [
+        Object {
+          "flex": 1,
+        },
+        Object {
+          "paddingBottom": 0,
+        },
+      ]
+    }
+  >
+    <View
+      accessible={true}
+      focusable={true}
+      onClick={[Function]}
+      onResponderGrant={[Function]}
+      onResponderMove={[Function]}
+      onResponderRelease={[Function]}
+      onResponderTerminate={[Function]}
+      onResponderTerminationRequest={[Function]}
+      onStartShouldSetResponder={[Function]}
+      style={
+        Array [
+          Object {
+            "alignItems": "center",
+            "flex": 1,
+            "flexDirection": "column",
+            "justifyContent": "center",
+          },
+          Object {
+            "paddingLeft": 15,
+            "paddingRight": 15,
+          },
+        ]
+      }
+    >
+      <Image
+        source={
+          Object {
+            "testUri": "../../../dist/assets/images/logo.png",
+          }
+        }
+        style={
+          Object {
+            "height": 72,
+            "resizeMode": "contain",
+          }
+        }
+      />
+      <View>
+        <Text
+          style={
+            Array [
+              Object {
+                "fontSize": 32,
+                "fontWeight": "600",
+                "marginBottom": 15,
+                "marginTop": 15,
+                "textAlign": "center",
+              },
+              Object {
+                "color": "rgba(61,60,64,0.6)",
+                "fontSize": 20,
+                "fontWeight": "400",
+              },
+            ]
+          }
+        >
+          To complete the sign in process, please enter a token from your smartphone's authenticator
+        </Text>
+      </View>
+      <Text
+        style={
+          Array [
+            Object {
+              "color": "#fd5960",
+              "fontSize": 12,
+              "marginBottom": 15,
+              "marginTop": 15,
+              "textAlign": "left",
+            },
+            undefined,
+          ]
+        }
+        testID="mfa.error.text"
+      >
+        
+      </Text>
+      <TextInput
+        allowFontScaling={true}
+        autoCapitalize="none"
+        autoCorrect={false}
+        disableFullscreenUI={true}
+        keyboardType="numeric"
+        onChangeText={[Function]}
+        onSubmitEditing={[Function]}
+        placeholder="MFA Token"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        rejectResponderTermination={true}
+        returnKeyType="go"
+        style={
+          Object {
+            "alignSelf": "stretch",
+            "borderColor": "gainsboro",
+            "borderRadius": 3,
+            "borderWidth": 1,
+            "color": "#3d3c40",
+            "fontSize": 16,
+            "height": 45,
+            "marginBottom": 5,
+            "marginTop": 5,
+            "paddingLeft": 10,
+          }
+        }
+        testID="login_mfa.input"
+        underlineColorAndroid="transparent"
+        value=""
+      />
+      <View
+        accessibilityRole="button"
+        accessible={true}
+        focusable={true}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "alignItems": "center",
+            "alignSelf": "stretch",
+            "borderColor": "#166de0",
+            "borderRadius": 3,
+            "borderWidth": 1,
+            "marginTop": 10,
+            "opacity": 1,
+            "padding": 15,
+          }
+        }
+        testID="login_mfa.submit"
+      >
+        <Text
+          style={
+            Object {
+              "color": "#166de0",
+              "fontSize": 17,
+              "textAlign": "center",
+            }
+          }
+        >
+          Proceed
+        </Text>
+      </View>
+    </View>
+  </View>
+</RNCSafeAreaView>
+`;
diff --git a/app/screens/mfa/index.tsx b/app/screens/mfa/index.tsx
new file mode 100644
index 000000000..6432b7420
--- /dev/null
+++ b/app/screens/mfa/index.tsx
@@ -0,0 +1,222 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import {useIntl} from 'react-intl';
+import {
+    ActivityIndicator,
+    Image,
+    Keyboard,
+    KeyboardAvoidingView,
+    Platform,
+    TextInput,
+    TouchableWithoutFeedback,
+    View,
+} from 'react-native';
+import Button from 'react-native-button';
+import {SafeAreaView} from 'react-native-safe-area-context';
+
+import ErrorText from '@components/error_text';
+import FormattedText from '@components/formatted_text';
+import {login} from '@requests/remote/user';
+import {Config} from '@typings/database/config';
+import {License} from '@typings/database/license';
+import {t} from '@utils/i18n';
+import {preventDoubleTap} from '@utils/tap';
+import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+
+type MFAProps = {
+    config: Partial<Config>,
+    goToChannel: () => void,
+    license: Partial<License>,
+    loginId : string,
+    password: string,
+    theme: Theme;
+}
+
+const MFA = ({config, goToChannel, license, loginId, password, theme}: MFAProps) => {
+    const [token, setToken] = useState<string>('');
+    const [error, setError] = useState<string>('');
+    const [isLoading, setIsLoading] = useState<boolean>(false);
+    const {formatMessage} = useIntl();
+    const textInputRef = useRef<TextInput>(null);
+
+    const styles = getStyleSheet(theme);
+
+    const onBlur = useCallback(() => {
+        textInputRef?.current?.blur();
+    }, []);
+
+    useEffect(() => {
+        if (Platform.OS === 'android') {
+            Keyboard.addListener('keyboardDidHide', onBlur);
+        }
+        return () => {
+            if (Platform.OS === 'android') {
+                Keyboard.removeListener('keyboardDidHide', onBlur);
+            }
+        };
+    }, []);
+
+    const handleInput = (userToken: string) => {
+        setToken(userToken);
+        setError('');
+    };
+
+    const submit = preventDoubleTap(async () => {
+        Keyboard.dismiss();
+        if (!token) {
+            setError(
+                formatMessage({
+                    id: t('login_mfa.tokenReq'),
+                    defaultMessage: 'Please enter an MFA token',
+                }),
+            );
+            return;
+        }
+        setIsLoading(true);
+        const result = await login({loginId, password, mfaToken: token, config, license});
+        setIsLoading(false);
+        if (result?.error) {
+            setError(result?.error);
+            return;
+        }
+        goToChannel();
+    });
+
+    const getProceedView = () => {
+        if (isLoading) {
+            return (
+                <ActivityIndicator
+                    animating={true}
+                    size='small'
+                />
+            );
+        }
+        return (
+            <Button
+                testID={'login_mfa.submit'}
+                onPress={submit}
+                containerStyle={styles.signupButton}
+            >
+                <FormattedText
+                    style={styles.signupButtonText}
+                    id='mobile.components.select_server_view.proceed'
+                    defaultMessage='Proceed'
+                />
+            </Button>
+        );
+    };
+
+    return (
+        <SafeAreaView
+            testID='mfa.screen'
+            style={styles.flex}
+        >
+            <KeyboardAvoidingView
+                behavior='padding'
+                style={styles.flex}
+                keyboardVerticalOffset={5}
+                enabled={Platform.OS === 'ios'}
+            >
+                <TouchableWithoutFeedback onPress={onBlur}>
+                    <View style={[styles.container, styles.signupContainer]}>
+                        <Image
+                            source={require('@assets/images/logo.png')}
+                            style={styles.containerImage}
+                        />
+                        <View>
+                            <FormattedText
+                                style={[styles.header, styles.label]}
+                                id='login_mfa.enterToken'
+                                defaultMessage="To complete the sign in process, please enter a token from your smartphone's authenticator"
+                            />
+                        </View>
+                        <ErrorText
+                            error={error}
+                            testID='mfa.error.text'
+                            theme={theme}
+                        />
+                        <TextInput
+                            testID={'login_mfa.input'}
+                            ref={textInputRef}
+                            value={token}
+                            onChangeText={handleInput}
+                            onSubmitEditing={submit}
+                            style={styles.inputBox}
+                            autoCapitalize='none'
+                            autoCorrect={false}
+                            keyboardType='numeric'
+                            placeholder={formatMessage({id: t('login_mfa.token'), defaultMessage: 'MFA Token'})}
+                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                            returnKeyType='go'
+                            underlineColorAndroid='transparent'
+                            disableFullscreenUI={true}
+                        />
+                        {getProceedView()}
+                    </View>
+                </TouchableWithoutFeedback>
+            </KeyboardAvoidingView>
+        </SafeAreaView>
+    );
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
+    flex: {
+        flex: 1,
+    },
+    signupButton: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        borderWidth: 1,
+        alignItems: 'center',
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
+    },
+    inputBox: {
+        fontSize: 16,
+        height: 45,
+        borderColor: 'gainsboro',
+        borderWidth: 1,
+        marginTop: 5,
+        marginBottom: 5,
+        paddingLeft: 10,
+        alignSelf: 'stretch',
+        borderRadius: 3,
+        color: theme.centerChannelColor,
+    },
+    header: {
+        textAlign: 'center',
+        marginTop: 15,
+        marginBottom: 15,
+        fontSize: 32,
+        fontWeight: '600',
+    },
+    label: {
+        color: changeOpacity(theme.centerChannelColor, 0.6),
+        fontSize: 20,
+        fontWeight: '400',
+    },
+    container: {
+        flex: 1,
+        flexDirection: 'column',
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
+    signupContainer: {
+        paddingRight: 15,
+        paddingLeft: 15,
+    },
+    signupButtonText: {
+        color: theme.buttonBg,
+        textAlign: 'center',
+        fontSize: 17,
+    },
+    containerImage: {
+        height: 72,
+        resizeMode: 'contain',
+    },
+}));
+
+export default MFA;
diff --git a/app/screens/mfa/mfa.test.tsx b/app/screens/mfa/mfa.test.tsx
new file mode 100644
index 000000000..4cd259513
--- /dev/null
+++ b/app/screens/mfa/mfa.test.tsx
@@ -0,0 +1,51 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import {Preferences} from '@constants';
+import {fireEvent, waitFor} from '@testing-library/react-native';
+import {renderWithIntl} from '@test/intl-test-helper';
+
+import Mfa from './index';
+
+jest.mock('@requests/remote/user', () => {
+    return {
+        login: jest.fn(),
+    };
+});
+
+describe('*** MFA Screen ***', () => {
+    const baseProps = {
+        config: {},
+        goToChannel: jest.fn(),
+        loginId: 'loginId',
+        password: 'passwd',
+        license: {},
+        theme: Preferences.THEMES.default,
+    };
+
+    test('MFA screen should match snapshot', () => {
+        const {toJSON} = renderWithIntl(<Mfa {...baseProps}/>);
+        expect(toJSON()).toMatchSnapshot();
+    });
+
+    test('should call login method on submit', async () => {
+        const props = {
+            ...baseProps,
+            goToChannel: jest.fn(),
+        };
+
+        const spyOnGoToChannel = jest.spyOn(props, 'goToChannel');
+        const {getByTestId} = renderWithIntl(<Mfa {...props}/>);
+        const submitBtn = getByTestId('login_mfa.submit');
+        const inputText = getByTestId('login_mfa.input');
+        fireEvent.changeText(inputText, 'token123');
+
+        await waitFor(() => {
+            fireEvent.press(submitBtn);
+        });
+
+        expect(spyOnGoToChannel).toHaveBeenCalled();
+    });
+});
diff --git a/app/screens/navigation.ts b/app/screens/navigation.ts
index 744c524a0..c305730b4 100644
--- a/app/screens/navigation.ts
+++ b/app/screens/navigation.ts
@@ -9,6 +9,8 @@ import {Screens, Preferences} from '@constants';
 
 import EphemeralStore from '@store/ephemeral_store';
 
+import type {LaunchProps} from '@typings/launch';
+
 function getThemeFromState() {
     if (Appearance.getColorScheme() === 'dark') {
         return Preferences.THEMES.windows10;
@@ -80,43 +82,46 @@ export function resetToChannel(passProps = {}) {
     });
 }
 
-export function resetToSelectServer(allowOtherServers: boolean) {
-    const theme = Preferences.THEMES.default;
+export function resetToSelectServer(passProps: LaunchProps) {
+    const theme = getThemeFromState();
 
     EphemeralStore.clearNavigationComponents();
 
+    const children = [{
+        component: {
+            id: Screens.SERVER,
+            name: Screens.SERVER,
+            passProps: {
+                ...passProps,
+                theme,
+            },
+            options: {
+                layout: {
+                    backgroundColor: theme.centerChannelBg,
+                    componentBackgroundColor: theme.centerChannelBg,
+                },
+                statusBar: {
+                    visible: true,
+                },
+                topBar: {
+                    backButton: {
+                        color: theme.sidebarHeaderTextColor,
+                        title: '',
+                    },
+                    background: {
+                        color: theme.sidebarHeaderBg,
+                    },
+                    visible: false,
+                    height: 0,
+                },
+            },
+        },
+    }];
+
     Navigation.setRoot({
         root: {
             stack: {
-                children: [{
-                    component: {
-                        id: Screens.SERVER,
-                        name: Screens.SERVER,
-                        passProps: {
-                            allowOtherServers,
-                        },
-                        options: {
-                            layout: {
-                                backgroundColor: theme.centerChannelBg,
-                                componentBackgroundColor: theme.centerChannelBg,
-                            },
-                            statusBar: {
-                                visible: true,
-                            },
-                            topBar: {
-                                backButton: {
-                                    color: theme.sidebarHeaderTextColor,
-                                    title: '',
-                                },
-                                background: {
-                                    color: theme.sidebarHeaderBg,
-                                },
-                                visible: false,
-                                height: 0,
-                            },
-                        },
-                    },
-                }],
+                children,
             },
         },
     });
@@ -205,7 +210,7 @@ export function goToScreen(name: string, title: string, passProps = {}, options
     });
 }
 
-export function popTopScreen(screenId: string) {
+export function popTopScreen(screenId?: string) {
     if (screenId) {
         Navigation.pop(screenId);
     } else {
diff --git a/app/screens/server/index.tsx b/app/screens/server/index.tsx
index 9d663ac3d..982ffe8b8 100644
--- a/app/screens/server/index.tsx
+++ b/app/screens/server/index.tsx
@@ -1,105 +1,383 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {Colors, DebugInstructions, LearnMoreLinks, ReloadInstructions} from 'react-native/Libraries/NewAppScreen';
-import {SafeAreaView, ScrollView, StatusBar, StyleSheet, Text, View} from 'react-native';
+import {ManagedConfig, useManagedConfig} from '@mattermost/react-native-emm';
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import {useIntl} from 'react-intl';
+import {
+    ActivityIndicator, EventSubscription, Image, Keyboard, KeyboardAvoidingView,
+    Platform, StatusBar, StyleSheet, TextInput, TouchableWithoutFeedback, View,
+} from 'react-native';
+import Button from 'react-native-button';
+import {NavigationFunctionComponent} from 'react-native-navigation';
+import {SafeAreaView} from 'react-native-safe-area-context';
 
-import React from 'react';
+import LocalConfig from '@assets/config.json';
+import AppVersion from '@components/app_version';
+import ErrorText, {ClientErrorWithIntl} from '@components/error_text';
+import FormattedText from '@components/formatted_text';
 import {Screens} from '@constants';
+import {doPing, fetchConfigAndLicense} from '@requests/remote/general';
 import {goToScreen} from '@screens/navigation';
+import {isMinimumServerVersion} from '@utils/helpers';
+import {preventDoubleTap} from '@utils/tap';
+import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+import {getServerUrlAfterRedirect, isValidUrl, sanitizeUrl} from '@utils/url';
 
-declare const global: { HermesInternal: null | {} };
+import {DeepLinkWithData, LaunchProps, LaunchType} from '@typings/launch';
+
+interface ServerProps extends LaunchProps {
+    componentId: string;
+    theme: Theme;
+}
+
+let cancelPing: undefined | (() => void);
+
+const Server: NavigationFunctionComponent = ({extra, launchType, launchError, theme}: ServerProps) => {
+    // TODO: If we have LaunchProps, ensure they get passed along to subsequent screens
+    // so that they are eventually accessible in the Channel screen.
+
+    const intl = useIntl();
+    const managedConfig = useManagedConfig<ManagedConfig>();
+    const input = useRef<TextInput>(null);
+    const [connecting, setConnecting] = useState(false);
+    const initialError = launchError && launchType === LaunchType.Notification ? intl.formatMessage({
+        id: 'mobile.launchError.notification',
+        defaultMessage: 'Did not find a server for this notification',
+    }) : undefined;
+    const [error, setError] = useState<ClientErrorWithIntl|string|undefined>(initialError);
+
+    const [url, setUrl] = useState<string>('');
+    const styles = getStyleSheet(theme);
+    const {formatMessage} = intl;
+
+    const displayLogin = (config: ClientConfig, license: ClientLicense) => {
+        const samlEnabled = config.EnableSaml === 'true' && license.IsLicensed === 'true' && license.SAML === 'true';
+        const gitlabEnabled = config.EnableSignUpWithGitLab === 'true';
+        const googleEnabled = config.EnableSignUpWithGoogle === 'true' && license.IsLicensed === 'true';
+        const o365Enabled = config.EnableSignUpWithOffice365 === 'true' && license.IsLicensed === 'true' && license.Office365OAuth === 'true';
+        const openIdEnabled = config.EnableSignUpWithOpenId === 'true' && license.IsLicensed === 'true' && isMinimumServerVersion(config.Version, 5, 33, 0);
+
+        let screen = Screens.LOGIN;
+        let title = formatMessage({id: 'mobile.routes.login', defaultMessage: 'Login'});
+        if (samlEnabled || gitlabEnabled || googleEnabled || o365Enabled || openIdEnabled) {
+            screen = Screens.LOGIN_OPTIONS;
+            title = formatMessage({id: 'mobile.routes.loginOptions', defaultMessage: 'Login Chooser'});
+        }
+
+        const {allowOtherServers} = managedConfig;
+        let visible = !LocalConfig.AutoSelectServerUrl;
+
+        if (allowOtherServers === 'false') {
+            visible = false;
+        }
+
+        const passProps = {
+            config,
+            license,
+            theme,
+            serverUrl: url,
+        };
+
+        const defaultOptions = {
+            popGesture: visible,
+            topBar: {
+                visible,
+                height: visible ? null : 0,
+            },
+        };
+
+        goToScreen(screen, title, passProps, defaultOptions);
+        setConnecting(false);
+    };
+
+    const handleConnect = preventDoubleTap((manualUrl?: string) => {
+        if (connecting && cancelPing) {
+            cancelPing();
+            return;
+        }
+
+        let serverUrl = typeof manualUrl === 'string' ? manualUrl : url;
+        if (!serverUrl || serverUrl.trim() === '') {
+            setError(intl.formatMessage({
+                id: 'mobile.server_url.empty',
+                defaultMessage: 'Please enter a valid server URL',
+            }));
+
+            return;
+        }
+
+        serverUrl = sanitizeUrl(serverUrl);
+        if (!isValidUrl(serverUrl)) {
+            setError(formatMessage({
+                id: 'mobile.server_url.invalid_format',
+                defaultMessage: 'URL must start with http:// or https://',
+            }));
+
+            return;
+        }
+
+        pingServer(serverUrl);
+    });
+
+    const pingServer = async (pingUrl: string, retryWithHttp = true) => {
+        let canceled = false;
+        setConnecting(true);
+        setError(undefined);
+
+        cancelPing = () => {
+            // We should not need this once we have the cancelable network-client library
+            canceled = true;
+            setConnecting(false);
+            cancelPing = undefined;
+        };
+
+        const serverUrl = await getServerUrlAfterRedirect(pingUrl, !retryWithHttp);
+
+        const result = await doPing(serverUrl);
+
+        if (canceled) {
+            return;
+        }
+
+        if (result.error && retryWithHttp) {
+            const nurl = serverUrl.replace('https:', 'http:');
+            pingServer(nurl, false);
+            return;
+        } else if (result.error) {
+            setError(result.error);
+            setConnecting(false);
+            return;
+        }
+
+        const data = await fetchConfigAndLicense();
+        if (data.error) {
+            setError(data.error);
+            setConnecting(false);
+            return;
+        }
+
+        displayLogin(data.config!, data.license!);
+    };
+
+    const blur = useCallback(() => {
+        input.current?.blur();
+    }, []);
+
+    const handleTextChanged = useCallback((text) => {
+        setUrl(text);
+    }, []);
+
+    useEffect(() => {
+        let listener: EventSubscription;
+        if (Platform.OS === 'android') {
+            listener = Keyboard.addListener('keyboardDidHide', blur);
+        }
+
+        return () => listener?.remove();
+    }, []);
+
+    useEffect(() => {
+        let serverUrl = managedConfig?.serverUrl || LocalConfig.DefaultServerUrl;
+        let autoconnect = managedConfig?.allowOtherServers === 'false' || LocalConfig.AutoSelectServerUrl;
+
+        if (launchType === LaunchType.DeepLink) {
+            const deepLinkServerUrl = (extra as DeepLinkWithData).data?.serverUrl;
+            if (managedConfig) {
+                autoconnect = (managedConfig.allowOtherServers === 'false' && managedConfig.serverUrl === deepLinkServerUrl);
+                if (managedConfig.serverUrl !== deepLinkServerUrl || launchError) {
+                    setError(intl.formatMessage({
+                        id: 'mobile.server_url.deeplink.emm.denied',
+                        defaultMessage: 'This app is controlled by an EMM and the DeepLink server url does not match the EMM allowed server',
+                    }));
+                }
+            } else {
+                autoconnect = true;
+                serverUrl = deepLinkServerUrl;
+            }
+        }
+
+        if (serverUrl) {
+            // If a server Url is set by the managed or local configuration, use it.
+            setUrl(serverUrl);
+
+            if (autoconnect) {
+                // If no other servers are allowed or the local config for AutoSelectServerUrl is set, attempt to connect
+                handleConnect(managedConfig?.serverUrl || LocalConfig.DefaultServerUrl);
+            }
+        }
+    }, []);
+
+    let buttonIcon;
+    let buttonText;
+
+    if (connecting) {
+        buttonIcon = (
+            <ActivityIndicator
+                animating={true}
+                size='small'
+                color={theme.buttonBg}
+                style={styles.connectingIndicator}
+            />
+        );
+        buttonText = (
+            <FormattedText
+                id='mobile.components.select_server_view.connecting'
+                defaultMessage='Connecting...'
+                style={styles.connectText}
+            />
+        );
+    } else {
+        buttonText = (
+            <FormattedText
+                id='mobile.components.select_server_view.connect'
+                defaultMessage='Connect'
+                style={styles.connectText}
+            />
+        );
+    }
+
+    const barStyle = Platform.OS === 'android' ? 'light-content' : 'dark-content';
+    const inputDisabled = managedConfig.allowOtherServers === 'false' || connecting;
+
+    const inputStyle = [styles.inputBox];
+    if (inputDisabled) {
+        inputStyle.push(styles.disabledInput);
+    }
 
-const App = () => {
     return (
-        <>
-            <StatusBar barStyle='dark-content'/>
-            <SafeAreaView>
-                <ScrollView
-                    contentInsetAdjustmentBehavior='automatic'
-                    style={styles.scrollView}
+        <SafeAreaView
+            testID='select_server.screen'
+            style={styles.container}
+        >
+            <KeyboardAvoidingView
+                behavior='padding'
+                style={styles.flex}
+                keyboardVerticalOffset={0}
+                enabled={Platform.OS === 'ios'}
+            >
+                <StatusBar barStyle={barStyle}/>
+                <TouchableWithoutFeedback
+                    onPress={blur}
+                    accessible={false}
                 >
-                    {global.HermesInternal == null ? null : (
-                        <View style={styles.engine}>
-                            <Text style={styles.footer}>{'Engine: Hermes'}</Text>
+                    <View style={styles.formContainer}>
+                        <Image
+                            source={require('@assets/images/logo.png')}
+                            style={styles.logo}
+                        />
+
+                        <View testID='select_server.header.text'>
+                            <FormattedText
+                                style={styles.header}
+                                id='mobile.components.select_server_view.enterServerUrl'
+                                defaultMessage='Enter Server URL'
+                            />
                         </View>
-                    )}
-                    <View style={styles.body}>
-                        <View style={styles.sectionContainer}>
-                            <Text style={styles.sectionTitle}>{'Step One'}</Text>
-                            <Text style={styles.sectionDescription}>
-                                {'Edit '}
-                                <Text
-                                    style={styles.highlight}
-                                >{'screens/server/index.tsx'}</Text>{' to change this'}
-                                {'XXXXXscreen and then come back to see your edits.'}
-                            </Text>
+                        <TextInput
+                            testID='select_server.server_url.input'
+                            ref={input}
+                            value={url}
+                            editable={!inputDisabled}
+                            onChangeText={handleTextChanged}
+                            onSubmitEditing={handleConnect}
+                            style={StyleSheet.flatten(inputStyle)}
+                            autoCapitalize='none'
+                            autoCorrect={false}
+                            keyboardType='url'
+                            placeholder={formatMessage({
+                                id: 'mobile.components.select_server_view.siteUrlPlaceholder',
+                                defaultMessage: 'https://mattermost.example.com',
+                            })}
+                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                            returnKeyType='go'
+                            underlineColorAndroid='transparent'
+                            disableFullscreenUI={true}
+                        />
+                        <Button
+                            testID='select_server.connect.button'
+                            onPress={handleConnect}
+                            containerStyle={styles.connectButton}
+                        >
+                            {buttonIcon}
+                            {buttonText}
+                        </Button>
+                        {Boolean(error) &&
+                        <View>
+                            <ErrorText
+                                testID='select_server.error.text'
+                                error={error!}
+                                theme={theme}
+                            />
                         </View>
-                        <View style={styles.sectionContainer}>
-                            <Text
-                                style={styles.sectionTitle}
-                                onPress={() => goToScreen(Screens.CHANNEL, 'Channel')}
-                            >{'See Your Changes'}</Text>
-                            <Text style={styles.sectionDescription}>
-                                <ReloadInstructions/>
-                            </Text>
-                        </View>
-                        <View style={styles.sectionContainer}>
-                            <Text style={styles.sectionTitle}>{'Debug'}</Text>
-                            <Text style={styles.sectionDescription}>
-                                <DebugInstructions/>
-                            </Text>
-                        </View>
-                        <View style={styles.sectionContainer}>
-                            <Text style={styles.sectionTitle}>{'Learn More'}</Text>
-                            <Text style={styles.sectionDescription}>
-                                {'Read the docs to discover what to do next:'}
-                            </Text>
-                        </View>
-                        <LearnMoreLinks/>
+                        }
                     </View>
-                </ScrollView>
-            </SafeAreaView>
-        </>
+                </TouchableWithoutFeedback>
+                <AppVersion/>
+            </KeyboardAvoidingView>
+        </SafeAreaView>
     );
 };
 
-const styles = StyleSheet.create({
-    scrollView: {
-        backgroundColor: Colors.lighter,
+const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
+    container: {
+        flex: 1,
+        backgroundColor: theme.centerChannelBg,
     },
-    engine: {
-        right: 0,
+    flex: {
+        flex: 1,
     },
-    body: {
-        backgroundColor: Colors.white,
+    formContainer: {
+        flex: 1,
+        flexDirection: 'column',
+        justifyContent: 'center',
+        alignItems: 'center',
+        paddingRight: 15,
+        paddingLeft: 15,
     },
-    sectionContainer: {
-        marginTop: 32,
-        paddingHorizontal: 24,
+    disabledInput: {
+        backgroundColor: changeOpacity(theme.centerChannelColor, 0.1),
     },
-    sectionTitle: {
-        fontSize: 24,
-        fontWeight: '600',
-        color: Colors.black,
+    connectButton: {
+        borderRadius: 3,
+        borderColor: theme.buttonBg,
+        alignItems: 'center',
+        borderWidth: 1,
+        alignSelf: 'stretch',
+        marginTop: 10,
+        padding: 15,
     },
-    sectionDescription: {
-        marginTop: 8,
-        fontSize: 18,
+    connectingIndicator: {
+        marginRight: 5,
+    },
+    inputBox: {
+        fontSize: 16,
+        height: 45,
+        borderColor: theme.centerChannelColor,
+        borderWidth: 1,
+        marginTop: 5,
+        marginBottom: 5,
+        paddingLeft: 10,
+        alignSelf: 'stretch',
+        borderRadius: 3,
+        color: theme.centerChannelColor,
+    },
+    logo: {
+        height: 72,
+        resizeMode: 'contain',
+    },
+    header: {
+        textAlign: 'center',
+        marginTop: 15,
+        marginBottom: 15,
+        fontSize: 20,
         fontWeight: '400',
-        color: Colors.dark,
     },
-    highlight: {
-        fontWeight: '700',
+    connectText: {
+        textAlign: 'center',
+        color: theme.buttonBg,
+        fontSize: 17,
     },
-    footer: {
-        color: Colors.dark,
-        fontSize: 12,
-        fontWeight: '600',
-        padding: 4,
-        paddingRight: 12,
-        textAlign: 'right',
-    },
-});
+}));
 
-export default App;
+export default Server;
diff --git a/app/screens/sso/index.tsx b/app/screens/sso/index.tsx
new file mode 100644
index 000000000..29cde6c59
--- /dev/null
+++ b/app/screens/sso/index.tsx
@@ -0,0 +1,116 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React, {useState} from 'react';
+import {useIntl} from 'react-intl';
+
+import {Client4} from '@client/rest';
+import {SSO as SSOEnum} from '@constants';
+import {useManagedConfig} from '@mattermost/react-native-emm';
+import {scheduleExpiredNotification} from '@requests/remote/push_notification';
+import {ssoLogin} from '@requests/remote/user';
+import {resetToChannel} from '@screens/navigation';
+import {ErrorApi} from '@typings/api/client4';
+import {isMinimumServerVersion} from '@utils/helpers';
+
+import SSOWithRedirectURL from './sso_with_redirect_url';
+import SSOWithWebView from './sso_with_webview';
+
+interface SSOProps {
+  config: Partial<ClientConfig>;
+  license: Partial<ClientLicense>;
+  serverUrl: string;
+  ssoType: string;
+  theme: Partial<Theme>;
+}
+
+const SSO = ({config, serverUrl, ssoType, theme}: SSOProps) => {
+    const intl = useIntl();
+    const managedConfig = useManagedConfig();
+
+    const [loginError, setLoginError] = useState<string>('');
+    let completeUrlPath = '';
+    let loginUrl = '';
+    switch (ssoType) {
+        case SSOEnum.GOOGLE: {
+            completeUrlPath = '/signup/google/complete';
+            loginUrl = `${serverUrl}/oauth/google/mobile_login`;
+            break;
+        }
+        case SSOEnum.GITLAB: {
+            completeUrlPath = '/signup/gitlab/complete';
+            loginUrl = `${serverUrl}/oauth/gitlab/mobile_login`;
+            break;
+        }
+        case SSOEnum.SAML: {
+            completeUrlPath = '/login/sso/saml';
+            loginUrl = `${serverUrl}/login/sso/saml?action=mobile`;
+            break;
+        }
+        case SSOEnum.OFFICE365: {
+            completeUrlPath = '/signup/office365/complete';
+            loginUrl = `${serverUrl}/oauth/office365/mobile_login`;
+            break;
+        }
+        case SSOEnum.OPENID: {
+            completeUrlPath = '/signup/openid/complete';
+            loginUrl = `${serverUrl}/oauth/openid/mobile_login`;
+            break;
+        }
+        default:
+            break;
+    }
+
+    const onLoadEndError = (e: ErrorApi) => {
+        console.warn('Failed to set store from local data', e); // eslint-disable-line no-console
+        let errorMessage = e.message;
+        if (e.url) {
+            errorMessage += `\nURL: ${e.url}`;
+        }
+        setLoginError(errorMessage);
+    };
+
+    const onMMToken = async (token: string) => {
+        Client4.setToken(token);
+
+        const {error = undefined} = await ssoLogin(serverUrl);
+        if (error) {
+            onLoadEndError(error);
+            setLoginError(error);
+            return;
+        }
+        goToChannel();
+    };
+
+    const goToChannel = () => {
+        scheduleExpiredNotification(intl);
+        resetToChannel();
+    };
+
+    const isSSOWithRedirectURLAvailable = isMinimumServerVersion(config.Version!, 5, 33, 0);
+
+    const props = {
+        loginError,
+        loginUrl,
+        onCSRFToken: (csrfToken: string) => {
+            Client4.setCSRF(csrfToken);
+        },
+        onMMToken,
+        setLoginError,
+        theme,
+    };
+
+    if (!isSSOWithRedirectURLAvailable || managedConfig?.inAppSessionAuth === 'true') {
+        return (
+            <SSOWithWebView
+                {...props}
+                completeUrlPath={completeUrlPath}
+                serverUrl={serverUrl}
+                ssoType={ssoType}
+            />
+        );
+    }
+    return <SSOWithRedirectURL {...props}/>;
+};
+
+export default SSO;
diff --git a/app/screens/sso/sso.test.tsx b/app/screens/sso/sso.test.tsx
new file mode 100644
index 000000000..50b3e1ea8
--- /dev/null
+++ b/app/screens/sso/sso.test.tsx
@@ -0,0 +1,44 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import {Preferences} from '@constants';
+import {renderWithIntl} from '@test/intl-test-helper';
+
+import SSOLogin from './index';
+
+jest.mock('@screens/navigation', () => {
+    return {
+        getThemeFromState: () => 'light',
+    };
+});
+
+jest.mock('@utils/url', () => {
+    return {
+        tryOpenURL: () => true,
+    };
+});
+
+describe('SSO', () => {
+    const baseProps = {
+        license: {
+            IsLicensed: 'true',
+        },
+        ssoType: 'GITLAB',
+        theme: Preferences.THEMES.default,
+        serverUrl: 'https://rc.test.mattermost.com',
+    };
+
+    test('implement with webview when version is less than 5.32 version', async () => {
+        const props = {...baseProps, config: {Version: '5.32.0'}};
+        const {getByTestId} = renderWithIntl(<SSOLogin {...props}/>);
+        expect(getByTestId('sso.webview')).toBeTruthy();
+    });
+
+    test('implement with OS browser & redirect url from version 5.33', async () => {
+        const props = {...baseProps, config: {Version: '5.36.0'}};
+        const {getByTestId} = renderWithIntl(<SSOLogin {...props}/>);
+        expect(getByTestId('sso.redirect_url')).toBeTruthy();
+    });
+});
diff --git a/app/screens/sso/sso_with_redirect_url.test.tsx b/app/screens/sso/sso_with_redirect_url.test.tsx
new file mode 100644
index 000000000..578b4b7e3
--- /dev/null
+++ b/app/screens/sso/sso_with_redirect_url.test.tsx
@@ -0,0 +1,50 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import Preferences from '@constants/preferences';
+import {renderWithIntl} from '@test/intl-test-helper';
+
+import SSOWithRedirectURL from './sso_with_redirect_url';
+
+jest.mock('@utils/url', () => {
+    return {
+        tryOpenURL: () => null,
+    };
+});
+
+describe('SSO with redirect url', () => {
+    const baseProps = {
+        customUrlScheme: 'mmauth://',
+        intl: {},
+        loginError: '',
+        loginUrl: '',
+        onCSRFToken: jest.fn(),
+        onMMToken: jest.fn(),
+        setLoginError: jest.fn(),
+        theme: Preferences.THEMES.default,
+    };
+
+    test('should show message when user navigates to the page', () => {
+        const {getByTestId} = renderWithIntl(<SSOWithRedirectURL {...baseProps}/>);
+        expect(getByTestId('mobile.oauth.switch_to_browser')).toBeDefined();
+    });
+
+    test('should show "try again" and hide default message when error text is displayed', () => {
+        const {getByTestId} = renderWithIntl(
+            <SSOWithRedirectURL
+                {...baseProps}
+                loginError='some error'
+            />,
+        );
+        expect(getByTestId('mobile.oauth.try_again')).toBeDefined();
+        let browser;
+        try {
+            browser = getByTestId('mobile.oauth.switch_to_browser');
+        } catch (error) {
+            // do nothing
+        }
+        expect(browser).toBeUndefined();
+    });
+});
diff --git a/app/screens/sso/sso_with_redirect_url.tsx b/app/screens/sso/sso_with_redirect_url.tsx
new file mode 100644
index 000000000..5162cedbd
--- /dev/null
+++ b/app/screens/sso/sso_with_redirect_url.tsx
@@ -0,0 +1,182 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+import React, {useEffect, useState} from 'react';
+import {useIntl} from 'react-intl';
+import {Linking, Platform, Text, TouchableOpacity, View} from 'react-native';
+import DeviceInfo from 'react-native-device-info';
+import {SafeAreaView} from 'react-native-safe-area-context';
+import urlParse from 'url-parse';
+
+import FormattedText from '@components/formatted_text';
+import Loading from '@components/loading';
+import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+import {setDeepLinkUrl} from '@requests/local/systems';
+import {tryOpenURL} from '@utils/url';
+
+interface SSOWithRedirectURLProps {
+    loginError: string;
+    loginUrl: string;
+    onCSRFToken: (token: string) => void;
+    onMMToken: (token: string) => void;
+    setLoginError: (value: string) => void;
+    theme: Partial<Theme>
+}
+
+const SSOWithRedirectURL = ({loginError, loginUrl, onCSRFToken, onMMToken, setLoginError, theme}: SSOWithRedirectURLProps) => {
+    const [error, setError] = useState<string>('');
+    const style = getStyleSheet(theme);
+    const intl = useIntl();
+    let customUrlScheme = 'mmauth://';
+    if (DeviceInfo.getBundleId && DeviceInfo.getBundleId().includes('rnbeta')) {
+        customUrlScheme = 'mmauthbeta://';
+    }
+
+    const redirectUrl = customUrlScheme + 'callback';
+    const init = (resetErrors?: boolean) => {
+        if (resetErrors !== false) {
+            setError('');
+            setLoginError('');
+        }
+        const parsedUrl = urlParse(loginUrl, true);
+        parsedUrl.set('query', {
+            ...parsedUrl.query,
+            redirect_to: redirectUrl,
+        });
+        const url = parsedUrl.toString();
+
+        const onError = (e: Error) => {
+            let message;
+            if (e && Platform.OS === 'android' && e?.message?.match(/no activity found to handle intent/i)) {
+                message = intl.formatMessage({
+                    id: 'mobile.oauth.failed_to_open_link_no_browser',
+                    defaultMessage: 'The link failed to open. Please verify if a browser is installed in the current space.',
+                });
+            } else {
+                message = intl.formatMessage({
+                    id: 'mobile.oauth.failed_to_open_link',
+                    defaultMessage: 'The link failed to open. Please try again.',
+                });
+            }
+            setError(
+                message,
+            );
+        };
+        tryOpenURL(url, onError);
+    };
+
+    useEffect(() => {
+        const onURLChange = ({url}: { url: string }) => {
+            if (url && url.startsWith(redirectUrl)) {
+                // save deepLinkUrl under Global
+                setDeepLinkUrl('');
+                const parsedUrl = urlParse(url, true);
+                if (parsedUrl.query && parsedUrl.query.MMCSRF && parsedUrl.query.MMAUTHTOKEN) {
+                    onCSRFToken(parsedUrl.query.MMCSRF);
+                    onMMToken(parsedUrl.query.MMAUTHTOKEN);
+                } else {
+                    setError(
+                        intl.formatMessage({
+                            id: 'mobile.oauth.failed_to_login',
+                            defaultMessage: 'Your login attempt failed. Please try again.',
+                        }),
+                    );
+                }
+            }
+        };
+
+        Linking.addEventListener('url', onURLChange);
+        init(false);
+        return () => {
+            Linking.removeEventListener('url', onURLChange);
+        };
+    }, []);
+
+    return (
+        <SafeAreaView
+            style={style.container}
+            testID='sso.redirect_url'
+        >
+            {loginError || error ? (
+                <View style={style.errorContainer}>
+                    <View style={style.errorTextContainer}>
+                        <Text style={style.errorText}>
+                            {`${loginError || error}.`}
+                        </Text>
+                    </View>
+                    <TouchableOpacity onPress={() => init()}>
+                        <FormattedText
+                            id='mobile.oauth.try_again'
+                            testID='mobile.oauth.try_again'
+                            defaultMessage='Try again'
+                            style={style.button}
+                        />
+                    </TouchableOpacity>
+                </View>
+            ) : (
+                <View style={style.infoContainer}>
+                    <FormattedText
+                        id='mobile.oauth.switch_to_browser'
+                        testID='mobile.oauth.switch_to_browser'
+                        defaultMessage='Please use your browser to complete the login'
+                        style={style.infoText}
+                    />
+                    <TouchableOpacity onPress={() => init()}>
+                        <FormattedText
+                            id='mobile.oauth.restart_login'
+                            testID='mobile.oauth.restart_login'
+                            defaultMessage='Restart login'
+                            style={style.button}
+                        />
+                    </TouchableOpacity>
+                    <Loading/>
+                </View>
+            )}
+        </SafeAreaView>
+    );
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
+    return {
+        container: {
+            flex: 1,
+        },
+        errorContainer: {
+            alignItems: 'center',
+            flex: 1,
+            marginTop: 40,
+        },
+        errorTextContainer: {
+            marginBottom: 12,
+        },
+        errorText: {
+            color: changeOpacity(theme.centerChannelColor, 0.6),
+            fontSize: 16,
+            fontWeight: '400',
+            lineHeight: 23,
+            textAlign: 'center',
+        },
+        infoContainer: {
+            alignItems: 'center',
+            flex: 1,
+            justifyContent: 'center',
+            marginTop: 40,
+        },
+        infoText: {
+            color: changeOpacity(theme.centerChannelColor, 0.6),
+            fontSize: 16,
+            fontWeight: '400',
+            lineHeight: 23,
+            marginBottom: 6,
+        },
+        button: {
+            backgroundColor: theme.buttonBg,
+            color: theme.buttonColor,
+            fontSize: 16,
+            paddingHorizontal: 9,
+            paddingVertical: 9,
+            marginTop: 3,
+        },
+    };
+});
+
+export default SSOWithRedirectURL;
diff --git a/app/screens/sso/sso_with_webview.tsx b/app/screens/sso/sso_with_webview.tsx
new file mode 100644
index 000000000..3cd054e5f
--- /dev/null
+++ b/app/screens/sso/sso_with_webview.tsx
@@ -0,0 +1,247 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import CookieManager, {Cookies} from '@react-native-community/cookies';
+import React, {useEffect} from 'react';
+import {useIntl} from 'react-intl';
+import {Alert, Text, View} from 'react-native';
+import {SafeAreaView} from 'react-native-safe-area-context';
+import {WebView} from 'react-native-webview';
+import {
+    WebViewErrorEvent,
+    WebViewMessageEvent,
+    WebViewNavigation,
+    WebViewNavigationEvent,
+} from 'react-native-webview/lib/WebViewTypes';
+import urlParse from 'url-parse';
+
+import {Client4} from '@client/rest';
+import Loading from '@components/loading';
+import {SSO} from '@constants';
+import {popTopScreen} from '@screens/navigation';
+import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+
+const HEADERS = {
+    'X-Mobile-App': 'mattermost',
+};
+
+const postMessageJS = "window.postMessage(document.body.innerText, '*');";
+
+// Used to make sure that OneLogin forms scale appropriately on both platforms.
+const oneLoginFormScalingJS = `
+    (function() {
+        var loginPage = document.getElementById('login-page');
+        var submitButton = document.getElementById('user_submit');
+
+        if (loginPage) {
+            loginPage.setAttribute('style', 'background-repeat: repeat-y;');
+        }
+        
+        function resetPadding() {
+            var mainBody = document.getElementById('body-main');
+            
+            if (mainBody) {
+                mainBody.setAttribute('style', 'height: auto; padding: 10px 0;');
+            }
+
+            if (submitButton) {
+                submitButton.removeEventListener('click', resetPadding);
+            }
+        }
+
+        resetPadding();
+        
+        if (submitButton) {
+            submitButton.addEventListener('click', resetPadding);
+        }
+    })();
+`;
+
+interface SSOWithWebViewProps {
+    completeUrlPath: string;
+    loginError: string;
+    loginUrl: string;
+    onCSRFToken: (token: string) => void;
+    onMMToken: (token: string) => void;
+    serverUrl: string;
+    ssoType: string;
+    theme: Partial<Theme>
+}
+
+const SSOWithWebView = ({completeUrlPath, loginError, loginUrl, onCSRFToken, onMMToken, serverUrl, ssoType, theme}: SSOWithWebViewProps) => {
+    const style = getStyleSheet(theme);
+    const intl = useIntl();
+    const [error, setError] = React.useState(null);
+    const [jsCode, setJSCode] = React.useState('');
+    const [messagingEnabled, setMessagingEnabled] = React.useState(false);
+    const [shouldRenderWebView, setShouldRenderWebView] = React.useState(true);
+    const cookiesTimeout = React.useRef<NodeJS.Timeout>();
+    const webView = React.useRef<WebView>(null);
+
+    useEffect(() => {
+        return () => {
+            if (cookiesTimeout.current) {
+                clearTimeout(cookiesTimeout.current);
+            }
+        };
+    }, []);
+
+    const extractCookie = (parsedUrl: urlParse) => {
+        try {
+            const original = urlParse(serverUrl);
+
+            // Check whether we need to set a sub-path
+            parsedUrl.set('pathname', original.pathname || '');
+
+            // Rebuild the server url without query string and/or hash
+            const url = `${parsedUrl.origin}${parsedUrl.pathname}`;
+            Client4.setUrl(url);
+
+            CookieManager.get(url, true).then((res: Cookies) => {
+                const mmtoken = res.MMAUTHTOKEN;
+                const csrf = res.MMCSRF;
+                const token = typeof mmtoken === 'object' ? mmtoken.value : mmtoken;
+                const csrfToken = typeof csrf === 'object' ? csrf.value : csrf;
+
+                if (csrfToken) {
+                    onCSRFToken(csrfToken);
+                }
+                if (token) {
+                    onMMToken(token);
+                    if (cookiesTimeout.current) {
+                        clearTimeout(cookiesTimeout.current);
+                    }
+                    setShouldRenderWebView(false);
+                } else if (webView.current && !error) {
+                    webView.current.injectJavaScript(postMessageJS);
+                    cookiesTimeout.current = setTimeout(extractCookie.bind(null, parsedUrl), 250);
+                }
+            });
+        } catch (e) {
+            Alert.alert(
+                intl.formatMessage({
+                    id: 'mobile.oauth.something_wrong',
+                    defaultMessage: 'Something went wrong',
+                }),
+                '',
+                [{
+                    text: intl.formatMessage({
+                        id: 'mobile.oauth.something_wrong.okButon',
+                        defaultMessage: 'Ok',
+                    }),
+                    onPress: () => {
+                        popTopScreen();
+                    },
+                }],
+            );
+        }
+    };
+
+    const onMessage = (event: WebViewMessageEvent) => {
+        try {
+            const response = JSON.parse(event.nativeEvent.data);
+            if (response) {
+                const {
+                    id,
+                    message,
+                    status_code: statusCode,
+                } = response;
+                if (id && message && statusCode !== 200) {
+                    if (cookiesTimeout.current) {
+                        clearTimeout(cookiesTimeout.current);
+                    }
+                    setError(message);
+                }
+            }
+        } catch (e) {
+            // do nothing
+        }
+    };
+
+    const onNavigationStateChange = (navState: WebViewNavigation) => {
+        const {url} = navState;
+        let isMessagingEnabled = false;
+        const parsed = urlParse(url);
+        if (parsed.host.includes('.onelogin.com')) {
+            setJSCode(oneLoginFormScalingJS);
+        } else if (parsed.pathname === completeUrlPath) {
+            // To avoid `window.postMessage` conflicts in any of the SSO flows
+            // we enable the onMessage handler only When the webView navigates to the final SSO URL.
+            isMessagingEnabled = true;
+        }
+        setMessagingEnabled(isMessagingEnabled);
+    };
+
+    const onLoadEnd = (event: WebViewNavigationEvent | WebViewErrorEvent) => {
+        const url = event.nativeEvent.url;
+        const parsed = urlParse(url);
+
+        let isLastRedirect = url.includes(completeUrlPath);
+        if (ssoType === SSO.SAML) {
+            isLastRedirect = isLastRedirect && !parsed.query;
+        }
+
+        if (isLastRedirect) {
+            extractCookie(parsed);
+        }
+    };
+
+    const renderWebView = () => {
+        if (shouldRenderWebView) {
+            const userAgent = ssoType === SSO.GOOGLE ? 'Mozilla/5.0 (Linux; Android 10; Android SDK built for x86 Build/LMY48X) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/81.0.4044.117 Mobile Safari/608.2.11' : undefined;
+            return (
+                <WebView
+                    automaticallyAdjustContentInsets={false}
+                    cacheEnabled={true}
+                    injectedJavaScript={jsCode}
+                    javaScriptEnabled={true}
+                    onLoadEnd={onLoadEnd}
+                    onMessage={messagingEnabled ? onMessage : undefined}
+                    onNavigationStateChange={onNavigationStateChange}
+                    onShouldStartLoadWithRequest={() => true}
+                    ref={webView}
+                    source={{uri: loginUrl, headers: HEADERS}}
+                    startInLoadingState={true}
+                    userAgent={userAgent}
+                    useSharedProcessPool={false}
+                />
+            );
+        }
+        return (<Loading/>);
+    };
+
+    return (
+        <SafeAreaView
+            style={style.container}
+            testID='sso.webview'
+        >
+            {error || loginError ? (
+                <View style={style.errorContainer}>
+                    <Text style={style.errorText}>{error || loginError}</Text>
+                </View>
+            ) : renderWebView()}
+        </SafeAreaView>
+    );
+};
+
+const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
+    return {
+        container: {
+            flex: 1,
+        },
+        errorContainer: {
+            alignItems: 'center',
+            flex: 1,
+            marginTop: 40,
+        },
+        errorText: {
+            color: changeOpacity(theme.centerChannelColor, 0.4),
+            fontSize: 16,
+            fontWeight: '400',
+            lineHeight: 23,
+            paddingHorizontal: 30,
+        },
+    };
+});
+
+export default SSOWithWebView;
diff --git a/app/store/ephemeral_store.ts b/app/store/ephemeral_store.ts
index dc3fc2456..a8102b3fd 100644
--- a/app/store/ephemeral_store.ts
+++ b/app/store/ephemeral_store.ts
@@ -3,10 +3,6 @@
 
 class EphemeralStore {
     allNavigationComponentIds: string[] = [];
-    appStarted = false;
-    appStartedFromPushNotification = false;
-    currentServerUrl: string | null | undefined;
-    deviceToken: string | null | undefined;
     navigationComponentIdStack: string[] = [];
     navigationModalStack: string[] = [];
 
@@ -62,14 +58,6 @@ class EphemeralStore {
             this.navigationModalStack.splice(index, 1);
         }
     }
-
-    getStartFromNotification = () => {
-        return this.appStartedFromPushNotification;
-    };
-
-    setStartFromNotification = (value: boolean) => {
-        this.appStartedFromPushNotification = value;
-    };
 }
 
 export default new EphemeralStore();
diff --git a/app/utils/database.ts b/app/utils/database.ts
new file mode 100644
index 000000000..fc739b7d4
--- /dev/null
+++ b/app/utils/database.ts
@@ -0,0 +1,58 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import urlParse from 'url-parse';
+
+import DatabaseConnectionException from '@database/exceptions/database_connection_exception';
+import DatabaseManager from '@database/manager';
+
+type SetActiveDatabaseArgs = {
+  serverUrl: string;
+  displayName?: string;
+};
+
+export const createAndSetActiveDatabase = async ({serverUrl, displayName}: SetActiveDatabaseArgs) => {
+    const connectionName = displayName ?? urlParse(serverUrl)?.hostname;
+
+    try {
+        const databaseClient = new DatabaseManager();
+        await databaseClient.getDatabaseConnection({serverUrl, connectionName, setAsActiveDatabase: true});
+    } catch (e) {
+        throw new DatabaseConnectionException(
+            `createAndSetActiveDatabase: Unable to create and set serverUrl ${serverUrl} as current active database with name ${displayName}`,
+        );
+    }
+};
+
+export const getDefaultDatabase = async () => {
+    try {
+        const databaseClient = new DatabaseManager();
+        const defaultDatabase = await databaseClient.getDefaultDatabase();
+        return {
+            error: defaultDatabase ? null : 'Unable to retrieve the App database.',
+            defaultDatabase,
+        };
+    } catch (e) {
+        return {
+            error: 'Unable to retrieve the App database.',
+            defaultDatabase: null,
+        };
+    }
+};
+
+export const getActiveServerDatabase = async () => {
+    try {
+        const databaseClient = new DatabaseManager();
+        const activeServerDatabase = await databaseClient.getActiveServerDatabase();
+
+        return {
+            error: activeServerDatabase ? null : 'Unable to retrieve the current active server database.',
+            activeServerDatabase,
+        };
+    } catch (e) {
+        return {
+            error: 'Unable to retrieve the current active server database.',
+            activeServerDatabase: null,
+        };
+    }
+};
diff --git a/app/utils/font_family.js b/app/utils/font_family.ts
similarity index 84%
rename from app/utils/font_family.js
rename to app/utils/font_family.ts
index df3803ed4..765fec89a 100644
--- a/app/utils/font_family.js
+++ b/app/utils/font_family.ts
@@ -18,8 +18,11 @@ const setFontFamily = () => {
             fontSize: 16,
         },
     });
-
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     const oldRender = Text.render;
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     Text.render = function render(...args) {
         const origin = oldRender.call(this, ...args);
         return cloneElement(origin, {
diff --git a/app/utils/general/index.ts b/app/utils/general/index.ts
new file mode 100644
index 000000000..b4e047a38
--- /dev/null
+++ b/app/utils/general/index.ts
@@ -0,0 +1,27 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function emptyFunction(e?: any) {
+    // eslint-disable-line no-empty-function, @typescript-eslint/no-unused-vars
+}
+
+// Generates a RFC-4122 version 4 compliant globally unique identifier.
+export const generateId = (): string => {
+    // implementation taken from http://stackoverflow.com/a/2117523
+    let id = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
+    id = id.replace(/[xy]/g, (c) => {
+        const r = Math.floor(Math.random() * 16);
+        let v;
+
+        if (c === 'x') {
+            v = r;
+        } else {
+            // eslint-disable-next-line no-mixed-operators
+            v = (r & 0x3) | 0x8;
+        }
+
+        return v.toString(16);
+    });
+    return id;
+};
diff --git a/app/utils/helpers.ts b/app/utils/helpers.ts
new file mode 100644
index 000000000..dcc3778a9
--- /dev/null
+++ b/app/utils/helpers.ts
@@ -0,0 +1,74 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+// isMinimumServerVersion will return true if currentVersion is equal to higher or than
+// the provided minimum version. A non-equal major version will ignore minor and dot
+// versions, and a non-equal minor version will ignore dot version.
+// currentVersion is a string, e.g '4.6.0'
+// minMajorVersion, minMinorVersion, minDotVersion are integers
+export const isMinimumServerVersion = (currentVersion: string, minMajorVersion = 0, minMinorVersion = 0, minDotVersion = 0): boolean => {
+    if (!currentVersion || typeof currentVersion !== 'string') {
+        return false;
+    }
+
+    const split = currentVersion.split('.');
+
+    const major = parseInt(split[0], 10);
+    const minor = parseInt(split[1] || '0', 10);
+    const dot = parseInt(split[2] || '0', 10);
+
+    if (major > minMajorVersion) {
+        return true;
+    }
+    if (major < minMajorVersion) {
+        return false;
+    }
+
+    // Major version is equal, check minor
+    if (minor > minMinorVersion) {
+        return true;
+    }
+    if (minor < minMinorVersion) {
+        return false;
+    }
+
+    // Minor version is equal, check dot
+    if (dot > minDotVersion) {
+        return true;
+    }
+    if (dot < minDotVersion) {
+        return false;
+    }
+
+    // Dot version is equal
+    return true;
+};
+
+export function buildQueryString(parameters: Dictionary<any>): string {
+    const keys = Object.keys(parameters);
+    if (keys.length === 0) {
+        return '';
+    }
+
+    let query = '?';
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        query += key + '=' + encodeURIComponent(parameters[key]);
+
+        if (i < keys.length - 1) {
+            query += '&';
+        }
+    }
+
+    return query;
+}
+
+export function isEmail(email: string): boolean {
+    // writing a regex to match all valid email addresses is really, really hard. (see http://stackoverflow.com/a/201378)
+    // this regex ensures:
+    // - at least one character that is not a space, comma, or @ symbol
+    // - followed by a single @ symbol
+    // - followed by at least one character that is not a space, comma, or @ symbol
+    // this prevents <Outlook Style> outlook.style@domain.com addresses and multiple comma-separated addresses from being accepted
+    return (/^[^ ,@]+@[^ ,@]+$/).test(email);
+}
diff --git a/packager/modules.ios.js b/app/utils/i18n.ts
similarity index 70%
rename from packager/modules.ios.js
rename to app/utils/i18n.ts
index 44af78ff1..b8d23d715 100644
--- a/packager/modules.ios.js
+++ b/app/utils/i18n.ts
@@ -1,4 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-module.exports = [];
+export function t(v: string) {
+    return v;
+}
diff --git a/app/utils/key_mirror.ts b/app/utils/key_mirror.ts
index 791e5e42b..e8c98b44f 100644
--- a/app/utils/key_mirror.ts
+++ b/app/utils/key_mirror.ts
@@ -1,6 +1,32 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+/* eslint-disable header/header */
 
+/**
+ * Constructs an enumeration with keys equal to their value.
+ *
+ * For example:
+ *
+ *   var COLORS = keyMirror({blue: null, red: null});
+ *   var myColor = COLORS.blue;
+ *   var isColorValid = !!COLORS[myColor];
+ *
+ * The last line could not be performed if the values of the generated enum were
+ * not equal to their keys.
+ *
+ *   Input:  {key1: val1, key2: val2}
+ *   Output: {key1: key1, key2: key2}
+ *
+ * @param {object} obj
+ * @return {object}
+ */
 export default function keyMirror<T extends {}>(obj: T): { [K in keyof T]: K } {
     if (!(obj instanceof Object && !Array.isArray(obj))) {
         throw new Error('keyMirror(...): Argument must be an object.');
@@ -8,7 +34,7 @@ export default function keyMirror<T extends {}>(obj: T): { [K in keyof T]: K } {
 
     const ret: any = {};
     for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        if (!obj.hasOwnProperty(key)) {
             continue;
         }
 
diff --git a/app/utils/markdown/index.ts b/app/utils/markdown/index.ts
new file mode 100644
index 000000000..1cdf2b63c
--- /dev/null
+++ b/app/utils/markdown/index.ts
@@ -0,0 +1,207 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Platform, StyleSheet} from 'react-native';
+import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+
+export function getCodeFont() {
+    return Platform.OS === 'ios' ? 'Menlo' : 'monospace';
+}
+
+export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme: Theme) => {
+    const codeFont = getCodeFont();
+
+    return {
+        emph: {
+            fontStyle: 'italic',
+        },
+        strong: {
+            fontWeight: 'bold',
+        },
+        del: {
+            textDecorationLine: 'line-through',
+        },
+        link: {
+            color: theme.linkColor,
+        },
+        heading1: {
+            fontSize: 17,
+            fontWeight: '700',
+            lineHeight: 25,
+        },
+        heading1Text: {
+            paddingBottom: 8,
+        },
+        heading2: {
+            fontSize: 17,
+            fontWeight: '700',
+            lineHeight: 25,
+        },
+        heading2Text: {
+            paddingBottom: 8,
+        },
+        heading3: {
+            fontSize: 17,
+            fontWeight: '700',
+            lineHeight: 25,
+        },
+        heading3Text: {
+            paddingBottom: 8,
+        },
+        heading4: {
+            fontSize: 17,
+            fontWeight: '700',
+            lineHeight: 25,
+        },
+        heading4Text: {
+            paddingBottom: 8,
+        },
+        heading5: {
+            fontSize: 17,
+            fontWeight: '700',
+            lineHeight: 25,
+        },
+        heading5Text: {
+            paddingBottom: 8,
+        },
+        heading6: {
+            fontSize: 17,
+            fontWeight: '700',
+            lineHeight: 25,
+        },
+        heading6Text: {
+            paddingBottom: 8,
+        },
+        code: {
+            alignSelf: 'center',
+            backgroundColor: changeOpacity(theme.centerChannelColor, 0.07),
+            fontFamily: codeFont,
+        },
+        codeBlock: {
+            fontFamily: codeFont,
+        },
+        mention: {
+            color: theme.linkColor,
+        },
+        error: {
+            color: theme.errorTextColor,
+        },
+        table_header_row: {
+            fontWeight: '700',
+        },
+        mention_highlight: {
+            backgroundColor: theme.mentionHighlightBg,
+            color: theme.mentionHighlightLink,
+        },
+    };
+});
+
+export const getMarkdownBlockStyles = makeStyleSheetFromTheme((theme: Theme) => {
+    return {
+        adjacentParagraph: {
+            marginTop: 6,
+        },
+        horizontalRule: {
+            backgroundColor: theme.centerChannelColor,
+            height: StyleSheet.hairlineWidth,
+            marginVertical: 10,
+        },
+        quoteBlockIcon: {
+            color: changeOpacity(theme.centerChannelColor, 0.5),
+        },
+    };
+});
+
+const languages: Record<string, string> = {
+    actionscript: 'ActionScript',
+    applescript: 'AppleScript',
+    bash: 'Bash',
+    clojure: 'Clojure',
+    coffeescript: 'CoffeeScript',
+    cpp: 'C++',
+    cs: 'C#',
+    css: 'CSS',
+    d: 'D',
+    dart: 'Dart',
+    delphi: 'Delphi',
+    diff: 'Diff',
+    django: 'Django',
+    dockerfile: 'Dockerfile',
+    elixir: 'Elixir',
+    erlang: 'Erlang',
+    fortran: 'Fortran',
+    fsharp: 'F#',
+    gcode: 'G-code',
+    go: 'Go',
+    groovy: 'Groovy',
+    handlebars: 'Handlebars',
+    haskell: 'Haskell',
+    haxe: 'Haxe',
+    html: 'HTML',
+    java: 'Java',
+    javascript: 'JavaScript',
+    json: 'JSON',
+    julia: 'Julia',
+    kotlin: 'Kotlin',
+    latex: 'LaTeX',
+    less: 'Less',
+    lisp: 'Lisp',
+    lua: 'Lua',
+    makefile: 'Makefile',
+    markdown: 'Markdown',
+    matlab: 'Matlab',
+    objectivec: 'Objective-C',
+    ocaml: 'OCaml',
+    perl: 'Perl',
+    php: 'PHP',
+    powershell: 'PowerShell',
+    puppet: 'Puppet',
+    python: 'Python',
+    r: 'R',
+    ruby: 'Ruby',
+    rust: 'Rust',
+    scala: 'Scala',
+    scheme: 'Scheme',
+    scss: 'SCSS',
+    smalltalk: 'Smalltalk',
+    sql: 'SQL',
+    swift: 'Swift',
+    tex: 'TeX',
+    vbnet: 'VB.NET',
+    vbscript: 'VBScript',
+    verilog: 'Verilog',
+    xml: 'XML',
+    yaml: 'YAML',
+};
+
+export function getDisplayNameForLanguage(language: string) {
+    return languages[language.toLowerCase()] || '';
+}
+
+export function escapeRegex(text: string) {
+    return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+
+export function switchKeyboardForCodeBlocks(value: string, cursorPosition: number) {
+    if (Platform.OS === 'ios' && parseInt(Platform.Version, 10) >= 12) {
+        const regexForCodeBlock = /^```$(.*?)^```$|^```$(.*)/gms;
+
+        const matches = [];
+        let nextMatch;
+        while ((nextMatch = regexForCodeBlock.exec(value)) !== null) {
+            matches.push({
+                startOfMatch: regexForCodeBlock.lastIndex - nextMatch[0].length,
+                endOfMatch: regexForCodeBlock.lastIndex + 1,
+            });
+        }
+
+        const cursorIsInsideCodeBlock = matches.some((match) => cursorPosition >= match.startOfMatch && cursorPosition <= match.endOfMatch);
+
+        // 'email-address' keyboardType prevents iOS emdash autocorrect
+        if (cursorIsInsideCodeBlock) {
+            return 'email-address';
+        }
+    }
+
+    return 'default';
+}
diff --git a/app/utils/tap/index.ts b/app/utils/tap/index.ts
new file mode 100644
index 000000000..e8c14521e
--- /dev/null
+++ b/app/utils/tap/index.ts
@@ -0,0 +1,21 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export function preventDoubleTap(func: (...args: any) => any, doublePressDelay = 300) {
+    let canPressWrapped = true;
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return (...args) => {
+        if (canPressWrapped) {
+            canPressWrapped = false;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            func(...args);
+
+            setTimeout(() => {
+                canPressWrapped = true;
+            }, doublePressDelay);
+        }
+    };
+}
diff --git a/app/utils/tap/test.ts b/app/utils/tap/test.ts
new file mode 100644
index 000000000..6f6af68c3
--- /dev/null
+++ b/app/utils/tap/test.ts
@@ -0,0 +1,49 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {preventDoubleTap} from './index';
+
+/*eslint max-nested-callbacks: 0 */
+describe('Prevent double tap', () => {
+    it('should prevent double taps within the 300ms default', (done) => {
+        const testFunction = jest.fn();
+        const test = preventDoubleTap(testFunction);
+
+        test();
+        test();
+        expect(testFunction).toHaveBeenCalledTimes(1);
+        setTimeout(() => {
+            test();
+            expect(testFunction).toHaveBeenCalledTimes(1);
+            done();
+        }, 100);
+    });
+
+    it('should prevent double taps within 1 second', (done) => {
+        const testFunction = jest.fn();
+        const test = preventDoubleTap(testFunction, 1000);
+
+        test();
+        test();
+        expect(testFunction).toHaveBeenCalledTimes(1);
+        setTimeout(() => {
+            test();
+            expect(testFunction).toHaveBeenCalledTimes(1);
+            done();
+        }, 900);
+    });
+
+    it('should register multiple taps when done > 300ms apart', (done) => {
+        const testFunction = jest.fn();
+        const test = preventDoubleTap(testFunction);
+
+        test();
+        test();
+        expect(testFunction).toHaveBeenCalledTimes(1);
+        setTimeout(() => {
+            test();
+            expect(testFunction).toHaveBeenCalledTimes(2);
+            done();
+        }, 300);
+    });
+});
diff --git a/app/utils/theme/index.ts b/app/utils/theme/index.ts
new file mode 100644
index 000000000..de0af17c7
--- /dev/null
+++ b/app/utils/theme/index.ts
@@ -0,0 +1,151 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {StyleSheet} from 'react-native';
+import tinyColor from 'tinycolor2';
+
+import {mergeNavigationOptions} from '@screens/navigation';
+
+import type {Options} from 'react-native-navigation';
+
+const MODAL_SCREENS_WITHOUT_BACK = [
+    'AddReaction',
+    'ChannelInfo',
+    'ClientUpgrade',
+    'CreateChannel',
+    'EditPost',
+    'ErrorTeamsList',
+    'MoreChannels',
+    'MoreDirectMessages',
+    'Permalink',
+    'SelectTeam',
+    'Settings',
+    'TermsOfService',
+    'UserProfile',
+];
+
+const rgbPattern = /^rgba?\((\d+),(\d+),(\d+)(?:,([\d.]+))?\)$/;
+
+export function getComponents(inColor: string): {red: number; green: number; blue: number; alpha: number} {
+    let color = inColor;
+
+    // RGB color
+    const match = rgbPattern.exec(color);
+    if (match) {
+        return {
+            red: parseInt(match[1], 10),
+            green: parseInt(match[2], 10),
+            blue: parseInt(match[3], 10),
+            alpha: match[4] ? parseFloat(match[4]) : 1,
+        };
+    }
+
+    // Hex color
+    if (color[0] === '#') {
+        color = color.slice(1);
+    }
+
+    if (color.length === 3) {
+        const tempColor = color;
+        color = '';
+
+        color += tempColor[0] + tempColor[0];
+        color += tempColor[1] + tempColor[1];
+        color += tempColor[2] + tempColor[2];
+    }
+
+    return {
+        red: parseInt(color.substring(0, 2), 16),
+        green: parseInt(color.substring(2, 4), 16),
+        blue: parseInt(color.substring(4, 6), 16),
+        alpha: 1,
+    };
+}
+
+export function makeStyleSheetFromTheme(getStyleFromTheme: (a: any) => any): (a: any) => any {
+    let lastTheme: any;
+    let style: any;
+    return (theme: any) => {
+        if (!style || theme !== lastTheme) {
+            style = StyleSheet.create(getStyleFromTheme(theme));
+            lastTheme = theme;
+        }
+
+        return style;
+    };
+}
+
+export function changeOpacity(oldColor: string, opacity: number): string {
+    const {
+        red,
+        green,
+        blue,
+        alpha,
+    } = getComponents(oldColor);
+
+    return `rgba(${red},${green},${blue},${alpha * opacity})`;
+}
+
+export function concatStyles(...styles: any) {
+    return [].concat(styles);
+}
+
+export function setNavigatorStyles(componentId: string, theme: Theme) {
+    const options: Options = {
+        topBar: {
+            title: {
+                color: theme.sidebarHeaderTextColor,
+            },
+            background: {
+                color: theme.sidebarHeaderBg,
+            },
+            leftButtonColor: theme.sidebarHeaderTextColor,
+            rightButtonColor: theme.sidebarHeaderTextColor,
+        },
+        layout: {
+            componentBackgroundColor: theme.centerChannelBg,
+        },
+    };
+
+    if (!MODAL_SCREENS_WITHOUT_BACK.includes(componentId) && options.topBar) {
+        options.topBar.backButton = {
+            color: theme.sidebarHeaderTextColor,
+        };
+    }
+
+    mergeNavigationOptions(componentId, options);
+}
+
+export function getKeyboardAppearanceFromTheme(theme: Theme) {
+    return tinyColor(theme.centerChannelBg).isLight() ? 'light' : 'dark';
+}
+
+export function hexToHue(hexColor: string) {
+    let {red, green, blue} = getComponents(hexColor);
+    red /= 255;
+    green /= 255;
+    blue /= 255;
+
+    const channelMax = Math.max(red, green, blue);
+    const channelMin = Math.min(red, green, blue);
+    const delta = channelMax - channelMin;
+    let hue = 0;
+
+    if (delta === 0) {
+        hue = 0;
+    } else if (channelMax === red) {
+        hue = ((green - blue) / delta) % 6;
+    } else if (channelMax === green) {
+        hue = ((blue - red) / delta) + 2;
+    } else {
+        hue = ((red - green) / delta) + 4;
+    }
+
+    hue = Math.round(hue * 60);
+
+    if (hue < 0) {
+        hue += 360;
+    }
+
+    return hue;
+}
diff --git a/app/utils/theme/test.ts b/app/utils/theme/test.ts
new file mode 100644
index 000000000..bef280481
--- /dev/null
+++ b/app/utils/theme/test.ts
@@ -0,0 +1,41 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {getKeyboardAppearanceFromTheme} from '@utils/theme';
+
+describe('getKeyboardAppearanceFromTheme', () => {
+    const themes: Partial<Theme> = [
+        {
+            centerChannelBg: '#ffffff', // Mattermost
+        },
+        {
+            centerChannelBg: '#f2f4f8', // Organization
+        },
+        {
+            centerChannelBg: '#2f3e4e', // Mattermost Dark
+        },
+        {
+            centerChannelBg: '#1f1f1f', // Windows Dark
+        },
+    ];
+
+    it('should return "light" keyboard appearance for centerChannelBg="#ffffff"', () => {
+        const keyboardAppearance = getKeyboardAppearanceFromTheme(themes[0]);
+        expect(keyboardAppearance).toBe('light');
+    });
+
+    it('should return "light" keyboard appearance for centerChannelBg="#f2f4f8"', () => {
+        const keyboardAppearance = getKeyboardAppearanceFromTheme(themes[1]);
+        expect(keyboardAppearance).toBe('light');
+    });
+
+    it('should return "dark" keyboard appearance for centerChannelBg="#2f3e4e"', () => {
+        const keyboardAppearance = getKeyboardAppearanceFromTheme(themes[2]);
+        expect(keyboardAppearance).toBe('dark');
+    });
+
+    it('should return "dark" keyboard appearance for centerChannelBg="#1f1f1f"', () => {
+        const keyboardAppearance = getKeyboardAppearanceFromTheme(themes[3]);
+        expect(keyboardAppearance).toBe('dark');
+    });
+});
diff --git a/app/constants/deep_linking.ts b/app/utils/time_tracker.ts
similarity index 64%
rename from app/constants/deep_linking.ts
rename to app/utils/time_tracker.ts
index f3ac632db..9a764cf5f 100644
--- a/app/constants/deep_linking.ts
+++ b/app/utils/time_tracker.ts
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 export default {
-    CHANNEL: 'channel',
-    PERMALINK: 'permalink',
-    OTHER: 'other',
+    initialLoad: 0,
+    channelSwitch: 0,
+    teamSwitch: 0,
 };
diff --git a/app/utils/url/index.ts b/app/utils/url/index.ts
new file mode 100644
index 000000000..a131c279c
--- /dev/null
+++ b/app/utils/url/index.ts
@@ -0,0 +1,265 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Linking} from 'react-native';
+import urlParse from 'url-parse';
+
+import {Files} from '@constants';
+import {DeepLinkType, DeepLinkWithData} from '@typings/launch';
+import {emptyFunction} from '@utils/general';
+import {escapeRegex} from '@utils/markdown';
+
+import {latinise} from './latinise';
+
+const ytRegex = /(?:http|https):\/\/(?:www\.|m\.)?(?:(?:youtube\.com\/(?:(?:v\/)|(?:(?:watch|embed\/watch)(?:\/|.*v=))|(?:embed\/)|(?:user\/[^/]+\/u\/[0-9]\/)))|(?:youtu\.be\/))([^#&?]*)/;
+
+export function isValidUrl(url = '') {
+    const regex = /^https?:\/\//i;
+    return regex.test(url);
+}
+
+export function sanitizeUrl(url: string, useHttp = false) {
+    let preUrl = urlParse(url, true);
+    let protocol = preUrl.protocol;
+
+    if (!preUrl.host || preUrl.protocol === 'file:') {
+        preUrl = urlParse('https://' + stripTrailingSlashes(url), true);
+    }
+
+    if (!protocol || (preUrl.protocol === 'http:' && !useHttp)) {
+        protocol = 'https:';
+    }
+
+    return stripTrailingSlashes(
+        `${protocol}//${preUrl.host}${preUrl.pathname}`,
+    );
+}
+
+export async function getServerUrlAfterRedirect(serverUrl: string, useHttp = false) {
+    let url = sanitizeUrl(serverUrl, useHttp);
+
+    try {
+        const resp = await fetch(url, {method: 'HEAD'});
+        if (resp.redirected) {
+            url = resp.url;
+        }
+    } catch {
+    // do nothing
+    }
+
+    return sanitizeUrl(url, useHttp);
+}
+
+export function stripTrailingSlashes(url = '') {
+    return url.replace(/ /g, '').replace(/^\/+/, '').replace(/\/+$/, '');
+}
+
+export function removeProtocol(url = '') {
+    return url.replace(/(^\w+:|^)\/\//, '');
+}
+
+export function extractFirstLink(text: string) {
+    const pattern = /(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[-A-Z0-9+\u0026\u2019@#/%?=()~_|!:,.;]*[-A-Z0-9+\u0026@#/%=~()_|])/i;
+    let inText = text;
+
+    // strip out code blocks
+    inText = inText.replace(/`[^`]*`/g, '');
+
+    // strip out inline markdown images
+    inText = inText.replace(/!\[[^\]]*]\([^)]*\)/g, '');
+
+    const match = pattern.exec(inText);
+    if (match) {
+        return match[0].trim();
+    }
+
+    return '';
+}
+
+export function isYoutubeLink(link: string) {
+    return link.trim().match(ytRegex);
+}
+
+export function isImageLink(link: string) {
+    let linkWithoutQuery = link;
+    if (link.indexOf('?') !== -1) {
+        linkWithoutQuery = linkWithoutQuery.split('?')[0];
+    }
+
+    for (let i = 0; i < Files.IMAGE_TYPES.length; i++) {
+        const imageType = Files.IMAGE_TYPES[i];
+
+        if (linkWithoutQuery.endsWith('.' + imageType) || linkWithoutQuery.endsWith('=' + imageType)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Converts the protocol of a link (eg. http, ftp) to be lower case since
+// Android doesn't handle uppercase links.
+export function normalizeProtocol(url: string) {
+    const index = url.indexOf(':');
+    if (index === -1) {
+        // There's no protocol on the link to be normalized
+        return url;
+    }
+
+    const protocol = url.substring(0, index);
+    return protocol.toLowerCase() + url.substring(index);
+}
+
+export function getShortenedURL(url = '', getLength = 27) {
+    if (url.length > 35) {
+        const subLength = getLength - 14;
+        return url.substring(0, 10) + '...' + url.substring(url.length - subLength, url.length) + '/';
+    }
+    return url + '/';
+}
+
+export function cleanUpUrlable(input: string) {
+    let cleaned = latinise(input);
+    cleaned = cleaned.trim().replace(/-/g, ' ').replace(/[^\w\s]/gi, '').toLowerCase().replace(/\s/g, '-');
+    cleaned = cleaned.replace(/-{2,}/, '-');
+    cleaned = cleaned.replace(/^-+/, '');
+    cleaned = cleaned.replace(/-+$/, '');
+    return cleaned;
+}
+
+export function getScheme(url: string) {
+    const match = (/([a-z0-9+.-]+):/i).exec(url);
+
+    return match && match[1];
+}
+
+export const PERMALINK_GENERIC_TEAM_NAME_REDIRECT = '_redirect';
+
+export function parseDeepLink(deepLinkUrl: string): DeepLinkWithData {
+    const url = removeProtocol(deepLinkUrl);
+
+    let match = new RegExp('(.*)\\/([^\\/]+)\\/channels\\/(\\S+)').exec(url);
+    if (match) {
+        return {type: DeepLinkType.Channel, data: {serverUrl: match[1], teamName: match[2], channelName: match[3]}};
+    }
+
+    match = new RegExp('(.*)\\/([^\\/]+)\\/pl\\/(\\w+)').exec(url);
+    if (match) {
+        return {type: DeepLinkType.Permalink, data: {serverUrl: match[1], teamName: match[2], postId: match[3]}};
+    }
+
+    match = new RegExp('(.*)\\/([^\\/]+)\\/messages\\/@(\\S+)').exec(url);
+    if (match) {
+        return {type: DeepLinkType.DirectMessage, data: {serverUrl: match[1], teamName: match[2], userName: match[3]}};
+    }
+
+    match = new RegExp('(.*)\\/([^\\/]+)\\/messages\\/(\\S+)').exec(url);
+    if (match) {
+        return {type: DeepLinkType.GroupMessage, data: {serverUrl: match[1], teamName: match[2], channelId: match[3]}};
+    }
+
+    return {type: DeepLinkType.Invalid};
+}
+
+export function matchDeepLink(url?: string, serverURL?: string, siteURL?: string) {
+    if (!url || (!serverURL && !siteURL)) {
+        return null;
+    }
+
+    let urlToMatch = url;
+
+    if (!url.startsWith('mattermost://')) {
+        // If url doesn't contain site or server URL, tack it on.
+        // e.g. <jump to convo> URLs from autolink plugin.
+        const urlBase = serverURL || siteURL || '';
+        const match = new RegExp(escapeRegex(urlBase)).exec(url);
+        if (!match) {
+            urlToMatch = urlBase + url;
+        }
+    }
+
+    const parsedDeepLink = parseDeepLink(urlToMatch);
+    if (parsedDeepLink.type !== DeepLinkType.Invalid) {
+        return parsedDeepLink;
+    }
+
+    return null;
+}
+
+export function getYouTubeVideoId(link: string) {
+    // https://youtube.com/watch?v=<id>
+    let match = (/youtube\.com\/watch\?\S*\bv=([a-zA-Z0-9_-]{6,11})/g).exec(link);
+    if (match) {
+        return match[1];
+    }
+
+    // https://youtube.com/embed/<id>
+    match = (/youtube\.com\/embed\/([a-zA-Z0-9_-]{6,11})/g).exec(link);
+    if (match) {
+        return match[1];
+    }
+
+    // https://youtu.be/<id>
+    match = (/youtu.be\/([a-zA-Z0-9_-]{6,11})/g).exec(link);
+    if (match) {
+        return match[1];
+    }
+
+    return '';
+}
+
+export function tryOpenURL(url: string, onError = emptyFunction, onSuccess = emptyFunction) {
+    Linking.openURL(url).
+        then(onSuccess).
+        catch(onError);
+}
+
+// Given a URL from an API request, return a URL that has any parts removed that are either sensitive or that would
+// prevent properly grouping the messages in Sentry.
+export function cleanUrlForLogging(baseUrl: string, apiUrl: string): string {
+    let url = apiUrl;
+
+    // Trim the host name
+    url = url.substring(baseUrl.length);
+
+    // Filter the query string
+    const index = url.indexOf('?');
+    if (index !== -1) {
+        url = url.substring(0, index);
+    }
+
+    // A non-exhaustive whitelist to exclude parts of the URL that are unimportant (eg IDs) or may be sentsitive
+    // (eg email addresses). We prefer filtering out fields that aren't recognized because there should generally
+    // be enough left over for debugging.
+    //
+    // Note that new API routes don't need to be added here since this shouldn't be happening for newly added routes.
+    const whitelist = [
+        'api', 'v4', 'users', 'teams', 'scheme', 'name', 'members', 'channels', 'posts', 'reactions', 'commands',
+        'files', 'preferences', 'hooks', 'incoming', 'outgoing', 'oauth', 'apps', 'emoji', 'brand', 'image',
+        'data_retention', 'jobs', 'plugins', 'roles', 'system', 'timezones', 'schemes', 'redirect_location', 'patch',
+        'mfa', 'password', 'reset', 'send', 'active', 'verify', 'terms_of_service', 'login', 'logout', 'ids',
+        'usernames', 'me', 'username', 'email', 'default', 'sessions', 'revoke', 'all', 'device', 'status',
+        'search', 'switch', 'authorized', 'authorize', 'deauthorize', 'tokens', 'disable', 'enable', 'exists', 'unread',
+        'invite', 'batch', 'stats', 'import', 'schemeRoles', 'direct', 'group', 'convert', 'view', 'search_autocomplete',
+        'thread', 'info', 'flagged', 'pinned', 'pin', 'unpin', 'opengraph', 'actions', 'thumbnail', 'preview', 'link',
+        'delete', 'logs', 'ping', 'config', 'client', 'license', 'websocket', 'webrtc', 'token', 'regen_token',
+        'autocomplete', 'execute', 'regen_secret', 'policy', 'type', 'cancel', 'reload', 'environment', 's3_test', 'file',
+        'caches', 'invalidate', 'database', 'recycle', 'compliance', 'reports', 'cluster', 'ldap', 'test', 'sync', 'saml',
+        'certificate', 'public', 'private', 'idp', 'elasticsearch', 'purge_indexes', 'analytics', 'old', 'webapp', 'fake',
+    ];
+
+    url = url.split('/').map((part) => {
+        if (part !== '' && whitelist.indexOf(part) === -1) {
+            return '<filtered>';
+        }
+
+        return part;
+    }).join('/');
+
+    if (index !== -1) {
+        // Add this on afterwards since it wouldn't pass the whitelist
+        url += '?<filtered>';
+    }
+
+    return url;
+}
diff --git a/app/utils/url/latin_map.ts b/app/utils/url/latin_map.ts
new file mode 100644
index 000000000..4caf1a13f
--- /dev/null
+++ b/app/utils/url/latin_map.ts
@@ -0,0 +1,995 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+/* eslint-disable max-lines */
+export const latinMap: Record<string, string> = {
+    Á: 'A', // LATIN CAPITAL LETTER A WITH ACUTE
+    Ă: 'A', // LATIN CAPITAL LETTER A WITH BREVE
+    Ắ: 'A', // LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+    Ặ: 'A', // LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+    Ằ: 'A', // LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+    Ẳ: 'A', // LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+    Ẵ: 'A', // LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+    Ǎ: 'A', // LATIN CAPITAL LETTER A WITH CARON
+    Â: 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+    Ấ: 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+    Ậ: 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+    Ầ: 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+    Ẩ: 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+    Ẫ: 'A', // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+    Ä: 'A', // LATIN CAPITAL LETTER A WITH DIAERESIS
+    Ǟ: 'A', // LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+    Ȧ: 'A', // LATIN CAPITAL LETTER A WITH DOT ABOVE
+    Ǡ: 'A', // LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+    Ạ: 'A', // LATIN CAPITAL LETTER A WITH DOT BELOW
+    Ȁ: 'A', // LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+    À: 'A', // LATIN CAPITAL LETTER A WITH GRAVE
+    Ả: 'A', // LATIN CAPITAL LETTER A WITH HOOK ABOVE
+    Ȃ: 'A', // LATIN CAPITAL LETTER A WITH INVERTED BREVE
+    Ā: 'A', // LATIN CAPITAL LETTER A WITH MACRON
+    Ą: 'A', // LATIN CAPITAL LETTER A WITH OGONEK
+    Å: 'A', // LATIN CAPITAL LETTER A WITH RING ABOVE
+    Ǻ: 'A', // LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+    Ḁ: 'A', // LATIN CAPITAL LETTER A WITH RING BELOW
+    Ⱥ: 'A', // LATIN CAPITAL LETTER A WITH STROKE
+    Ã: 'A', // LATIN CAPITAL LETTER A WITH TILDE
+    Ꜳ: 'AA', // LATIN CAPITAL LETTER AA
+    Æ: 'AE', // LATIN CAPITAL LETTER AE
+    Ǽ: 'AE', // LATIN CAPITAL LETTER AE WITH ACUTE
+    Ǣ: 'AE', // LATIN CAPITAL LETTER AE WITH MACRON
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER AFRICAN D' (Ɖ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER ALPHA' (Ɑ)
+    Ꜵ: 'AO', // LATIN CAPITAL LETTER AO
+    Ꜷ: 'AU', // LATIN CAPITAL LETTER AU
+    Ꜹ: 'AV', // LATIN CAPITAL LETTER AV
+    Ꜻ: 'AV', // LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+    Ꜽ: 'AY', // LATIN CAPITAL LETTER AY
+    Ḃ: 'B', // LATIN CAPITAL LETTER B WITH DOT ABOVE
+    Ḅ: 'B', // LATIN CAPITAL LETTER B WITH DOT BELOW
+    Ɓ: 'B', // LATIN CAPITAL LETTER B WITH HOOK
+    Ḇ: 'B', // LATIN CAPITAL LETTER B WITH LINE BELOW
+    Ƀ: 'B', // LATIN CAPITAL LETTER B WITH STROKE
+    Ƃ: 'B', // LATIN CAPITAL LETTER B WITH TOPBAR
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER BROKEN L' (Ꝇ)
+    Ć: 'C', // LATIN CAPITAL LETTER C WITH ACUTE
+    Č: 'C', // LATIN CAPITAL LETTER C WITH CARON
+    Ç: 'C', // LATIN CAPITAL LETTER C WITH CEDILLA
+    Ḉ: 'C', // LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+    Ĉ: 'C', // LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+    Ċ: 'C', // LATIN CAPITAL LETTER C WITH DOT ABOVE
+    Ƈ: 'C', // LATIN CAPITAL LETTER C WITH HOOK
+    Ȼ: 'C', // LATIN CAPITAL LETTER C WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER CON' (Ꝯ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER CUATRILLO' (Ꜭ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER CUATRILLO WITH COMMA' (Ꜯ)
+    Ď: 'D', // LATIN CAPITAL LETTER D WITH CARON
+    Ḑ: 'D', // LATIN CAPITAL LETTER D WITH CEDILLA
+    Ḓ: 'D', // LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+    Ḋ: 'D', // LATIN CAPITAL LETTER D WITH DOT ABOVE
+    Ḍ: 'D', // LATIN CAPITAL LETTER D WITH DOT BELOW
+    Ɗ: 'D', // LATIN CAPITAL LETTER D WITH HOOK
+    Ḏ: 'D', // LATIN CAPITAL LETTER D WITH LINE BELOW
+    Dz: 'D', // LATIN CAPITAL LETTER D WITH SMALL LETTER Z
+    Dž: 'D', // LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
+    Đ: 'D', // LATIN CAPITAL LETTER D WITH STROKE
+    Ƌ: 'D', // LATIN CAPITAL LETTER D WITH TOPBAR
+    DZ: 'DZ', // LATIN CAPITAL LETTER DZ
+    DŽ: 'DZ', // LATIN CAPITAL LETTER DZ WITH CARON
+    É: 'E', // LATIN CAPITAL LETTER E WITH ACUTE
+    Ĕ: 'E', // LATIN CAPITAL LETTER E WITH BREVE
+    Ě: 'E', // LATIN CAPITAL LETTER E WITH CARON
+    Ȩ: 'E', // LATIN CAPITAL LETTER E WITH CEDILLA
+    Ḝ: 'E', // LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+    Ê: 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+    Ế: 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+    Ệ: 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+    Ề: 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+    Ể: 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+    Ễ: 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+    Ḙ: 'E', // LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+    Ë: 'E', // LATIN CAPITAL LETTER E WITH DIAERESIS
+    Ė: 'E', // LATIN CAPITAL LETTER E WITH DOT ABOVE
+    Ẹ: 'E', // LATIN CAPITAL LETTER E WITH DOT BELOW
+    Ȅ: 'E', // LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+    È: 'E', // LATIN CAPITAL LETTER E WITH GRAVE
+    Ẻ: 'E', // LATIN CAPITAL LETTER E WITH HOOK ABOVE
+    Ȇ: 'E', // LATIN CAPITAL LETTER E WITH INVERTED BREVE
+    Ē: 'E', // LATIN CAPITAL LETTER E WITH MACRON
+    Ḗ: 'E', // LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
+    Ḕ: 'E', // LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
+    Ę: 'E', // LATIN CAPITAL LETTER E WITH OGONEK
+    Ɇ: 'E', // LATIN CAPITAL LETTER E WITH STROKE
+    Ẽ: 'E', // LATIN CAPITAL LETTER E WITH TILDE
+    Ḛ: 'E', // LATIN CAPITAL LETTER E WITH TILDE BELOW
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER EGYPTOLOGICAL AIN' (Ꜥ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF' (Ꜣ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER ENG' (Ŋ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER ESH' (Ʃ)
+    Ꝫ: 'ET', // LATIN CAPITAL LETTER ET
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER ETH' (Ð)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER EZH' (Ʒ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER EZH REVERSED' (Ƹ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER EZH WITH CARON' (Ǯ)
+    Ḟ: 'F', // LATIN CAPITAL LETTER F WITH DOT ABOVE
+    Ƒ: 'F', // LATIN CAPITAL LETTER F WITH HOOK
+    Ǵ: 'G', // LATIN CAPITAL LETTER G WITH ACUTE
+    Ğ: 'G', // LATIN CAPITAL LETTER G WITH BREVE
+    Ǧ: 'G', // LATIN CAPITAL LETTER G WITH CARON
+    Ģ: 'G', // LATIN CAPITAL LETTER G WITH CEDILLA
+    Ĝ: 'G', // LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+    Ġ: 'G', // LATIN CAPITAL LETTER G WITH DOT ABOVE
+    Ɠ: 'G', // LATIN CAPITAL LETTER G WITH HOOK
+    Ḡ: 'G', // LATIN CAPITAL LETTER G WITH MACRON
+    Ǥ: 'G', // LATIN CAPITAL LETTER G WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER GAMMA' (Ɣ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER GLOTTAL STOP' (Ɂ)
+    Ḫ: 'H', // LATIN CAPITAL LETTER H WITH BREVE BELOW
+    Ȟ: 'H', // LATIN CAPITAL LETTER H WITH CARON
+    Ḩ: 'H', // LATIN CAPITAL LETTER H WITH CEDILLA
+    Ĥ: 'H', // LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+    Ⱨ: 'H', // LATIN CAPITAL LETTER H WITH DESCENDER
+    Ḧ: 'H', // LATIN CAPITAL LETTER H WITH DIAERESIS
+    Ḣ: 'H', // LATIN CAPITAL LETTER H WITH DOT ABOVE
+    Ḥ: 'H', // LATIN CAPITAL LETTER H WITH DOT BELOW
+    Ħ: 'H', // LATIN CAPITAL LETTER H WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER HALF H' (Ⱶ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER HENG' (Ꜧ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER HWAIR' (Ƕ)
+    Í: 'I', // LATIN CAPITAL LETTER I WITH ACUTE
+    Ĭ: 'I', // LATIN CAPITAL LETTER I WITH BREVE
+    Ǐ: 'I', // LATIN CAPITAL LETTER I WITH CARON
+    Î: 'I', // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+    Ï: 'I', // LATIN CAPITAL LETTER I WITH DIAERESIS
+    Ḯ: 'I', // LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
+    İ: 'I', // LATIN CAPITAL LETTER I WITH DOT ABOVE
+    Ị: 'I', // LATIN CAPITAL LETTER I WITH DOT BELOW
+    Ȉ: 'I', // LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+    Ì: 'I', // LATIN CAPITAL LETTER I WITH GRAVE
+    Ỉ: 'I', // LATIN CAPITAL LETTER I WITH HOOK ABOVE
+    Ȋ: 'I', // LATIN CAPITAL LETTER I WITH INVERTED BREVE
+    Ī: 'I', // LATIN CAPITAL LETTER I WITH MACRON
+    Į: 'I', // LATIN CAPITAL LETTER I WITH OGONEK
+    Ɨ: 'I', // LATIN CAPITAL LETTER I WITH STROKE
+    Ĩ: 'I', // LATIN CAPITAL LETTER I WITH TILDE
+    Ḭ: 'I', // LATIN CAPITAL LETTER I WITH TILDE BELOW
+    Ꝺ: 'D', // LATIN CAPITAL LETTER INSULAR D
+    Ꝼ: 'F', // LATIN CAPITAL LETTER INSULAR F
+    Ᵹ: 'G', // LATIN CAPITAL LETTER INSULAR G
+    Ꞃ: 'R', // LATIN CAPITAL LETTER INSULAR R
+    Ꞅ: 'S', // LATIN CAPITAL LETTER INSULAR S
+    Ꞇ: 'T', // LATIN CAPITAL LETTER INSULAR T
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER IOTA' (Ɩ)
+    Ꝭ: 'IS', // LATIN CAPITAL LETTER IS
+    Ĵ: 'J', // LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+    Ɉ: 'J', // LATIN CAPITAL LETTER J WITH STROKE
+    Ḱ: 'K', // LATIN CAPITAL LETTER K WITH ACUTE
+    Ǩ: 'K', // LATIN CAPITAL LETTER K WITH CARON
+    Ķ: 'K', // LATIN CAPITAL LETTER K WITH CEDILLA
+    Ⱪ: 'K', // LATIN CAPITAL LETTER K WITH DESCENDER
+    Ꝃ: 'K', // LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+    Ḳ: 'K', // LATIN CAPITAL LETTER K WITH DOT BELOW
+    Ƙ: 'K', // LATIN CAPITAL LETTER K WITH HOOK
+    Ḵ: 'K', // LATIN CAPITAL LETTER K WITH LINE BELOW
+    Ꝁ: 'K', // LATIN CAPITAL LETTER K WITH STROKE
+    Ꝅ: 'K', // LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
+    Ĺ: 'L', // LATIN CAPITAL LETTER L WITH ACUTE
+    Ƚ: 'L', // LATIN CAPITAL LETTER L WITH BAR
+    Ľ: 'L', // LATIN CAPITAL LETTER L WITH CARON
+    Ļ: 'L', // LATIN CAPITAL LETTER L WITH CEDILLA
+    Ḽ: 'L', // LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+    Ḷ: 'L', // LATIN CAPITAL LETTER L WITH DOT BELOW
+    Ḹ: 'L', // LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
+    Ⱡ: 'L', // LATIN CAPITAL LETTER L WITH DOUBLE BAR
+    Ꝉ: 'L', // LATIN CAPITAL LETTER L WITH HIGH STROKE
+    Ḻ: 'L', // LATIN CAPITAL LETTER L WITH LINE BELOW
+    Ŀ: 'L', // LATIN CAPITAL LETTER L WITH MIDDLE DOT
+    Ɫ: 'L', // LATIN CAPITAL LETTER L WITH MIDDLE TILDE
+    Lj: 'L', // LATIN CAPITAL LETTER L WITH SMALL LETTER J
+    Ł: 'L', // LATIN CAPITAL LETTER L WITH STROKE
+    LJ: 'LJ', // LATIN CAPITAL LETTER LJ
+    Ḿ: 'M', // LATIN CAPITAL LETTER M WITH ACUTE
+    Ṁ: 'M', // LATIN CAPITAL LETTER M WITH DOT ABOVE
+    Ṃ: 'M', // LATIN CAPITAL LETTER M WITH DOT BELOW
+    Ɱ: 'M', // LATIN CAPITAL LETTER M WITH HOOK
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER MIDDLE-WELSH LL' (Ỻ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER MIDDLE-WELSH V' (Ỽ)
+    Ń: 'N', // LATIN CAPITAL LETTER N WITH ACUTE
+    Ň: 'N', // LATIN CAPITAL LETTER N WITH CARON
+    Ņ: 'N', // LATIN CAPITAL LETTER N WITH CEDILLA
+    Ṋ: 'N', // LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+    Ṅ: 'N', // LATIN CAPITAL LETTER N WITH DOT ABOVE
+    Ṇ: 'N', // LATIN CAPITAL LETTER N WITH DOT BELOW
+    Ǹ: 'N', // LATIN CAPITAL LETTER N WITH GRAVE
+    Ɲ: 'N', // LATIN CAPITAL LETTER N WITH LEFT HOOK
+    Ṉ: 'N', // LATIN CAPITAL LETTER N WITH LINE BELOW
+    Ƞ: 'N', // LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+    Nj: 'N', // LATIN CAPITAL LETTER N WITH SMALL LETTER J
+    Ñ: 'N', // LATIN CAPITAL LETTER N WITH TILDE
+    NJ: 'NJ', // LATIN CAPITAL LETTER NJ
+    Ó: 'O', // LATIN CAPITAL LETTER O WITH ACUTE
+    Ŏ: 'O', // LATIN CAPITAL LETTER O WITH BREVE
+    Ǒ: 'O', // LATIN CAPITAL LETTER O WITH CARON
+    Ô: 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+    Ố: 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+    Ộ: 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+    Ồ: 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+    Ổ: 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+    Ỗ: 'O', // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+    Ö: 'O', // LATIN CAPITAL LETTER O WITH DIAERESIS
+    Ȫ: 'O', // LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+    Ȯ: 'O', // LATIN CAPITAL LETTER O WITH DOT ABOVE
+    Ȱ: 'O', // LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+    Ọ: 'O', // LATIN CAPITAL LETTER O WITH DOT BELOW
+    Ő: 'O', // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+    Ȍ: 'O', // LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+    Ò: 'O', // LATIN CAPITAL LETTER O WITH GRAVE
+    Ỏ: 'O', // LATIN CAPITAL LETTER O WITH HOOK ABOVE
+    Ơ: 'O', // LATIN CAPITAL LETTER O WITH HORN
+    Ớ: 'O', // LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+    Ợ: 'O', // LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+    Ờ: 'O', // LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+    Ở: 'O', // LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+    Ỡ: 'O', // LATIN CAPITAL LETTER O WITH HORN AND TILDE
+    Ȏ: 'O', // LATIN CAPITAL LETTER O WITH INVERTED BREVE
+    Ꝋ: 'O', // LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
+    Ꝍ: 'O', // LATIN CAPITAL LETTER O WITH LOOP
+    Ō: 'O', // LATIN CAPITAL LETTER O WITH MACRON
+    Ṓ: 'O', // LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
+    Ṑ: 'O', // LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
+    Ɵ: 'O', // LATIN CAPITAL LETTER O WITH MIDDLE TILDE
+    Ǫ: 'O', // LATIN CAPITAL LETTER O WITH OGONEK
+    Ǭ: 'O', // LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+    Ø: 'O', // LATIN CAPITAL LETTER O WITH STROKE
+    Ǿ: 'O', // LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+    Õ: 'O', // LATIN CAPITAL LETTER O WITH TILDE
+    Ṍ: 'O', // LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
+    Ṏ: 'O', // LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
+    Ȭ: 'O', // LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+    Ƣ: 'OI', // LATIN CAPITAL LETTER OI
+    Ꝏ: 'OO', // LATIN CAPITAL LETTER OO
+    Ɛ: 'E', // LATIN CAPITAL LETTER OPEN E
+    Ɔ: 'O', // LATIN CAPITAL LETTER OPEN O
+    Ȣ: 'OU', // LATIN CAPITAL LETTER OU
+    Ṕ: 'P', // LATIN CAPITAL LETTER P WITH ACUTE
+    Ṗ: 'P', // LATIN CAPITAL LETTER P WITH DOT ABOVE
+    Ꝓ: 'P', // LATIN CAPITAL LETTER P WITH FLOURISH
+    Ƥ: 'P', // LATIN CAPITAL LETTER P WITH HOOK
+    Ꝕ: 'P', // LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+    Ᵽ: 'P', // LATIN CAPITAL LETTER P WITH STROKE
+    Ꝑ: 'P', // LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
+    Ꝙ: 'Q', // LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+    Ꝗ: 'Q', // LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER R ROTUNDA' (Ꝛ)
+    Ŕ: 'R', // LATIN CAPITAL LETTER R WITH ACUTE
+    Ř: 'R', // LATIN CAPITAL LETTER R WITH CARON
+    Ŗ: 'R', // LATIN CAPITAL LETTER R WITH CEDILLA
+    Ṙ: 'R', // LATIN CAPITAL LETTER R WITH DOT ABOVE
+    Ṛ: 'R', // LATIN CAPITAL LETTER R WITH DOT BELOW
+    Ṝ: 'R', // LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
+    Ȑ: 'R', // LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+    Ȓ: 'R', // LATIN CAPITAL LETTER R WITH INVERTED BREVE
+    Ṟ: 'R', // LATIN CAPITAL LETTER R WITH LINE BELOW
+    Ɍ: 'R', // LATIN CAPITAL LETTER R WITH STROKE
+    Ɽ: 'R', // LATIN CAPITAL LETTER R WITH TAIL
+    Ꜿ: 'C', // LATIN CAPITAL LETTER REVERSED C WITH DOT
+    Ǝ: 'E', // LATIN CAPITAL LETTER REVERSED E
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER RUM ROTUNDA' (Ꝝ)
+    Ś: 'S', // LATIN CAPITAL LETTER S WITH ACUTE
+    Ṥ: 'S', // LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
+    Š: 'S', // LATIN CAPITAL LETTER S WITH CARON
+    Ṧ: 'S', // LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
+    Ş: 'S', // LATIN CAPITAL LETTER S WITH CEDILLA
+    Ŝ: 'S', // LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+    Ș: 'S', // LATIN CAPITAL LETTER S WITH COMMA BELOW
+    Ṡ: 'S', // LATIN CAPITAL LETTER S WITH DOT ABOVE
+    Ṣ: 'S', // LATIN CAPITAL LETTER S WITH DOT BELOW
+    Ṩ: 'S', // LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER SALTILLO' (Ꞌ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER SCHWA' (Ə)
+    ẞ: 'SS', // LATIN CAPITAL LETTER SHARP S
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL' (Ɋ)
+    Ť: 'T', // LATIN CAPITAL LETTER T WITH CARON
+    Ţ: 'T', // LATIN CAPITAL LETTER T WITH CEDILLA
+    Ṱ: 'T', // LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+    Ț: 'T', // LATIN CAPITAL LETTER T WITH COMMA BELOW
+    Ⱦ: 'T', // LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+    Ṫ: 'T', // LATIN CAPITAL LETTER T WITH DOT ABOVE
+    Ṭ: 'T', // LATIN CAPITAL LETTER T WITH DOT BELOW
+    Ƭ: 'T', // LATIN CAPITAL LETTER T WITH HOOK
+    Ṯ: 'T', // LATIN CAPITAL LETTER T WITH LINE BELOW
+    Ʈ: 'T', // LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
+    Ŧ: 'T', // LATIN CAPITAL LETTER T WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER THORN' (Þ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER THORN WITH STROKE' (Ꝥ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER' (Ꝧ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER TONE FIVE' (Ƽ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER TONE SIX' (Ƅ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER TONE TWO' (Ƨ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER TRESILLO' (Ꜫ)
+    Ɐ: 'A', // LATIN CAPITAL LETTER TURNED A
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER TURNED INSULAR G' (Ꝿ)
+    Ꞁ: 'L', // LATIN CAPITAL LETTER TURNED L
+    Ɯ: 'M', // LATIN CAPITAL LETTER TURNED M
+    Ʌ: 'V', // LATIN CAPITAL LETTER TURNED V
+    Ꜩ: 'TZ', // LATIN CAPITAL LETTER TZ
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER U BAR' (Ʉ)
+    Ú: 'U', // LATIN CAPITAL LETTER U WITH ACUTE
+    Ŭ: 'U', // LATIN CAPITAL LETTER U WITH BREVE
+    Ǔ: 'U', // LATIN CAPITAL LETTER U WITH CARON
+    Û: 'U', // LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+    Ṷ: 'U', // LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+    Ü: 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS
+    Ǘ: 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+    Ǚ: 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+    Ǜ: 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+    Ǖ: 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+    Ṳ: 'U', // LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+    Ụ: 'U', // LATIN CAPITAL LETTER U WITH DOT BELOW
+    Ű: 'U', // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+    Ȕ: 'U', // LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+    Ù: 'U', // LATIN CAPITAL LETTER U WITH GRAVE
+    Ủ: 'U', // LATIN CAPITAL LETTER U WITH HOOK ABOVE
+    Ư: 'U', // LATIN CAPITAL LETTER U WITH HORN
+    Ứ: 'U', // LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+    Ự: 'U', // LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+    Ừ: 'U', // LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+    Ử: 'U', // LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+    Ữ: 'U', // LATIN CAPITAL LETTER U WITH HORN AND TILDE
+    Ȗ: 'U', // LATIN CAPITAL LETTER U WITH INVERTED BREVE
+    Ū: 'U', // LATIN CAPITAL LETTER U WITH MACRON
+    Ṻ: 'U', // LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
+    Ų: 'U', // LATIN CAPITAL LETTER U WITH OGONEK
+    Ů: 'U', // LATIN CAPITAL LETTER U WITH RING ABOVE
+    Ũ: 'U', // LATIN CAPITAL LETTER U WITH TILDE
+    Ṹ: 'U', // LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
+    Ṵ: 'U', // LATIN CAPITAL LETTER U WITH TILDE BELOW
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER UPSILON' (Ʊ)
+    Ꝟ: 'V', // LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+    Ṿ: 'V', // LATIN CAPITAL LETTER V WITH DOT BELOW
+    Ʋ: 'V', // LATIN CAPITAL LETTER V WITH HOOK
+    Ṽ: 'V', // LATIN CAPITAL LETTER V WITH TILDE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER VEND' (Ꝩ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER VISIGOTHIC Z' (Ꝣ)
+    Ꝡ: 'VY', // LATIN CAPITAL LETTER VY
+    Ẃ: 'W', // LATIN CAPITAL LETTER W WITH ACUTE
+    Ŵ: 'W', // LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+    Ẅ: 'W', // LATIN CAPITAL LETTER W WITH DIAERESIS
+    Ẇ: 'W', // LATIN CAPITAL LETTER W WITH DOT ABOVE
+    Ẉ: 'W', // LATIN CAPITAL LETTER W WITH DOT BELOW
+    Ẁ: 'W', // LATIN CAPITAL LETTER W WITH GRAVE
+    Ⱳ: 'W', // LATIN CAPITAL LETTER W WITH HOOK
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER WYNN' (Ƿ)
+    Ẍ: 'X', // LATIN CAPITAL LETTER X WITH DIAERESIS
+    Ẋ: 'X', // LATIN CAPITAL LETTER X WITH DOT ABOVE
+    Ý: 'Y', // LATIN CAPITAL LETTER Y WITH ACUTE
+    Ŷ: 'Y', // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+    Ÿ: 'Y', // LATIN CAPITAL LETTER Y WITH DIAERESIS
+    Ẏ: 'Y', // LATIN CAPITAL LETTER Y WITH DOT ABOVE
+    Ỵ: 'Y', // LATIN CAPITAL LETTER Y WITH DOT BELOW
+    Ỳ: 'Y', // LATIN CAPITAL LETTER Y WITH GRAVE
+    Ƴ: 'Y', // LATIN CAPITAL LETTER Y WITH HOOK
+    Ỷ: 'Y', // LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+    Ỿ: 'Y', // LATIN CAPITAL LETTER Y WITH LOOP
+    Ȳ: 'Y', // LATIN CAPITAL LETTER Y WITH MACRON
+    Ɏ: 'Y', // LATIN CAPITAL LETTER Y WITH STROKE
+    Ỹ: 'Y', // LATIN CAPITAL LETTER Y WITH TILDE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CAPITAL LETTER YOGH' (Ȝ)
+    Ź: 'Z', // LATIN CAPITAL LETTER Z WITH ACUTE
+    Ž: 'Z', // LATIN CAPITAL LETTER Z WITH CARON
+    Ẑ: 'Z', // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+    Ⱬ: 'Z', // LATIN CAPITAL LETTER Z WITH DESCENDER
+    Ż: 'Z', // LATIN CAPITAL LETTER Z WITH DOT ABOVE
+    Ẓ: 'Z', // LATIN CAPITAL LETTER Z WITH DOT BELOW
+    Ȥ: 'Z', // LATIN CAPITAL LETTER Z WITH HOOK
+    Ẕ: 'Z', // LATIN CAPITAL LETTER Z WITH LINE BELOW
+    Ƶ: 'Z', // LATIN CAPITAL LETTER Z WITH STROKE
+    IJ: 'IJ', // LATIN CAPITAL LIGATURE IJ
+    Œ: 'OE', // LATIN CAPITAL LIGATURE OE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN CROSS' (✝)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN EPIGRAPHIC LETTER ARCHAIC M' (ꟿ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN EPIGRAPHIC LETTER I LONGA' (ꟾ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN EPIGRAPHIC LETTER INVERTED M' (ꟽ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN EPIGRAPHIC LETTER REVERSED F' (ꟻ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN EPIGRAPHIC LETTER REVERSED P' (ꟼ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER AIN' (ᴥ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER ALVEOLAR CLICK' (ǂ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER BIDENTAL PERCUSSIVE' (ʭ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER BILABIAL CLICK' (ʘ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER BILABIAL PERCUSSIVE' (ʬ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER DENTAL CLICK' (ǀ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER GLOTTAL STOP' (ʔ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER GLOTTAL STOP WITH STROKE' (ʡ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER INVERTED GLOTTAL STOP' (ʖ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE' (ƾ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER LATERAL CLICK' (ǁ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER PHARYNGEAL VOICED FRICATIVE' (ʕ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER RETROFLEX CLICK' (ǃ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER REVERSED ESH LOOP' (ƪ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE' (ʢ)
+    ᴀ: 'A', // LATIN LETTER SMALL CAPITAL A
+    ᴁ: 'AE', // LATIN LETTER SMALL CAPITAL AE
+    ʙ: 'B', // LATIN LETTER SMALL CAPITAL B
+    ᴃ: 'B', // LATIN LETTER SMALL CAPITAL BARRED B
+    ᴄ: 'C', // LATIN LETTER SMALL CAPITAL C
+    ᴅ: 'D', // LATIN LETTER SMALL CAPITAL D
+    ᴇ: 'E', // LATIN LETTER SMALL CAPITAL E
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER SMALL CAPITAL ETH' (ᴆ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER SMALL CAPITAL EZH' (ᴣ)
+    ꜰ: 'F', // LATIN LETTER SMALL CAPITAL F
+    ɢ: 'G', // LATIN LETTER SMALL CAPITAL G
+    ʛ: 'G', // LATIN LETTER SMALL CAPITAL G WITH HOOK
+    ʜ: 'H', // LATIN LETTER SMALL CAPITAL H
+    ɪ: 'I', // LATIN LETTER SMALL CAPITAL I
+    ʁ: 'R', // LATIN LETTER SMALL CAPITAL INVERTED R
+    ᴊ: 'J', // LATIN LETTER SMALL CAPITAL J
+    ᴋ: 'K', // LATIN LETTER SMALL CAPITAL K
+    ʟ: 'L', // LATIN LETTER SMALL CAPITAL L
+    ᴌ: 'L', // LATIN LETTER SMALL CAPITAL L WITH STROKE
+    ᴍ: 'M', // LATIN LETTER SMALL CAPITAL M
+    ɴ: 'N', // LATIN LETTER SMALL CAPITAL N
+    ᴏ: 'O', // LATIN LETTER SMALL CAPITAL O
+    ɶ: 'OE', // LATIN LETTER SMALL CAPITAL OE
+    ᴐ: 'O', // LATIN LETTER SMALL CAPITAL OPEN O
+    ᴕ: 'OU', // LATIN LETTER SMALL CAPITAL OU
+    ᴘ: 'P', // LATIN LETTER SMALL CAPITAL P
+    ʀ: 'R', // LATIN LETTER SMALL CAPITAL R
+    ᴎ: 'N', // LATIN LETTER SMALL CAPITAL REVERSED N
+    ᴙ: 'R', // LATIN LETTER SMALL CAPITAL REVERSED R
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER SMALL CAPITAL RUM' (ꝶ)
+    ꜱ: 'S', // LATIN LETTER SMALL CAPITAL S
+    ᴛ: 'T', // LATIN LETTER SMALL CAPITAL T
+    ⱻ: 'E', // LATIN LETTER SMALL CAPITAL TURNED E
+    ᴚ: 'R', // LATIN LETTER SMALL CAPITAL TURNED R
+    ᴜ: 'U', // LATIN LETTER SMALL CAPITAL U
+    ᴠ: 'V', // LATIN LETTER SMALL CAPITAL V
+    ᴡ: 'W', // LATIN LETTER SMALL CAPITAL W
+    ʏ: 'Y', // LATIN LETTER SMALL CAPITAL Y
+    ᴢ: 'Z', // LATIN LETTER SMALL CAPITAL Z
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER STRETCHED C' (ʗ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER TWO WITH STROKE' (ƻ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER VOICED LARYNGEAL SPIRANT' (ᴤ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER WYNN' (ƿ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN LETTER YR' (Ʀ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL CAPITAL LETTER I WITH STROKE' (ᵻ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL CAPITAL LETTER U WITH STROKE' (ᵾ)
+    á: 'a', // LATIN SMALL LETTER A WITH ACUTE
+    ă: 'a', // LATIN SMALL LETTER A WITH BREVE
+    ắ: 'a', // LATIN SMALL LETTER A WITH BREVE AND ACUTE
+    ặ: 'a', // LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+    ằ: 'a', // LATIN SMALL LETTER A WITH BREVE AND GRAVE
+    ẳ: 'a', // LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+    ẵ: 'a', // LATIN SMALL LETTER A WITH BREVE AND TILDE
+    ǎ: 'a', // LATIN SMALL LETTER A WITH CARON
+    â: 'a', // LATIN SMALL LETTER A WITH CIRCUMFLEX
+    ấ: 'a', // LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+    ậ: 'a', // LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+    ầ: 'a', // LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+    ẩ: 'a', // LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+    ẫ: 'a', // LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+    ä: 'a', // LATIN SMALL LETTER A WITH DIAERESIS
+    ǟ: 'a', // LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+    ȧ: 'a', // LATIN SMALL LETTER A WITH DOT ABOVE
+    ǡ: 'a', // LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
+    ạ: 'a', // LATIN SMALL LETTER A WITH DOT BELOW
+    ȁ: 'a', // LATIN SMALL LETTER A WITH DOUBLE GRAVE
+    à: 'a', // LATIN SMALL LETTER A WITH GRAVE
+    ả: 'a', // LATIN SMALL LETTER A WITH HOOK ABOVE
+    ȃ: 'a', // LATIN SMALL LETTER A WITH INVERTED BREVE
+    ā: 'a', // LATIN SMALL LETTER A WITH MACRON
+    ą: 'a', // LATIN SMALL LETTER A WITH OGONEK
+    ᶏ: 'a', // LATIN SMALL LETTER A WITH RETROFLEX HOOK
+    ẚ: 'a', // LATIN SMALL LETTER A WITH RIGHT HALF RING
+    å: 'a', // LATIN SMALL LETTER A WITH RING ABOVE
+    ǻ: 'a', // LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+    ḁ: 'a', // LATIN SMALL LETTER A WITH RING BELOW
+    ⱥ: 'a', // LATIN SMALL LETTER A WITH STROKE
+    ã: 'a', // LATIN SMALL LETTER A WITH TILDE
+    ꜳ: 'aa', // LATIN SMALL LETTER AA
+    æ: 'ae', // LATIN SMALL LETTER AE
+    ǽ: 'ae', // LATIN SMALL LETTER AE WITH ACUTE
+    ǣ: 'ae', // LATIN SMALL LETTER AE WITH MACRON
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ALPHA' (ɑ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK' (ᶐ)
+    ꜵ: 'ao', // LATIN SMALL LETTER AO
+    ꜷ: 'au', // LATIN SMALL LETTER AU
+    ꜹ: 'av', // LATIN SMALL LETTER AV
+    ꜻ: 'av', // LATIN SMALL LETTER AV WITH HORIZONTAL BAR
+    ꜽ: 'ay', // LATIN SMALL LETTER AY
+    ḃ: 'b', // LATIN SMALL LETTER B WITH DOT ABOVE
+    ḅ: 'b', // LATIN SMALL LETTER B WITH DOT BELOW
+    ɓ: 'b', // LATIN SMALL LETTER B WITH HOOK
+    ḇ: 'b', // LATIN SMALL LETTER B WITH LINE BELOW
+    ᵬ: 'b', // LATIN SMALL LETTER B WITH MIDDLE TILDE
+    ᶀ: 'b', // LATIN SMALL LETTER B WITH PALATAL HOOK
+    ƀ: 'b', // LATIN SMALL LETTER B WITH STROKE
+    ƃ: 'b', // LATIN SMALL LETTER B WITH TOPBAR
+    ɵ: 'o', // LATIN SMALL LETTER BARRED O
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER BOTTOM HALF O' (ᴗ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER BROKEN L' (ꝇ)
+    ć: 'c', // LATIN SMALL LETTER C WITH ACUTE
+    č: 'c', // LATIN SMALL LETTER C WITH CARON
+    ç: 'c', // LATIN SMALL LETTER C WITH CEDILLA
+    ḉ: 'c', // LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+    ĉ: 'c', // LATIN SMALL LETTER C WITH CIRCUMFLEX
+    ɕ: 'c', // LATIN SMALL LETTER C WITH CURL
+    ċ: 'c', // LATIN SMALL LETTER C WITH DOT ABOVE
+    ƈ: 'c', // LATIN SMALL LETTER C WITH HOOK
+    ȼ: 'c', // LATIN SMALL LETTER C WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER CLOSED OMEGA' (ɷ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER CLOSED OPEN E' (ʚ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER CLOSED REVERSED OPEN E' (ɞ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER CON' (ꝯ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER CUATRILLO' (ꜭ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER CUATRILLO WITH COMMA' (ꜯ)
+    ď: 'd', // LATIN SMALL LETTER D WITH CARON
+    ḑ: 'd', // LATIN SMALL LETTER D WITH CEDILLA
+    ḓ: 'd', // LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
+    ȡ: 'd', // LATIN SMALL LETTER D WITH CURL
+    ḋ: 'd', // LATIN SMALL LETTER D WITH DOT ABOVE
+    ḍ: 'd', // LATIN SMALL LETTER D WITH DOT BELOW
+    ɗ: 'd', // LATIN SMALL LETTER D WITH HOOK
+    ᶑ: 'd', // LATIN SMALL LETTER D WITH HOOK AND TAIL
+    ḏ: 'd', // LATIN SMALL LETTER D WITH LINE BELOW
+    ᵭ: 'd', // LATIN SMALL LETTER D WITH MIDDLE TILDE
+    ᶁ: 'd', // LATIN SMALL LETTER D WITH PALATAL HOOK
+    đ: 'd', // LATIN SMALL LETTER D WITH STROKE
+    ɖ: 'd', // LATIN SMALL LETTER D WITH TAIL
+    ƌ: 'd', // LATIN SMALL LETTER D WITH TOPBAR
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER DB DIGRAPH' (ȸ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER DELTA' (ẟ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER DEZH DIGRAPH' (ʤ)
+    ı: 'i', // LATIN SMALL LETTER DOTLESS I
+    ȷ: 'j', // LATIN SMALL LETTER DOTLESS J
+    ɟ: 'j', // LATIN SMALL LETTER DOTLESS J WITH STROKE
+    ʄ: 'j', // LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER DUM' (ꝱ)
+    dz: 'dz', // LATIN SMALL LETTER DZ
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER DZ DIGRAPH' (ʣ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER DZ DIGRAPH WITH CURL' (ʥ)
+    dž: 'dz', // LATIN SMALL LETTER DZ WITH CARON
+    é: 'e', // LATIN SMALL LETTER E WITH ACUTE
+    ĕ: 'e', // LATIN SMALL LETTER E WITH BREVE
+    ě: 'e', // LATIN SMALL LETTER E WITH CARON
+    ȩ: 'e', // LATIN SMALL LETTER E WITH CEDILLA
+    ḝ: 'e', // LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+    ê: 'e', // LATIN SMALL LETTER E WITH CIRCUMFLEX
+    ế: 'e', // LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+    ệ: 'e', // LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+    ề: 'e', // LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+    ể: 'e', // LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+    ễ: 'e', // LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+    ḙ: 'e', // LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
+    ë: 'e', // LATIN SMALL LETTER E WITH DIAERESIS
+    ė: 'e', // LATIN SMALL LETTER E WITH DOT ABOVE
+    ẹ: 'e', // LATIN SMALL LETTER E WITH DOT BELOW
+    ȅ: 'e', // LATIN SMALL LETTER E WITH DOUBLE GRAVE
+    è: 'e', // LATIN SMALL LETTER E WITH GRAVE
+    ẻ: 'e', // LATIN SMALL LETTER E WITH HOOK ABOVE
+    ȇ: 'e', // LATIN SMALL LETTER E WITH INVERTED BREVE
+    ē: 'e', // LATIN SMALL LETTER E WITH MACRON
+    ḗ: 'e', // LATIN SMALL LETTER E WITH MACRON AND ACUTE
+    ḕ: 'e', // LATIN SMALL LETTER E WITH MACRON AND GRAVE
+    ⱸ: 'e', // LATIN SMALL LETTER E WITH NOTCH
+    ę: 'e', // LATIN SMALL LETTER E WITH OGONEK
+    ᶒ: 'e', // LATIN SMALL LETTER E WITH RETROFLEX HOOK
+    ɇ: 'e', // LATIN SMALL LETTER E WITH STROKE
+    ẽ: 'e', // LATIN SMALL LETTER E WITH TILDE
+    ḛ: 'e', // LATIN SMALL LETTER E WITH TILDE BELOW
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EGYPTOLOGICAL AIN' (ꜥ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EGYPTOLOGICAL ALEF' (ꜣ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ENG' (ŋ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ESH' (ʃ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ESH WITH CURL' (ʆ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ESH WITH PALATAL HOOK' (ᶋ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ESH WITH RETROFLEX HOOK' (ᶘ)
+    ꝫ: 'et', // LATIN SMALL LETTER ET
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER ETH' (ð)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EZH' (ʒ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EZH REVERSED' (ƹ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EZH WITH CARON' (ǯ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EZH WITH CURL' (ʓ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EZH WITH RETROFLEX HOOK' (ᶚ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER EZH WITH TAIL' (ƺ)
+    ḟ: 'f', // LATIN SMALL LETTER F WITH DOT ABOVE
+    ƒ: 'f', // LATIN SMALL LETTER F WITH HOOK
+    ᵮ: 'f', // LATIN SMALL LETTER F WITH MIDDLE TILDE
+    ᶂ: 'f', // LATIN SMALL LETTER F WITH PALATAL HOOK
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER FENG DIGRAPH' (ʩ)
+    ǵ: 'g', // LATIN SMALL LETTER G WITH ACUTE
+    ğ: 'g', // LATIN SMALL LETTER G WITH BREVE
+    ǧ: 'g', // LATIN SMALL LETTER G WITH CARON
+    ģ: 'g', // LATIN SMALL LETTER G WITH CEDILLA
+    ĝ: 'g', // LATIN SMALL LETTER G WITH CIRCUMFLEX
+    ġ: 'g', // LATIN SMALL LETTER G WITH DOT ABOVE
+    ɠ: 'g', // LATIN SMALL LETTER G WITH HOOK
+    ḡ: 'g', // LATIN SMALL LETTER G WITH MACRON
+    ᶃ: 'g', // LATIN SMALL LETTER G WITH PALATAL HOOK
+    ǥ: 'g', // LATIN SMALL LETTER G WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER GAMMA' (ɣ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER GLOTTAL STOP' (ɂ)
+    ḫ: 'h', // LATIN SMALL LETTER H WITH BREVE BELOW
+    ȟ: 'h', // LATIN SMALL LETTER H WITH CARON
+    ḩ: 'h', // LATIN SMALL LETTER H WITH CEDILLA
+    ĥ: 'h', // LATIN SMALL LETTER H WITH CIRCUMFLEX
+    ⱨ: 'h', // LATIN SMALL LETTER H WITH DESCENDER
+    ḧ: 'h', // LATIN SMALL LETTER H WITH DIAERESIS
+    ḣ: 'h', // LATIN SMALL LETTER H WITH DOT ABOVE
+    ḥ: 'h', // LATIN SMALL LETTER H WITH DOT BELOW
+    ɦ: 'h', // LATIN SMALL LETTER H WITH HOOK
+    ẖ: 'h', // LATIN SMALL LETTER H WITH LINE BELOW
+    ħ: 'h', // LATIN SMALL LETTER H WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER HALF H' (ⱶ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER HENG' (ꜧ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER HENG WITH HOOK' (ɧ)
+    ƕ: 'hv', // LATIN SMALL LETTER HV
+    í: 'i', // LATIN SMALL LETTER I WITH ACUTE
+    ĭ: 'i', // LATIN SMALL LETTER I WITH BREVE
+    ǐ: 'i', // LATIN SMALL LETTER I WITH CARON
+    î: 'i', // LATIN SMALL LETTER I WITH CIRCUMFLEX
+    ï: 'i', // LATIN SMALL LETTER I WITH DIAERESIS
+    ḯ: 'i', // LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
+    ị: 'i', // LATIN SMALL LETTER I WITH DOT BELOW
+    ȉ: 'i', // LATIN SMALL LETTER I WITH DOUBLE GRAVE
+    ì: 'i', // LATIN SMALL LETTER I WITH GRAVE
+    ỉ: 'i', // LATIN SMALL LETTER I WITH HOOK ABOVE
+    ȋ: 'i', // LATIN SMALL LETTER I WITH INVERTED BREVE
+    ī: 'i', // LATIN SMALL LETTER I WITH MACRON
+    į: 'i', // LATIN SMALL LETTER I WITH OGONEK
+    ᶖ: 'i', // LATIN SMALL LETTER I WITH RETROFLEX HOOK
+    ɨ: 'i', // LATIN SMALL LETTER I WITH STROKE
+    ĩ: 'i', // LATIN SMALL LETTER I WITH TILDE
+    ḭ: 'i', // LATIN SMALL LETTER I WITH TILDE BELOW
+    ꝺ: 'd', // LATIN SMALL LETTER INSULAR D
+    ꝼ: 'f', // LATIN SMALL LETTER INSULAR F
+    ᵹ: 'g', // LATIN SMALL LETTER INSULAR G
+    ꞃ: 'r', // LATIN SMALL LETTER INSULAR R
+    ꞅ: 's', // LATIN SMALL LETTER INSULAR S
+    ꞇ: 't', // LATIN SMALL LETTER INSULAR T
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER IOTA' (ɩ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER IOTA WITH STROKE' (ᵼ)
+    ꝭ: 'is', // LATIN SMALL LETTER IS
+    ǰ: 'j', // LATIN SMALL LETTER J WITH CARON
+    ĵ: 'j', // LATIN SMALL LETTER J WITH CIRCUMFLEX
+    ʝ: 'j', // LATIN SMALL LETTER J WITH CROSSED-TAIL
+    ɉ: 'j', // LATIN SMALL LETTER J WITH STROKE
+    ḱ: 'k', // LATIN SMALL LETTER K WITH ACUTE
+    ǩ: 'k', // LATIN SMALL LETTER K WITH CARON
+    ķ: 'k', // LATIN SMALL LETTER K WITH CEDILLA
+    ⱪ: 'k', // LATIN SMALL LETTER K WITH DESCENDER
+    ꝃ: 'k', // LATIN SMALL LETTER K WITH DIAGONAL STROKE
+    ḳ: 'k', // LATIN SMALL LETTER K WITH DOT BELOW
+    ƙ: 'k', // LATIN SMALL LETTER K WITH HOOK
+    ḵ: 'k', // LATIN SMALL LETTER K WITH LINE BELOW
+    ᶄ: 'k', // LATIN SMALL LETTER K WITH PALATAL HOOK
+    ꝁ: 'k', // LATIN SMALL LETTER K WITH STROKE
+    ꝅ: 'k', // LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER KRA' (ĸ)
+    ĺ: 'l', // LATIN SMALL LETTER L WITH ACUTE
+    ƚ: 'l', // LATIN SMALL LETTER L WITH BAR
+    ɬ: 'l', // LATIN SMALL LETTER L WITH BELT
+    ľ: 'l', // LATIN SMALL LETTER L WITH CARON
+    ļ: 'l', // LATIN SMALL LETTER L WITH CEDILLA
+    ḽ: 'l', // LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
+    ȴ: 'l', // LATIN SMALL LETTER L WITH CURL
+    ḷ: 'l', // LATIN SMALL LETTER L WITH DOT BELOW
+    ḹ: 'l', // LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
+    ⱡ: 'l', // LATIN SMALL LETTER L WITH DOUBLE BAR
+    ꝉ: 'l', // LATIN SMALL LETTER L WITH HIGH STROKE
+    ḻ: 'l', // LATIN SMALL LETTER L WITH LINE BELOW
+    ŀ: 'l', // LATIN SMALL LETTER L WITH MIDDLE DOT
+    ɫ: 'l', // LATIN SMALL LETTER L WITH MIDDLE TILDE
+    ᶅ: 'l', // LATIN SMALL LETTER L WITH PALATAL HOOK
+    ɭ: 'l', // LATIN SMALL LETTER L WITH RETROFLEX HOOK
+    ł: 'l', // LATIN SMALL LETTER L WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER LAMBDA WITH STROKE' (ƛ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER LEZH' (ɮ)
+    lj: 'lj', // LATIN SMALL LETTER LJ
+    ſ: 's', // LATIN SMALL LETTER LONG S
+    ẜ: 's', // LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE
+    ẛ: 's', // LATIN SMALL LETTER LONG S WITH DOT ABOVE
+    ẝ: 's', // LATIN SMALL LETTER LONG S WITH HIGH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER LS DIGRAPH' (ʪ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER LUM' (ꝲ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER LZ DIGRAPH' (ʫ)
+    ḿ: 'm', // LATIN SMALL LETTER M WITH ACUTE
+    ṁ: 'm', // LATIN SMALL LETTER M WITH DOT ABOVE
+    ṃ: 'm', // LATIN SMALL LETTER M WITH DOT BELOW
+    ɱ: 'm', // LATIN SMALL LETTER M WITH HOOK
+    ᵯ: 'm', // LATIN SMALL LETTER M WITH MIDDLE TILDE
+    ᶆ: 'm', // LATIN SMALL LETTER M WITH PALATAL HOOK
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER MIDDLE-WELSH LL' (ỻ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER MIDDLE-WELSH V' (ỽ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER MUM' (ꝳ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER N PRECEDED BY APOSTROPHE' (ʼn)
+    ń: 'n', // LATIN SMALL LETTER N WITH ACUTE
+    ň: 'n', // LATIN SMALL LETTER N WITH CARON
+    ņ: 'n', // LATIN SMALL LETTER N WITH CEDILLA
+    ṋ: 'n', // LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
+    ȵ: 'n', // LATIN SMALL LETTER N WITH CURL
+    ṅ: 'n', // LATIN SMALL LETTER N WITH DOT ABOVE
+    ṇ: 'n', // LATIN SMALL LETTER N WITH DOT BELOW
+    ǹ: 'n', // LATIN SMALL LETTER N WITH GRAVE
+    ɲ: 'n', // LATIN SMALL LETTER N WITH LEFT HOOK
+    ṉ: 'n', // LATIN SMALL LETTER N WITH LINE BELOW
+    ƞ: 'n', // LATIN SMALL LETTER N WITH LONG RIGHT LEG
+    ᵰ: 'n', // LATIN SMALL LETTER N WITH MIDDLE TILDE
+    ᶇ: 'n', // LATIN SMALL LETTER N WITH PALATAL HOOK
+    ɳ: 'n', // LATIN SMALL LETTER N WITH RETROFLEX HOOK
+    ñ: 'n', // LATIN SMALL LETTER N WITH TILDE
+    nj: 'nj', // LATIN SMALL LETTER NJ
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER NUM' (ꝴ)
+    ó: 'o', // LATIN SMALL LETTER O WITH ACUTE
+    ŏ: 'o', // LATIN SMALL LETTER O WITH BREVE
+    ǒ: 'o', // LATIN SMALL LETTER O WITH CARON
+    ô: 'o', // LATIN SMALL LETTER O WITH CIRCUMFLEX
+    ố: 'o', // LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+    ộ: 'o', // LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+    ồ: 'o', // LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+    ổ: 'o', // LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+    ỗ: 'o', // LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+    ö: 'o', // LATIN SMALL LETTER O WITH DIAERESIS
+    ȫ: 'o', // LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
+    ȯ: 'o', // LATIN SMALL LETTER O WITH DOT ABOVE
+    ȱ: 'o', // LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
+    ọ: 'o', // LATIN SMALL LETTER O WITH DOT BELOW
+    ő: 'o', // LATIN SMALL LETTER O WITH DOUBLE ACUTE
+    ȍ: 'o', // LATIN SMALL LETTER O WITH DOUBLE GRAVE
+    ò: 'o', // LATIN SMALL LETTER O WITH GRAVE
+    ỏ: 'o', // LATIN SMALL LETTER O WITH HOOK ABOVE
+    ơ: 'o', // LATIN SMALL LETTER O WITH HORN
+    ớ: 'o', // LATIN SMALL LETTER O WITH HORN AND ACUTE
+    ợ: 'o', // LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+    ờ: 'o', // LATIN SMALL LETTER O WITH HORN AND GRAVE
+    ở: 'o', // LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+    ỡ: 'o', // LATIN SMALL LETTER O WITH HORN AND TILDE
+    ȏ: 'o', // LATIN SMALL LETTER O WITH INVERTED BREVE
+    ꝋ: 'o', // LATIN SMALL LETTER O WITH LONG STROKE OVERLAY
+    ꝍ: 'o', // LATIN SMALL LETTER O WITH LOOP
+    ⱺ: 'o', // LATIN SMALL LETTER O WITH LOW RING INSIDE
+    ō: 'o', // LATIN SMALL LETTER O WITH MACRON
+    ṓ: 'o', // LATIN SMALL LETTER O WITH MACRON AND ACUTE
+    ṑ: 'o', // LATIN SMALL LETTER O WITH MACRON AND GRAVE
+    ǫ: 'o', // LATIN SMALL LETTER O WITH OGONEK
+    ǭ: 'o', // LATIN SMALL LETTER O WITH OGONEK AND MACRON
+    ø: 'o', // LATIN SMALL LETTER O WITH STROKE
+    ǿ: 'o', // LATIN SMALL LETTER O WITH STROKE AND ACUTE
+    õ: 'o', // LATIN SMALL LETTER O WITH TILDE
+    ṍ: 'o', // LATIN SMALL LETTER O WITH TILDE AND ACUTE
+    ṏ: 'o', // LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
+    ȭ: 'o', // LATIN SMALL LETTER O WITH TILDE AND MACRON
+    ƣ: 'oi', // LATIN SMALL LETTER OI
+    ꝏ: 'oo', // LATIN SMALL LETTER OO
+    ɛ: 'e', // LATIN SMALL LETTER OPEN E
+    ᶓ: 'e', // LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK
+    ɔ: 'o', // LATIN SMALL LETTER OPEN O
+    ᶗ: 'o', // LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK
+    ȣ: 'ou', // LATIN SMALL LETTER OU
+    ṕ: 'p', // LATIN SMALL LETTER P WITH ACUTE
+    ṗ: 'p', // LATIN SMALL LETTER P WITH DOT ABOVE
+    ꝓ: 'p', // LATIN SMALL LETTER P WITH FLOURISH
+    ƥ: 'p', // LATIN SMALL LETTER P WITH HOOK
+    ᵱ: 'p', // LATIN SMALL LETTER P WITH MIDDLE TILDE
+    ᶈ: 'p', // LATIN SMALL LETTER P WITH PALATAL HOOK
+    ꝕ: 'p', // LATIN SMALL LETTER P WITH SQUIRREL TAIL
+    ᵽ: 'p', // LATIN SMALL LETTER P WITH STROKE
+    ꝑ: 'p', // LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER PHI' (ɸ)
+    ꝙ: 'q', // LATIN SMALL LETTER Q WITH DIAGONAL STROKE
+    ʠ: 'q', // LATIN SMALL LETTER Q WITH HOOK
+    ɋ: 'q', // LATIN SMALL LETTER Q WITH HOOK TAIL
+    ꝗ: 'q', // LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER QP DIGRAPH' (ȹ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER R ROTUNDA' (ꝛ)
+    ŕ: 'r', // LATIN SMALL LETTER R WITH ACUTE
+    ř: 'r', // LATIN SMALL LETTER R WITH CARON
+    ŗ: 'r', // LATIN SMALL LETTER R WITH CEDILLA
+    ṙ: 'r', // LATIN SMALL LETTER R WITH DOT ABOVE
+    ṛ: 'r', // LATIN SMALL LETTER R WITH DOT BELOW
+    ṝ: 'r', // LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
+    ȑ: 'r', // LATIN SMALL LETTER R WITH DOUBLE GRAVE
+    ɾ: 'r', // LATIN SMALL LETTER R WITH FISHHOOK
+    ᵳ: 'r', // LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE
+    ȓ: 'r', // LATIN SMALL LETTER R WITH INVERTED BREVE
+    ṟ: 'r', // LATIN SMALL LETTER R WITH LINE BELOW
+    ɼ: 'r', // LATIN SMALL LETTER R WITH LONG LEG
+    ᵲ: 'r', // LATIN SMALL LETTER R WITH MIDDLE TILDE
+    ᶉ: 'r', // LATIN SMALL LETTER R WITH PALATAL HOOK
+    ɍ: 'r', // LATIN SMALL LETTER R WITH STROKE
+    ɽ: 'r', // LATIN SMALL LETTER R WITH TAIL
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER RAMS HORN' (ɤ)
+    ↄ: 'c', // LATIN SMALL LETTER REVERSED C
+    ꜿ: 'c', // LATIN SMALL LETTER REVERSED C WITH DOT
+    ɘ: 'e', // LATIN SMALL LETTER REVERSED E
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER REVERSED OPEN E' (ɜ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER REVERSED OPEN E WITH HOOK' (ɝ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK' (ᶔ)
+    ɿ: 'r', // LATIN SMALL LETTER REVERSED R WITH FISHHOOK
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER RUM' (ꝵ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER RUM ROTUNDA' (ꝝ)
+    ś: 's', // LATIN SMALL LETTER S WITH ACUTE
+    ṥ: 's', // LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
+    š: 's', // LATIN SMALL LETTER S WITH CARON
+    ṧ: 's', // LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
+    ş: 's', // LATIN SMALL LETTER S WITH CEDILLA
+    ŝ: 's', // LATIN SMALL LETTER S WITH CIRCUMFLEX
+    ș: 's', // LATIN SMALL LETTER S WITH COMMA BELOW
+    ṡ: 's', // LATIN SMALL LETTER S WITH DOT ABOVE
+    ṣ: 's', // LATIN SMALL LETTER S WITH DOT BELOW
+    ṩ: 's', // LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
+    ʂ: 's', // LATIN SMALL LETTER S WITH HOOK
+    ᵴ: 's', // LATIN SMALL LETTER S WITH MIDDLE TILDE
+    ᶊ: 's', // LATIN SMALL LETTER S WITH PALATAL HOOK
+    ȿ: 's', // LATIN SMALL LETTER S WITH SWASH TAIL
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SALTILLO' (ꞌ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SCHWA' (ə)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SCHWA WITH HOOK' (ɚ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK' (ᶕ)
+    ɡ: 'g', // LATIN SMALL LETTER SCRIPT G
+    ß: 'ss', // LATIN SMALL LETTER SHARP S
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SIDEWAYS DIAERESIZED U' (ᴞ)
+    ᴑ: 'o', // LATIN SMALL LETTER SIDEWAYS O
+    ᴓ: 'o', // LATIN SMALL LETTER SIDEWAYS O WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SIDEWAYS OPEN O' (ᴒ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SIDEWAYS TURNED M' (ᴟ)
+    ᴝ: 'u', // LATIN SMALL LETTER SIDEWAYS U
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER SQUAT REVERSED ESH' (ʅ)
+    ť: 't', // LATIN SMALL LETTER T WITH CARON
+    ţ: 't', // LATIN SMALL LETTER T WITH CEDILLA
+    ṱ: 't', // LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
+    ț: 't', // LATIN SMALL LETTER T WITH COMMA BELOW
+    ȶ: 't', // LATIN SMALL LETTER T WITH CURL
+    ẗ: 't', // LATIN SMALL LETTER T WITH DIAERESIS
+    ⱦ: 't', // LATIN SMALL LETTER T WITH DIAGONAL STROKE
+    ṫ: 't', // LATIN SMALL LETTER T WITH DOT ABOVE
+    ṭ: 't', // LATIN SMALL LETTER T WITH DOT BELOW
+    ƭ: 't', // LATIN SMALL LETTER T WITH HOOK
+    ṯ: 't', // LATIN SMALL LETTER T WITH LINE BELOW
+    ᵵ: 't', // LATIN SMALL LETTER T WITH MIDDLE TILDE
+    ƫ: 't', // LATIN SMALL LETTER T WITH PALATAL HOOK
+    ʈ: 't', // LATIN SMALL LETTER T WITH RETROFLEX HOOK
+    ŧ: 't', // LATIN SMALL LETTER T WITH STROKE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TAILLESS PHI' (ⱷ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TC DIGRAPH WITH CURL' (ʨ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TESH DIGRAPH' (ʧ)
+    ᵺ: 'th', // LATIN SMALL LETTER TH WITH STRIKETHROUGH
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER THORN' (þ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER THORN WITH STROKE' (ꝥ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER' (ꝧ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TONE FIVE' (ƽ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TONE SIX' (ƅ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TONE TWO' (ƨ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TOP HALF O' (ᴖ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TRESILLO' (ꜫ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TS DIGRAPH' (ʦ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TUM' (ꝷ)
+    ɐ: 'a', // LATIN SMALL LETTER TURNED A
+    ᴂ: 'ae', // LATIN SMALL LETTER TURNED AE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TURNED ALPHA' (ɒ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TURNED DELTA' (ƍ)
+    ǝ: 'e', // LATIN SMALL LETTER TURNED E
+    ᵷ: 'g', // LATIN SMALL LETTER TURNED G
+    ɥ: 'h', // LATIN SMALL LETTER TURNED H
+    ʮ: 'h', // LATIN SMALL LETTER TURNED H WITH FISHHOOK
+    ʯ: 'h', // LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+    ᴉ: 'i', // LATIN SMALL LETTER TURNED I
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TURNED INSULAR G' (ꝿ)
+    ʞ: 'k', // LATIN SMALL LETTER TURNED K
+    ꞁ: 'l', // LATIN SMALL LETTER TURNED L
+    ɯ: 'm', // LATIN SMALL LETTER TURNED M
+    ɰ: 'm', // LATIN SMALL LETTER TURNED M WITH LONG LEG
+    ᴔ: 'oe', // LATIN SMALL LETTER TURNED OE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER TURNED OPEN E' (ᴈ)
+    ɹ: 'r', // LATIN SMALL LETTER TURNED R
+    ɻ: 'r', // LATIN SMALL LETTER TURNED R WITH HOOK
+    ɺ: 'r', // LATIN SMALL LETTER TURNED R WITH LONG LEG
+    ⱹ: 'r', // LATIN SMALL LETTER TURNED R WITH TAIL
+    ʇ: 't', // LATIN SMALL LETTER TURNED T
+    ʌ: 'v', // LATIN SMALL LETTER TURNED V
+    ʍ: 'w', // LATIN SMALL LETTER TURNED W
+    ʎ: 'y', // LATIN SMALL LETTER TURNED Y
+    ꜩ: 'tz', // LATIN SMALL LETTER TZ
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER U BAR' (ʉ)
+    ú: 'u', // LATIN SMALL LETTER U WITH ACUTE
+    ŭ: 'u', // LATIN SMALL LETTER U WITH BREVE
+    ǔ: 'u', // LATIN SMALL LETTER U WITH CARON
+    û: 'u', // LATIN SMALL LETTER U WITH CIRCUMFLEX
+    ṷ: 'u', // LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
+    ü: 'u', // LATIN SMALL LETTER U WITH DIAERESIS
+    ǘ: 'u', // LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+    ǚ: 'u', // LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+    ǜ: 'u', // LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+    ǖ: 'u', // LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+    ṳ: 'u', // LATIN SMALL LETTER U WITH DIAERESIS BELOW
+    ụ: 'u', // LATIN SMALL LETTER U WITH DOT BELOW
+    ű: 'u', // LATIN SMALL LETTER U WITH DOUBLE ACUTE
+    ȕ: 'u', // LATIN SMALL LETTER U WITH DOUBLE GRAVE
+    ù: 'u', // LATIN SMALL LETTER U WITH GRAVE
+    ủ: 'u', // LATIN SMALL LETTER U WITH HOOK ABOVE
+    ư: 'u', // LATIN SMALL LETTER U WITH HORN
+    ứ: 'u', // LATIN SMALL LETTER U WITH HORN AND ACUTE
+    ự: 'u', // LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+    ừ: 'u', // LATIN SMALL LETTER U WITH HORN AND GRAVE
+    ử: 'u', // LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+    ữ: 'u', // LATIN SMALL LETTER U WITH HORN AND TILDE
+    ȗ: 'u', // LATIN SMALL LETTER U WITH INVERTED BREVE
+    ū: 'u', // LATIN SMALL LETTER U WITH MACRON
+    ṻ: 'u', // LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
+    ų: 'u', // LATIN SMALL LETTER U WITH OGONEK
+    ᶙ: 'u', // LATIN SMALL LETTER U WITH RETROFLEX HOOK
+    ů: 'u', // LATIN SMALL LETTER U WITH RING ABOVE
+    ũ: 'u', // LATIN SMALL LETTER U WITH TILDE
+    ṹ: 'u', // LATIN SMALL LETTER U WITH TILDE AND ACUTE
+    ṵ: 'u', // LATIN SMALL LETTER U WITH TILDE BELOW
+    ᵫ: 'ue', // LATIN SMALL LETTER UE
+    ꝸ: 'um', // LATIN SMALL LETTER UM
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER UPSILON' (ʊ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER UPSILON WITH STROKE' (ᵿ)
+    ⱴ: 'v', // LATIN SMALL LETTER V WITH CURL
+    ꝟ: 'v', // LATIN SMALL LETTER V WITH DIAGONAL STROKE
+    ṿ: 'v', // LATIN SMALL LETTER V WITH DOT BELOW
+    ʋ: 'v', // LATIN SMALL LETTER V WITH HOOK
+    ᶌ: 'v', // LATIN SMALL LETTER V WITH PALATAL HOOK
+    ⱱ: 'v', // LATIN SMALL LETTER V WITH RIGHT HOOK
+    ṽ: 'v', // LATIN SMALL LETTER V WITH TILDE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER VEND' (ꝩ)
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER VISIGOTHIC Z' (ꝣ)
+    ꝡ: 'vy', // LATIN SMALL LETTER VY
+    ẃ: 'w', // LATIN SMALL LETTER W WITH ACUTE
+    ŵ: 'w', // LATIN SMALL LETTER W WITH CIRCUMFLEX
+    ẅ: 'w', // LATIN SMALL LETTER W WITH DIAERESIS
+    ẇ: 'w', // LATIN SMALL LETTER W WITH DOT ABOVE
+    ẉ: 'w', // LATIN SMALL LETTER W WITH DOT BELOW
+    ẁ: 'w', // LATIN SMALL LETTER W WITH GRAVE
+    ⱳ: 'w', // LATIN SMALL LETTER W WITH HOOK
+    ẘ: 'w', // LATIN SMALL LETTER W WITH RING ABOVE
+    ẍ: 'x', // LATIN SMALL LETTER X WITH DIAERESIS
+    ẋ: 'x', // LATIN SMALL LETTER X WITH DOT ABOVE
+    ᶍ: 'x', // LATIN SMALL LETTER X WITH PALATAL HOOK
+    ý: 'y', // LATIN SMALL LETTER Y WITH ACUTE
+    ŷ: 'y', // LATIN SMALL LETTER Y WITH CIRCUMFLEX
+    ÿ: 'y', // LATIN SMALL LETTER Y WITH DIAERESIS
+    ẏ: 'y', // LATIN SMALL LETTER Y WITH DOT ABOVE
+    ỵ: 'y', // LATIN SMALL LETTER Y WITH DOT BELOW
+    ỳ: 'y', // LATIN SMALL LETTER Y WITH GRAVE
+    ƴ: 'y', // LATIN SMALL LETTER Y WITH HOOK
+    ỷ: 'y', // LATIN SMALL LETTER Y WITH HOOK ABOVE
+    ỿ: 'y', // LATIN SMALL LETTER Y WITH LOOP
+    ȳ: 'y', // LATIN SMALL LETTER Y WITH MACRON
+    ẙ: 'y', // LATIN SMALL LETTER Y WITH RING ABOVE
+    ɏ: 'y', // LATIN SMALL LETTER Y WITH STROKE
+    ỹ: 'y', // LATIN SMALL LETTER Y WITH TILDE
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LETTER YOGH' (ȝ)
+    ź: 'z', // LATIN SMALL LETTER Z WITH ACUTE
+    ž: 'z', // LATIN SMALL LETTER Z WITH CARON
+    ẑ: 'z', // LATIN SMALL LETTER Z WITH CIRCUMFLEX
+    ʑ: 'z', // LATIN SMALL LETTER Z WITH CURL
+    ⱬ: 'z', // LATIN SMALL LETTER Z WITH DESCENDER
+    ż: 'z', // LATIN SMALL LETTER Z WITH DOT ABOVE
+    ẓ: 'z', // LATIN SMALL LETTER Z WITH DOT BELOW
+    ȥ: 'z', // LATIN SMALL LETTER Z WITH HOOK
+    ẕ: 'z', // LATIN SMALL LETTER Z WITH LINE BELOW
+    ᵶ: 'z', // LATIN SMALL LETTER Z WITH MIDDLE TILDE
+    ᶎ: 'z', // LATIN SMALL LETTER Z WITH PALATAL HOOK
+    ʐ: 'z', // LATIN SMALL LETTER Z WITH RETROFLEX HOOK
+    ƶ: 'z', // LATIN SMALL LETTER Z WITH STROKE
+    ɀ: 'z', // LATIN SMALL LETTER Z WITH SWASH TAIL
+    ff: 'ff', // LATIN SMALL LIGATURE FF
+    ffi: 'ffi', // LATIN SMALL LIGATURE FFI
+    ffl: 'ffl', // LATIN SMALL LIGATURE FFL
+    fi: 'fi', // LATIN SMALL LIGATURE FI
+    fl: 'fl', // LATIN SMALL LIGATURE FL
+    ij: 'ij', // LATIN SMALL LIGATURE IJ
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SMALL LIGATURE LONG S T' (ſt)
+    œ: 'oe', // LATIN SMALL LIGATURE OE
+    st: 'st', // LATIN SMALL LIGATURE ST
+    ₐ: 'a', // LATIN SUBSCRIPT SMALL LETTER A
+    ₑ: 'e', // LATIN SUBSCRIPT SMALL LETTER E
+    ᵢ: 'i', // LATIN SUBSCRIPT SMALL LETTER I
+    ⱼ: 'j', // LATIN SUBSCRIPT SMALL LETTER J
+    ₒ: 'o', // LATIN SUBSCRIPT SMALL LETTER O
+    ᵣ: 'r', // LATIN SUBSCRIPT SMALL LETTER R
+    // CANNOT FIND APPROXIMATION FOR 'LATIN SUBSCRIPT SMALL LETTER SCHWA' (ₔ)
+    ᵤ: 'u', // LATIN SUBSCRIPT SMALL LETTER U
+    ᵥ: 'v', // LATIN SUBSCRIPT SMALL LETTER V
+    ₓ: 'x', // LATIN SUBSCRIPT SMALL LETTER X
+};
diff --git a/app/utils/url/latinise.ts b/app/utils/url/latinise.ts
new file mode 100644
index 000000000..f2526ef30
--- /dev/null
+++ b/app/utils/url/latinise.ts
@@ -0,0 +1,13 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+// Credit to http://semplicewebsites.com/removing-accents-javascript
+
+import {latinMap} from './latin_map';
+
+export function map(x: string) {
+    return latinMap[x] || x;
+}
+
+export function latinise(input: string) {
+    return input.replace(/[^A-Za-z0-9]/g, map);
+}
diff --git a/app/utils/url/test.ts b/app/utils/url/test.ts
new file mode 100644
index 000000000..c954a9fa2
--- /dev/null
+++ b/app/utils/url/test.ts
@@ -0,0 +1,288 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Linking} from 'react-native';
+
+import * as UrlUtils from '@utils/url';
+
+import {DeepLinkType} from '@typings/launch';
+
+/* eslint-disable max-nested-callbacks */
+
+describe('UrlUtils', () => {
+    describe('isImageLink', () => {
+        it('not an image link', () => {
+            const link = 'https://mattermost.com/index.html';
+            expect(UrlUtils.isImageLink(link)).toEqual(false);
+        });
+
+        it('a png link', () => {
+            const link = 'https://mattermost.com/image.png';
+            expect(UrlUtils.isImageLink(link)).toEqual(true);
+        });
+
+        it('a jpg link', () => {
+            const link = 'https://mattermost.com/assets/image.jpeg';
+            expect(UrlUtils.isImageLink(link)).toEqual(true);
+        });
+
+        it('a jpeg link', () => {
+            const link = 'https://mattermost.com/logo.jpeg';
+            expect(UrlUtils.isImageLink(link)).toEqual(true);
+        });
+
+        it('a bmp link', () => {
+            const link = 'https://images.mattermost.com/foo/bar/asdf.bmp';
+            expect(UrlUtils.isImageLink(link)).toEqual(true);
+        });
+
+        it('a gif link', () => {
+            const link = 'https://mattermost.com/jif.gif';
+            expect(UrlUtils.isImageLink(link)).toEqual(true);
+        });
+
+        it('a link with a query parameter', () => {
+            const link = 'https://mattermost.com/image.png?hash=foobar';
+            expect(UrlUtils.isImageLink(link)).toEqual(true);
+        });
+    });
+
+    describe('getYouTubeVideoId', () => {
+        const tests = [
+            ['https://youtu.be/zrFWrmPgfzc', 'zrFWrmPgfzc'],
+            ['https://youtu.be/zrFWrmPgfzc?t=10s', 'zrFWrmPgfzc'],
+            [
+                'https://www.youtube.com/watch?v=zrFWrmPgfzc&feature=youtu.be',
+                'zrFWrmPgfzc',
+            ],
+            ['https://www.youtube.com/watch?v=zrFWrmPgfzc&t=10s', 'zrFWrmPgfzc'],
+            ['https://www.youtube.com/watch?t=10s&v=zrFWrmPgfzc', 'zrFWrmPgfzc'],
+        ];
+
+        for (const test of tests) {
+            const input = test[0];
+            const expected = test[1];
+
+            it(input, () => {
+                expect(UrlUtils.getYouTubeVideoId(input)).toEqual(expected);
+            });
+        }
+    });
+
+    describe('stripTrailingSlashes', () => {
+        it('should return the same url', () => {
+            const url =
+        'https://www.youtube.com/watch?v=zrFWrmPgfzc&feature=youtu.be';
+            expect(UrlUtils.stripTrailingSlashes(url)).toEqual(url);
+        });
+
+        it('should return an url without the initial //', () => {
+            const url = '//www.youtube.com/watch?v=zrFWrmPgfzc&feature=youtu.be';
+            const expected = 'www.youtube.com/watch?v=zrFWrmPgfzc&feature=youtu.be';
+            expect(UrlUtils.stripTrailingSlashes(url)).toEqual(expected);
+        });
+
+        it('should return an url without the initial // and the lasts ////', () => {
+            const url = '//www.youtube.com/watch?v=zrFWrmPgfzc&feature=youtu.be////';
+            const expected = 'www.youtube.com/watch?v=zrFWrmPgfzc&feature=youtu.be';
+            expect(UrlUtils.stripTrailingSlashes(url)).toEqual(expected);
+        });
+
+        it('should return an url without the initial // and the lasts //// or spaces', () => {
+            const url =
+        'https: //www .y o u t u be .co m/watch   ?v=z r FW r mP gf zc& fe atu r e = you  tu .be////';
+            const expected =
+        'https://www.youtube.com/watch?v=zrFWrmPgfzc&feature=youtu.be';
+            expect(UrlUtils.stripTrailingSlashes(url)).toEqual(expected);
+        });
+    });
+
+    describe('removeProtocol', () => {
+        const tests = [
+            {
+                name: 'should return url without http protocol prefix',
+                url: 'http://localhost:8065',
+                expected: 'localhost:8065',
+            },
+            {
+                name: 'should return url without https protocol prefix',
+                url: 'https://localhost:8065',
+                expected: 'localhost:8065',
+            },
+            {name: 'should return null', url: '', expected: ''},
+            {
+                name: 'should return url without arbitrary protocol prefix',
+                url: 'udp://localhost:8065',
+                expected: 'localhost:8065',
+            },
+        ];
+
+        for (const test of tests) {
+            const {name, url, expected} = test;
+
+            it(name, () => {
+                expect(UrlUtils.removeProtocol(url)).toEqual(expected);
+            });
+        }
+    });
+
+    describe('matchDeepLink', () => {
+        const URL_NO_PROTOCOL = 'localhost:8065/subdir';
+        const SITE_URL = `http://${URL_NO_PROTOCOL}`;
+        const SERVER_URL = `http://${URL_NO_PROTOCOL}`;
+        const DEEPLINK_URL_ROOT = `mattermost://${URL_NO_PROTOCOL}`;
+
+        const tests = [
+            {
+                name: 'should return null if all inputs are empty',
+                input: {url: '', serverURL: '', siteURL: ''},
+                expected: null,
+            },
+            {
+                name: 'should return null if any of the input is null',
+                input: {url: '', serverURL: '', siteURL: null},
+                expected: null,
+            },
+            {
+                name: 'should return null if any of the input is null',
+                input: {url: '', serverURL: null, siteURL: ''},
+                expected: null,
+            },
+            {
+                name: 'should return null if any of the input is null',
+                input: {url: null, serverURL: '', siteURL: ''},
+                expected: null,
+            },
+            {
+                name: 'should return null for not supported link',
+                input: {
+                    url: 'https://otherserver.com',
+                    serverURL: SERVER_URL,
+                    siteURL: SITE_URL,
+                },
+                expected: null,
+            },
+            {
+                name: 'should return null despite url subset match',
+                input: {url: 'http://myserver.com', serverURL: 'http://myserver.co'},
+                expected: null,
+            },
+            {
+                name: 'should match despite no server URL in input link',
+                input: {
+                    url: '/ad-1/pl/qe93kkfd7783iqwuwfcwcxbsgy',
+                    serverURL: SERVER_URL,
+                    siteURL: SITE_URL,
+                },
+                expected: {
+                    data: {
+                        postId: 'qe93kkfd7783iqwuwfcwcxbsgy',
+                        serverUrl: URL_NO_PROTOCOL,
+                        teamName: 'ad-1',
+                    },
+                    type: DeepLinkType.Permalink,
+                },
+            },
+            {
+                name: 'should match channel link',
+                input: {
+                    url: SITE_URL + '/ad-1/channels/town-square',
+                    serverURL: SERVER_URL,
+                    siteURL: SITE_URL,
+                },
+                expected: {
+                    data: {
+                        channelName: 'town-square',
+                        serverUrl: URL_NO_PROTOCOL,
+                        teamName: 'ad-1',
+                    },
+                    type: DeepLinkType.Channel,
+                },
+            },
+            {
+                name: 'should match permalink',
+                input: {
+                    url: SITE_URL + '/ad-1/pl/qe93kkfd7783iqwuwfcwcxbsgy',
+                    serverURL: SERVER_URL,
+                    siteURL: SITE_URL,
+                },
+                expected: {
+                    data: {
+                        postId: 'qe93kkfd7783iqwuwfcwcxbsgy',
+                        serverUrl: URL_NO_PROTOCOL,
+                        teamName: 'ad-1',
+                    },
+                    type: DeepLinkType.Permalink,
+                },
+            },
+            {
+                name: 'should match channel link with deeplink prefix',
+                input: {
+                    url: DEEPLINK_URL_ROOT + '/ad-1/channels/town-square',
+                    serverURL: SERVER_URL,
+                    siteURL: SITE_URL,
+                },
+                expected: {
+                    data: {
+                        channelName: 'town-square',
+                        serverUrl: URL_NO_PROTOCOL,
+                        teamName: 'ad-1',
+                    },
+                    type: DeepLinkType.Channel,
+                },
+            },
+            {
+                name: 'should match permalink with depplink prefix',
+                input: {
+                    url: DEEPLINK_URL_ROOT + '/ad-1/pl/qe93kkfd7783iqwuwfcwcxbsgy',
+                    serverURL: SERVER_URL,
+                    siteURL: SITE_URL,
+                },
+                expected: {
+                    data: {
+                        postId: 'qe93kkfd7783iqwuwfcwcxbsgy',
+                        serverUrl: URL_NO_PROTOCOL,
+                        teamName: 'ad-1',
+                    },
+                    type: 'permalink',
+                },
+            },
+        ];
+
+        for (const test of tests) {
+            const {name, input, expected} = test;
+
+            it(name, () => {
+                expect(UrlUtils.matchDeepLink(input.url!, input.serverURL!, input.siteURL!)).toEqual(expected);
+            });
+        }
+    });
+
+    describe('tryOpenUrl', () => {
+        const url = 'https://some.url.com';
+
+        it('should call onSuccess when Linking.openURL succeeds', async () => {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            Linking.openURL.mockResolvedValueOnce();
+            const onError = jest.fn();
+            const onSuccess = jest.fn();
+
+            await UrlUtils.tryOpenURL(url, onError, onSuccess);
+            expect(onError).not.toHaveBeenCalled();
+            expect(onSuccess).toHaveBeenCalledTimes(1);
+        });
+
+        it('should call onError when Linking.openURL fails', async () => {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            Linking.openURL.mockRejectedValueOnce();
+            const onError = jest.fn();
+            const onSuccess = jest.fn();
+
+            await UrlUtils.tryOpenURL(url, onError, onSuccess);
+            expect(onError).toHaveBeenCalledTimes(1);
+            expect(onSuccess).not.toHaveBeenCalled();
+        });
+    });
+});
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 80e8a873f..eb95ac5ab 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -1,121 +1,7 @@
 {
-  "about.date": "Build Date:",
-  "about.enterpriseEditione1": "Enterprise Edition",
-  "about.enterpriseEditionLearn": "Learn more about Enterprise Edition at ",
-  "about.enterpriseEditionSt": "Modern communication from behind your firewall.",
-  "about.hash": "Build Hash:",
-  "about.hashee": "EE Build Hash:",
-  "about.teamEditionLearn": "Join the Mattermost community at ",
-  "about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.",
-  "about.teamEditiont0": "Team Edition",
-  "about.teamEditiont1": "Enterprise Edition",
-  "about.title": "About {appTitle}",
-  "announcment_banner.dont_show_again": "Don't show again",
-  "api.channel.add_member.added": "{addedUsername} added to the channel by {username}.",
-  "archivedChannelMessage": "You are viewing an **archived channel**. New messages cannot be posted.",
-  "center_panel.archived.closeChannel": "Close Channel",
-  "channel_header.addMembers": "Add Members",
-  "channel_header.directchannel.you": "{displayname} (you) ",
-  "channel_header.manageMembers": "Manage Members",
-  "channel_header.notificationPreference": "Mobile Notifications",
-  "channel_header.notificationPreference.all": "All",
-  "channel_header.notificationPreference.default": "Default",
-  "channel_header.notificationPreference.mention": "Mentions",
-  "channel_header.notificationPreference.none": "Never",
-  "channel_header.pinnedPosts": "Pinned Messages",
-  "channel_header.viewMembers": "View Members",
-  "channel_info.header": "Header:",
-  "channel_info.purpose": "Purpose:",
-  "channel_loader.someone": "Someone",
-  "channel_members_modal.remove": "Remove",
-  "channel_modal.cancel": "Cancel",
-  "channel_modal.descriptionHelp": "Describe how this channel should be used.",
-  "channel_modal.header": "Header",
-  "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
-  "channel_modal.headerHelp": "Set text that will appear in the header of the channel beside the channel name. For example, include frequently used links by typing [Link Title](http://example.com).",
-  "channel_modal.name": "Name",
-  "channel_modal.nameEx": "E.g.: \"Bugs\", \"Marketing\", \"客户支持\"",
-  "channel_modal.optional": "(optional)",
-  "channel_modal.purpose": "Purpose",
-  "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notifications.ignoreChannelMentions.settings": "Ignore @channel, @here, @all",
-  "channel_notifications.muteChannel.settings": "Mute channel",
-  "channel_notifications.preference.all_activity": "For all activity",
-  "channel_notifications.preference.global_default": "Global default ({notifyLevel})",
-  "channel_notifications.preference.header": "Send Notifications",
-  "channel_notifications.preference.never": "Never",
-  "channel_notifications.preference.only_mentions": "Only mentions and direct messages",
-  "channel_notifications.preference.save_error": "We couldn't save notification preference. Please check your connection and try again.",
-  "channel.channelHasGuests": "This channel has guests",
-  "channel.hasGuests": "This group message has guests",
-  "channel.isGuest": "This person is a guest",
-  "combined_system_message.added_to_channel.many_expanded": "{users} and {lastUser} were **added to the channel** by {actor}.",
-  "combined_system_message.added_to_channel.one": "{firstUser} **added to the channel** by {actor}.",
-  "combined_system_message.added_to_channel.one_you": "You were **added to the channel** by {actor}.",
-  "combined_system_message.added_to_channel.two": "{firstUser} and {secondUser} **added to the channel** by {actor}.",
-  "combined_system_message.added_to_team.many_expanded": "{users} and {lastUser} were **added to the team** by {actor}.",
-  "combined_system_message.added_to_team.one": "{firstUser} **added to the team** by {actor}.",
-  "combined_system_message.added_to_team.one_you": "You were **added to the team** by {actor}.",
-  "combined_system_message.added_to_team.two": "{firstUser} and {secondUser} **added to the team** by {actor}.",
-  "combined_system_message.joined_channel.many_expanded": "{users} and {lastUser} **joined the channel**.",
-  "combined_system_message.joined_channel.one": "{firstUser} **joined the channel**.",
-  "combined_system_message.joined_channel.one_you": "You **joined the channel**.",
-  "combined_system_message.joined_channel.two": "{firstUser} and {secondUser} **joined the channel**.",
-  "combined_system_message.joined_team.many_expanded": "{users} and {lastUser} **joined the team**.",
-  "combined_system_message.joined_team.one": "{firstUser} **joined the team**.",
-  "combined_system_message.joined_team.one_you": "You **joined the team**.",
-  "combined_system_message.joined_team.two": "{firstUser} and {secondUser} **joined the team**.",
-  "combined_system_message.left_channel.many_expanded": "{users} and {lastUser} **left the channel**.",
-  "combined_system_message.left_channel.one": "{firstUser} **left the channel**.",
-  "combined_system_message.left_channel.one_you": "You **left the channel**.",
-  "combined_system_message.left_channel.two": "{firstUser} and {secondUser} **left the channel**.",
-  "combined_system_message.left_team.many_expanded": "{users} and {lastUser} **left the team**.",
-  "combined_system_message.left_team.one": "{firstUser} **left the team**.",
-  "combined_system_message.left_team.one_you": "You **left the team**.",
-  "combined_system_message.left_team.two": "{firstUser} and {secondUser} **left the team**.",
-  "combined_system_message.removed_from_channel.many_expanded": "{users} and {lastUser} were **removed from the channel**.",
-  "combined_system_message.removed_from_channel.one": "{firstUser} was **removed from the channel**.",
-  "combined_system_message.removed_from_channel.one_you": "You were **removed from the channel**.",
-  "combined_system_message.removed_from_channel.two": "{firstUser} and {secondUser} were **removed from the channel**.",
-  "combined_system_message.removed_from_team.many_expanded": "{users} and {lastUser} were **removed from the team**.",
-  "combined_system_message.removed_from_team.one": "{firstUser} was **removed from the team**.",
-  "combined_system_message.removed_from_team.one_you": "You were **removed from the team**.",
-  "combined_system_message.removed_from_team.two": "{firstUser} and {secondUser} were **removed from the team**.",
-  "combined_system_message.you": "You",
-  "create_comment.addComment": "Add a comment...",
-  "create_post.deactivated": "You are viewing an archived channel with a deactivated user.",
-  "create_post.write": "Write to {channelDisplayName}",
-  "date_separator.today": "Today",
-  "date_separator.yesterday": "Yesterday",
-  "edit_post.editPost": "Edit the post...",
-  "edit_post.save": "Save",
-  "file_upload.fileAbove": "Files must be less than {max}",
-  "gallery.download_file": "Download file",
-  "gallery.footer.channel_name": "Shared in {channelName}",
-  "gallery.open_file": "Open file",
-  "gallery.unsuppored": "Preview is not supported for this file type",
-  "get_post_link_modal.title": "Copy Link",
-  "integrations.add": "Add",
-  "intro_messages.anyMember": " Any member can join and read this channel.",
-  "intro_messages.beginning": "Beginning of {name}",
-  "intro_messages.creator": "This is the start of the {name} channel, created by {creator} on {date}.",
-  "intro_messages.creatorPrivate": "This is the start of the {name} private channel, created by {creator} on {date}.",
-  "intro_messages.group_message": "This is the start of your group message history with these teammates. Messages and files shared here are not shown to people outside this area.",
-  "intro_messages.noCreator": "This is the start of the {name} channel, created on {date}.",
-  "intro_messages.onlyInvited": " Only invited members can see this private channel.",
-  "last_users_message.added_to_channel.type": "were **added to the channel** by {actor}.",
-  "last_users_message.added_to_team.type": "were **added to the team** by {actor}.",
-  "last_users_message.first": "{firstUser} and ",
-  "last_users_message.joined_channel.type": "**joined the channel**.",
-  "last_users_message.joined_team.type": "**joined the team**.",
-  "last_users_message.left_channel.type": "**left the channel**.",
-  "last_users_message.left_team.type": "**left the team**.",
-  "last_users_message.others": "{numOthers} others ",
-  "last_users_message.removed_from_channel.type": "were **removed from the channel**.",
-  "last_users_message.removed_from_team.type": "were **removed from the team**.",
   "login_mfa.enterToken": "To complete the sign in process, please enter a token from your smartphone's authenticator",
-  "login_mfa.token": "MFA Token",
-  "login_mfa.tokenReq": "Please enter an MFA token",
+  "login_mfa.token": "",
+  "login_mfa.tokenReq": "",
   "login.email": "Email",
   "login.forgot": "I forgot my password",
   "login.invalidPassword": "Your password is incorrect.",
@@ -135,171 +21,16 @@
   "login.username": "Username",
   "login.userNotFound": "We couldn't find an account matching your login credentials.",
   "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. All rights reserved",
-  "mobile.about.database": "Database: {type}",
-  "mobile.about.licensed": "Licensed to: {company}",
-  "mobile.about.powered_by": "{site} is powered by Mattermost",
-  "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
-  "mobile.about.serverVersionNoBuild": "Server Version: {version}",
-  "mobile.account_notifications.reply.header": "SEND REPLY NOTIFICATIONS FOR",
-  "mobile.account_notifications.threads_mentions": "Mentions in threads",
-  "mobile.account_notifications.threads_start": "Threads that I start",
-  "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.account.settings.save": "Save",
-  "mobile.action_menu.select": "Select an option",
-  "mobile.advanced_settings.clockDisplay": "Clock display",
-  "mobile.advanced_settings.delete": "Delete",
-  "mobile.advanced_settings.delete_message": "\nThis will reset all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
-  "mobile.advanced_settings.delete_title": "Delete Documents & Data",
-  "mobile.advanced_settings.timezone": "Timezone",
-  "mobile.advanced_settings.title": "Advanced Settings",
-  "mobile.alert_dialog.alertCancel": "Cancel",
-  "mobile.android.back_handler_exit": "Press back again to exit",
-  "mobile.android.photos_permission_denied_description": "Upload photos to your Mattermost instance or save them to your device. Open Settings to grant Mattermost Read and Write access to your photo library.",
-  "mobile.android.photos_permission_denied_title": "{applicationName} would like to access your photos",
-  "mobile.android.videos_permission_denied_description": "Upload videos to your Mattermost instance or save them to your device. Open Settings to grant Mattermost Read and Write access to your video library.",
-  "mobile.android.videos_permission_denied_title": "{applicationName} would like to access your videos",
-  "mobile.announcement_banner.title": "Announcement",
-  "mobile.calendar.dayNames": "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday",
-  "mobile.calendar.dayNamesShort": "Sun,Mon,Tue,Wed,Thu,Fri,Sat",
-  "mobile.calendar.monthNames": "January,February,March,April,May,June,July,August,September,October,November,December",
-  "mobile.calendar.monthNamesShort": "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
-  "mobile.camera_photo_permission_denied_description": "Take photos and upload them to your Mattermost instance or save them to your device. Open Settings to grant Mattermost Read and Write access to your camera.",
-  "mobile.camera_photo_permission_denied_title": "{applicationName} would like to access your camera",
-  "mobile.camera_video_permission_denied_description": "Take videos and upload them to your Mattermost instance or save them to your device. Open Settings to grant Mattermost Read and Write access to your camera.",
-  "mobile.camera_video_permission_denied_title": "{applicationName} would like to access your camera",
-  "mobile.channel_drawer.search": "Jump to...",
-  "mobile.channel_info.alertMessageConvertChannel": "When you convert {displayName} to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.\n\nThe change is permanent and cannot be undone.\n\nAre you sure you want to convert {displayName} to a private channel?",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to archive the {term} {name}?",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
-  "mobile.channel_info.alertMessageUnarchiveChannel": "Are you sure you want to unarchive the {term} {name}?",
-  "mobile.channel_info.alertNo": "No",
-  "mobile.channel_info.alertTitleConvertChannel": "Convert {displayName} to a private channel?",
-  "mobile.channel_info.alertTitleDeleteChannel": "Archive {term}",
-  "mobile.channel_info.alertTitleLeaveChannel": "Leave {term}",
-  "mobile.channel_info.alertTitleUnarchiveChannel": "Unarchive {term}",
-  "mobile.channel_info.alertYes": "Yes",
-  "mobile.channel_info.convert": "Convert to Private Channel",
-  "mobile.channel_info.convert_failed": "We were unable to convert {displayName} to a private channel.",
-  "mobile.channel_info.convert_success": "{displayName} is now a private channel.",
-  "mobile.channel_info.copy_header": "Copy Header",
-  "mobile.channel_info.copy_purpose": "Copy Purpose",
-  "mobile.channel_info.delete_failed": "We couldn't archive the channel {displayName}. Please check your connection and try again.",
-  "mobile.channel_info.edit": "Edit Channel",
-  "mobile.channel_info.privateChannel": "Private Channel",
-  "mobile.channel_info.publicChannel": "Public Channel",
-  "mobile.channel_info.unarchive_failed": "We couldn't unarchive the channel {displayName}. Please check your connection and try again.",
-  "mobile.channel_list.alertNo": "No",
-  "mobile.channel_list.alertYes": "Yes",
-  "mobile.channel_list.archived": "ARCHIVED",
-  "mobile.channel_list.channels": "CHANNELS",
-  "mobile.channel_list.closeDM": "Close Direct Message",
-  "mobile.channel_list.closeGM": "Close Group Message",
-  "mobile.channel_list.members": "MEMBERS",
-  "mobile.channel_list.not_member": "NOT A MEMBER",
-  "mobile.channel_list.unreads": "UNREADS",
-  "mobile.channel_members.add_members_alert": "You must select at least one member to add to the channel.",
-  "mobile.client_upgrade": "Update App",
-  "mobile.client_upgrade.can_upgrade_subtitle": "A new version is available for download.",
-  "mobile.client_upgrade.can_upgrade_title": "Update Available",
-  "mobile.client_upgrade.close": "Update Later",
-  "mobile.client_upgrade.current_version": "Latest Version: {version}",
-  "mobile.client_upgrade.download_error.message": "An error occurred downloading the new version.",
-  "mobile.client_upgrade.download_error.title": "Unable to Install Update",
-  "mobile.client_upgrade.latest_version": "Your Version: {version}",
-  "mobile.client_upgrade.listener.dismiss_button": "Dismiss",
-  "mobile.client_upgrade.listener.learn_more_button": "Learn More",
-  "mobile.client_upgrade.listener.message": "A client upgrade is available!",
-  "mobile.client_upgrade.listener.upgrade_button": "Upgrade",
-  "mobile.client_upgrade.must_upgrade_subtitle": "Please update the app to continue.",
-  "mobile.client_upgrade.must_upgrade_title": "Update Required",
-  "mobile.client_upgrade.no_upgrade_subtitle": "You already have the latest version.",
-  "mobile.client_upgrade.no_upgrade_title": "Your App Is Up to Date",
-  "mobile.client_upgrade.upgrade": "Update",
-  "mobile.commands.error_title": "Error Executing Command",
-  "mobile.components.error_list.dismiss_all": "Dismiss All",
   "mobile.components.select_server_view.connect": "Connect",
   "mobile.components.select_server_view.connecting": "Connecting...",
   "mobile.components.select_server_view.enterServerUrl": "Enter Server URL",
   "mobile.components.select_server_view.proceed": "Proceed",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
-  "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Channel",
-  "mobile.create_channel.public": "New Public Channel",
-  "mobile.create_post.read_only": "This channel is read-only",
-  "mobile.custom_list.no_results": "No Results",
-  "mobile.display_settings.sidebar": "Sidebar",
-  "mobile.display_settings.theme": "Theme",
-  "mobile.document_preview.failed_description": "An error occurred while opening the document. Please make sure you have a {fileType} viewer installed and try again.\n",
-  "mobile.document_preview.failed_title": "Open Document failed",
-  "mobile.downloader.disabled_description": "File downloads are disabled on this server. Please contact your System Admin for more details.\n",
-  "mobile.downloader.disabled_title": "Download disabled",
-  "mobile.downloader.failed_description": "An error occurred while downloading the file. Please check your internet connection and try again.\n",
-  "mobile.downloader.failed_title": "Download failed",
-  "mobile.drawer.teamsTitle": "Teams",
-  "mobile.edit_channel": "Save",
-  "mobile.edit_post.title": "Editing Message",
-  "mobile.edit_profile.remove_profile_photo": "Remove Photo",
-  "mobile.emoji_picker.activity": "ACTIVITY",
-  "mobile.emoji_picker.custom": "CUSTOM",
-  "mobile.emoji_picker.flags": "FLAGS",
-  "mobile.emoji_picker.foods": "FOODS",
-  "mobile.emoji_picker.nature": "NATURE",
-  "mobile.emoji_picker.objects": "OBJECTS",
-  "mobile.emoji_picker.people": "PEOPLE",
-  "mobile.emoji_picker.places": "PLACES",
-  "mobile.emoji_picker.recent": "RECENTLY USED",
-  "mobile.emoji_picker.search.not_found_description": "Check the spelling or try another search.",
-  "mobile.emoji_picker.search.not_found_title": "No results found for \"{searchTerm}\"",
-  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Relaunch",
   "mobile.error_handler.description": "\nTap relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
   "mobile.error_handler.title": "Unexpected error occurred",
-  "mobile.extension.authentication_required": "Authentication required: Please first login using the app.",
-  "mobile.extension.file_error": "There was an error reading the file to be shared.\nPlease try again.",
-  "mobile.extension.file_limit": "Sharing is limited to a maximum of 5 files.",
-  "mobile.extension.max_file_size": "File attachments shared in Mattermost must be less than {size}.",
-  "mobile.extension.permission": "Mattermost needs access to the device storage to share files.",
-  "mobile.extension.team_required": "You must belong to a team before you can share files.",
-  "mobile.extension.title": "Share in Mattermost",
-  "mobile.failed_network_action.retry": "Try again",
-  "mobile.failed_network_action.shortDescription": "Messages will load when you have an internet connection.",
-  "mobile.failed_network_action.teams_channel_description": "Channels could not be loaded for {teamName}.",
-  "mobile.failed_network_action.teams_description": "Teams could not be loaded.",
-  "mobile.failed_network_action.teams_title": "Something went wrong",
-  "mobile.failed_network_action.title": "No internet connection",
-  "mobile.file_upload.browse": "Browse Files",
-  "mobile.file_upload.camera_photo": "Take Photo",
-  "mobile.file_upload.camera_video": "Take Video",
-  "mobile.file_upload.disabled": "File uploads from mobile are disabled. Please contact your System Admin for more details.",
-  "mobile.file_upload.disabled2": "File uploads from mobile are disabled.",
-  "mobile.file_upload.library": "Photo Library",
-  "mobile.file_upload.max_warning": "Uploads limited to 5 files maximum.",
-  "mobile.file_upload.unsupportedMimeType": "Only BMP, JPG or PNG images may be used for profile pictures.",
-  "mobile.file_upload.video": "Video Library",
-  "mobile.files_paste.error_description": "An error occurred while pasting the file(s). Please try again.",
-  "mobile.files_paste.error_dismiss": "Dismiss",
-  "mobile.files_paste.error_title": "Paste failed",
-  "mobile.flagged_posts.empty_description": "Saved messages are only visible to you. Mark messages for follow-up or save something for later by long-pressing a message and choosing Save from the menu.",
-  "mobile.flagged_posts.empty_title": "No Saved messages yet",
-  "mobile.gallery.title": "{index} of {total}",
-  "mobile.help.title": "Help",
-  "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
-  "mobile.intro_messages.default_welcome": "Welcome to {name}!",
-  "mobile.intro_messages.DM": "This is the start of your direct message history with {teammate}. Direct messages and files shared here are not shown to people outside this area.",
-  "mobile.ios.photos_permission_denied_description": "Upload photos and videos to your Mattermost instance or save them to your device. Open Settings to grant Mattermost Read and Write access to your photo and video library.",
-  "mobile.ios.photos_permission_denied_title": "{applicationName} would like to access your photos",
-  "mobile.join_channel.error": "We couldn't join the channel {displayName}. Please check your connection and try again.",
-  "mobile.link.error.text": "Unable to open the link.",
-  "mobile.link.error.title": "Error",
-  "mobile.loading_channels": "Loading Channels...",
-  "mobile.loading_members": "Loading Members...",
-  "mobile.loading_options": "Loading Options...",
-  "mobile.loading_posts": "Loading messages...",
+  "mobile.launchError.notification": "Did not find a server for this notification",
   "mobile.login_options.choose_title": "Choose your login method",
-  "mobile.long_post_title": "{channelName} - Post",
-  "mobile.mailTo.error.text": "Unable to open an email client.",
-  "mobile.mailTo.error.title": "Error",
   "mobile.managed.blocked_by": "Blocked by {vendor}",
   "mobile.managed.exit": "Exit",
   "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
@@ -308,343 +39,37 @@
   "mobile.managed.not_secured.ios.touchId": "This device must be secured with a passcode to use Mattermost.\n\nGo to Settings > Touch ID & Passcode.",
   "mobile.managed.secured_by": "Secured by {vendor}",
   "mobile.managed.settings": "Go to settings",
-  "mobile.markdown.code.copy_code": "Copy Code",
-  "mobile.markdown.code.plusMoreLines": "+{count, number} more {count, plural, one {line} other {lines}}",
-  "mobile.markdown.image.too_large": "Image exceeds max dimensions of {maxWidth} by {maxHeight}:",
-  "mobile.markdown.link.copy_url": "Copy URL",
-  "mobile.mention.copy_mention": "Copy Mention",
-  "mobile.message_length.message": "Your current message is too long. Current character count: {count}/{max}",
-  "mobile.message_length.message_split_left": "Message exceeds the character limit",
-  "mobile.message_length.title": "Message Length",
-  "mobile.more_dms.add_more": "You can add {remaining, number} more users",
-  "mobile.more_dms.cannot_add_more": "You cannot add more users",
-  "mobile.more_dms.one_more": "You can add 1 more user",
-  "mobile.more_dms.start": "Start",
-  "mobile.more_dms.title": "New Conversation",
-  "mobile.more_dms.you": "@{username} - you",
-  "mobile.more_messages_button.text": "{count} {isInitialMessage, select, true {new} other {more new}} {count, plural, one {message} other {messages}}",
-  "mobile.notice_mobile_link": "mobile apps",
-  "mobile.notice_platform_link": "server",
-  "mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
-  "mobile.notification_settings_mentions.keywords": "Keywords",
-  "mobile.notification_settings_mentions.keywordsDescription": "Other words that trigger a mention",
-  "mobile.notification_settings_mentions.keywordsHelp": "Keywords are non-case sensitive and should be separated by a comma.",
-  "mobile.notification_settings_mentions.wordsTrigger": "WORDS THAT TRIGGER MENTIONS",
-  "mobile.notification_settings_mobile.default_sound": "Default ({sound})",
-  "mobile.notification_settings_mobile.light": "Light",
-  "mobile.notification_settings_mobile.no_sound": "None",
-  "mobile.notification_settings_mobile.push_activity": "SEND NOTIFICATIONS",
-  "mobile.notification_settings_mobile.push_activity_android": "Send notifications",
-  "mobile.notification_settings_mobile.push_status": "TRIGGER PUSH NOTIFICATIONS WHEN",
-  "mobile.notification_settings_mobile.push_status_android": "Trigger push notifications when",
-  "mobile.notification_settings_mobile.sound": "Sound",
-  "mobile.notification_settings_mobile.sounds_title": "Notification sound",
-  "mobile.notification_settings_mobile.test": "Send me a test notification",
-  "mobile.notification_settings_mobile.test_push": "This is a test push notification",
-  "mobile.notification_settings_mobile.vibrate": "Vibrate",
-  "mobile.notification_settings.auto_responder_short": "Automatic Replies",
-  "mobile.notification_settings.auto_responder.default_message": "Hello, I am out of office and unable to respond to messages.",
-  "mobile.notification_settings.auto_responder.enabled": "Enabled",
-  "mobile.notification_settings.auto_responder.footer_message": "Set a custom message that will be automatically sent in response to Direct Messages. Mentions in Public and Private Channels will not trigger the automated reply. Enabling Automatic Replies sets your status to Out of Office and disables email and push notifications.",
-  "mobile.notification_settings.auto_responder.message_placeholder": "Message",
-  "mobile.notification_settings.auto_responder.message_title": "CUSTOM MESSAGE",
-  "mobile.notification_settings.email": "Email",
-  "mobile.notification_settings.email_title": "Email Notifications",
-  "mobile.notification_settings.email.send": "SEND EMAIL NOTIFICATIONS",
-  "mobile.notification_settings.mentions_replies": "Mentions and Replies",
-  "mobile.notification_settings.mentions.channelWide": "Channel-wide mentions",
-  "mobile.notification_settings.mentions.reply_title": "Send Reply notifications for",
-  "mobile.notification_settings.mentions.sensitiveName": "Your case sensitive first name",
-  "mobile.notification_settings.mentions.sensitiveUsername": "Your non-case sensitive username",
-  "mobile.notification_settings.mobile": "Mobile",
-  "mobile.notification_settings.mobile_title": "Mobile Notifications",
-  "mobile.notification_settings.modal_cancel": "CANCEL",
-  "mobile.notification_settings.modal_save": "SAVE",
-  "mobile.notification_settings.ooo_auto_responder": "Automatic Direct Message Replies",
-  "mobile.notification_settings.save_failed_description": "The notification settings failed to save due to a connection issue, please try again.",
-  "mobile.notification_settings.save_failed_title": "Connection issue",
-  "mobile.offlineIndicator.connected": "Connected",
-  "mobile.offlineIndicator.connecting": "Connecting...",
-  "mobile.offlineIndicator.offline": "No internet connection",
-  "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
-  "mobile.open_gm.error": "We couldn't open a group message with those users. Please check your connection and try again.",
-  "mobile.open_unknown_channel.error": "Unable to join the channel. Please reset the cache and try again.",
-  "mobile.permission_denied_dismiss": "Don't Allow",
-  "mobile.permission_denied_retry": "Settings",
-  "mobile.pinned_posts.empty_description": "Pin important messages which are visible to the whole channel. Long press on a message and choose Pin to Channel to save it here.",
-  "mobile.pinned_posts.empty_title": "No Pinned messages yet",
-  "mobile.post_info.add_reaction": "Add Reaction",
-  "mobile.post_info.copy_text": "Copy Text",
-  "mobile.post_info.flag": "Save",
-  "mobile.post_info.mark_unread": "Mark as Unread",
-  "mobile.post_info.pin": "Pin to Channel",
-  "mobile.post_info.reply": "Reply",
-  "mobile.post_info.unflag": "Unsave",
-  "mobile.post_info.unpin": "Unpin from Channel",
-  "mobile.post_pre_header.flagged": "Saved",
-  "mobile.post_pre_header.pinned": "Pinned",
-  "mobile.post_pre_header.pinned_flagged": "Pinned and Saved",
-  "mobile.post_textbox.entire_channel.cancel": "Cancel",
-  "mobile.post_textbox.entire_channel.confirm": "Confirm",
-  "mobile.post_textbox.entire_channel.message": "By using @all or @channel you are about to send notifications to {totalMembers, number} {totalMembers, plural, one {person} other {people}}. Are you sure you want to do this?",
-  "mobile.post_textbox.entire_channel.message.with_timezones": "By using @all or @channel you are about to send notifications to {totalMembers, number} {totalMembers, plural, one {person} other {people}} in {timezones, number} {timezones, plural, one {timezone} other {timezones}}. Are you sure you want to do this?",
-  "mobile.post_textbox.entire_channel.title": "Confirm sending notifications to entire channel",
-  "mobile.post_textbox.groups.title": "Confirm sending notifications to groups",
-  "mobile.post_textbox.multi_group.message.with_timezones": "By using {mentions} and {finalMention} you are about to send notifications to at least {totalMembers} people in {timezones, number} {timezones, plural, one {timezone} other {timezones}}. Are you sure you want to do this?",
-  "mobile.post_textbox.multi_group.message.without_timezones": "By using {mentions} and {finalMention} you are about to send notifications to at least {totalMembers} people. Are you sure you want to do this?",
-  "mobile.post_textbox.one_group.message.with_timezones": "By using {mention} you are about to send notifications to {totalMembers} people in {timezones, number} {timezones, plural, one {timezone} other {timezones}}. Are you sure you want to do this?",
-  "mobile.post_textbox.one_group.message.without_timezones": "By using {mention} you are about to send notifications to {totalMembers} people. Are you sure you want to do this?",
-  "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server. Are you sure you want to post the message?",
-  "mobile.post_textbox.uploadFailedTitle": "Attachment failure",
-  "mobile.post.cancel": "Cancel",
-  "mobile.post.delete_question": "Are you sure you want to delete this post?",
-  "mobile.post.delete_title": "Delete Post",
-  "mobile.post.failed_delete": "Delete Message",
-  "mobile.post.failed_retry": "Try Again",
-  "mobile.post.failed_title": "Unable to send your message",
-  "mobile.post.retry": "Refresh",
-  "mobile.posts_view.moreMsg": "More New Messages Above",
-  "mobile.prepare_file.failed_description": "An error occurred while preparing the file. Please try again.\n",
-  "mobile.prepare_file.failed_title": "Preparing failed",
-  "mobile.prepare_file.text": "Preparing",
-  "mobile.privacy_link": "Privacy Policy",
-  "mobile.public_link.copied": "Public link copied",
+  "mobile.oauth.failed_to_login": "Your login attempt failed. Please try again.",
+  "mobile.oauth.failed_to_open_link": "The link failed to open. Please try again.",
+  "mobile.oauth.failed_to_open_link_no_browser": "The link failed to open. Please verify if a browser is installed in the current space.",
+  "mobile.oauth.restart_login": "Restart login",
+  "mobile.oauth.something_wrong": "Something went wrong",
+  "mobile.oauth.something_wrong.okButon": "Ok",
+  "mobile.oauth.switch_to_browser": "Please use your browser to complete the login",
+  "mobile.oauth.try_again": "Try again",
   "mobile.push_notification_reply.button": "Send",
   "mobile.push_notification_reply.placeholder": "Write a reply...",
   "mobile.push_notification_reply.title": "Reply",
-  "mobile.reaction_header.all_emojis": "All",
-  "mobile.recent_mentions.empty_description": "Messages where someone mentions you or includes your trigger words are saved here.",
-  "mobile.recent_mentions.empty_title": "No Mentions yet",
-  "mobile.rename_channel.display_name_maxLength": "Channel name must be less than {maxLength, number} characters",
-  "mobile.rename_channel.display_name_minLength": "Channel name must be {minLength, number} or more characters",
-  "mobile.rename_channel.display_name_required": "Channel name is required",
-  "mobile.rename_channel.name_lowercase": "URL be lowercase alphanumeric characters",
-  "mobile.rename_channel.name_maxLength": "URL must be less than {maxLength, number} characters",
-  "mobile.rename_channel.name_minLength": "URL must be {minLength, number} or more characters",
-  "mobile.rename_channel.name_required": "URL is required",
   "mobile.request.invalid_response": "Received invalid response from the server.",
-  "mobile.reset_status.alert_cancel": "Cancel",
-  "mobile.reset_status.alert_ok": "Ok",
-  "mobile.reset_status.title_ooo": "Disable \"Out Of Office\"?",
-  "mobile.retry_message": "Refreshing messages failed. Pull up to try again.",
-  "mobile.routes.channel_members.action": "Remove Members",
-  "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
-  "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
-  "mobile.routes.channelInfo": "Info",
-  "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
-  "mobile.routes.channelInfo.delete_channel": "Archive Channel",
-  "mobile.routes.channelInfo.favorite": "Favorite",
-  "mobile.routes.channelInfo.groupManaged": "Members are managed by linked groups",
-  "mobile.routes.channelInfo.unarchive_channel": "Unarchive Channel",
-  "mobile.routes.code": "{language} Code",
-  "mobile.routes.code.noLanguage": "Code",
-  "mobile.routes.edit_profile": "Edit Profile",
   "mobile.routes.login": "Login",
   "mobile.routes.loginOptions": "Login Chooser",
   "mobile.routes.mfa": "Multi-factor Authentication",
-  "mobile.routes.selectChannel": "Select Channel",
-  "mobile.routes.selectTeam": "Select Team",
-  "mobile.routes.settings": "Settings",
   "mobile.routes.sso": "Single Sign-On",
-  "mobile.routes.table": "Table",
-  "mobile.routes.thread": "{channelName} Thread",
-  "mobile.routes.thread_dm": "Direct Message Thread",
-  "mobile.routes.user_profile": "Profile",
-  "mobile.routes.user_profile.edit": "Edit",
-  "mobile.routes.user_profile.local_time": "LOCAL TIME",
-  "mobile.routes.user_profile.send_message": "Send Message",
-  "mobile.search.after_modifier_description": "to find posts after a specific date",
-  "mobile.search.before_modifier_description": "to find posts before a specific date",
-  "mobile.search.from_modifier_description": "to find posts from specific users",
-  "mobile.search.from_modifier_title": "username",
-  "mobile.search.in_modifier_description": "to find posts in specific channels",
-  "mobile.search.in_modifier_title": "channel-name",
-  "mobile.search.jump": "Jump to recent messages",
-  "mobile.search.no_results": "No Results Found",
-  "mobile.search.on_modifier_description": "to find posts on a specific date",
-  "mobile.search.recent_title": "Recent Searches",
-  "mobile.select_team.guest_cant_join_team": "Your guest account has no teams or channels assigned. Please contact an administrator.",
-  "mobile.select_team.join_open": "Open teams you can join",
-  "mobile.select_team.no_teams": "There are no available teams for you to join.",
-  "mobile.server_link.error.text": "The link could not be found on this server.",
-  "mobile.server_link.error.title": "Link Error",
-  "mobile.server_link.unreachable_channel.error": "This link belongs to a deleted channel or to a channel to which you do not have access.",
-  "mobile.server_link.unreachable_team.error": "This link belongs to a deleted team or to a team to which you do not have access.",
-  "mobile.server_ssl.error.text": "The certificate from {host} is not trusted.\n\nPlease contact your System Administrator to resolve the certificate issues and allow connections to this server.",
-  "mobile.server_ssl.error.title": "Untrusted Certificate",
-  "mobile.server_upgrade.alert_description": "This server version is unsupported and users will be exposed to compatibility issues that cause crashes or severe bugs breaking core functionality of the app. Upgrading to server version {serverVersion} or later is required.",
   "mobile.server_upgrade.button": "OK",
   "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
-  "mobile.server_upgrade.dismiss": "Dismiss",
-  "mobile.server_upgrade.learn_more": "Learn More",
   "mobile.server_upgrade.title": "Server upgrade required",
+  "mobile.server_url.deeplink.emm.denied": "This app is controlled by an EMM and the DeepLink server url does not match the EMM allowed server",
   "mobile.server_url.empty": "Please enter a valid server URL",
   "mobile.server_url.invalid_format": "URL must start with http:// or https://",
   "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications. Sessions for {siteName} are configured to expire every {daysCount, number} {daysCount, plural, one {day} other {days}}.",
-  "mobile.set_status.away": "Away",
-  "mobile.set_status.dnd": "Do Not Disturb",
-  "mobile.set_status.offline": "Offline",
-  "mobile.set_status.online": "Online",
-  "mobile.settings.modal.check_for_upgrade": "Check for Updates",
-  "mobile.share_extension.channel": "Channel",
-  "mobile.share_extension.error_close": "Close",
-  "mobile.share_extension.error_message": "An error has occurred while using the share extension.",
-  "mobile.share_extension.error_title": "Extension Error",
-  "mobile.share_extension.team": "Team",
-  "mobile.share_extension.too_long_message": "Character count: {count}/{max}",
-  "mobile.share_extension.too_long_title": "Message is too long",
-  "mobile.sidebar_settings.permanent": "Permanent Sidebar",
-  "mobile.sidebar_settings.permanent_description": "Keep the sidebar open permanently",
-  "mobile.storage_permission_denied_description": "Upload files to your Mattermost instance. Open Settings to grant Mattermost Read and Write access to files on this device.",
-  "mobile.storage_permission_denied_title": "{applicationName} would like to access your files",
-  "mobile.suggestion.members": "Members",
-  "mobile.system_message.channel_archived_message": "{username} archived the channel",
-  "mobile.system_message.channel_unarchived_message": "{username} unarchived the channel",
-  "mobile.system_message.update_channel_displayname_message_and_forget.updated_from": "{username} updated the channel display name from: {oldDisplayName} to: {newDisplayName}",
-  "mobile.system_message.update_channel_header_message_and_forget.removed": "{username} removed the channel header (was: {oldHeader})",
-  "mobile.system_message.update_channel_header_message_and_forget.updated_from": "{username} updated the channel header from: {oldHeader} to: {newHeader}",
-  "mobile.system_message.update_channel_header_message_and_forget.updated_to": "{username} updated the channel header to: {newHeader}",
-  "mobile.system_message.update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {oldPurpose})",
-  "mobile.system_message.update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {oldPurpose} to: {newPurpose}",
-  "mobile.system_message.update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {newPurpose}",
-  "mobile.terms_of_service.alert_cancel": "Cancel",
-  "mobile.terms_of_service.alert_ok": "OK",
-  "mobile.terms_of_service.alert_retry": "Try Again",
-  "mobile.terms_of_service.terms_rejected": "You must agree to the terms of service before accessing {siteName}. Please contact your System Administrator for more details.",
-  "mobile.timezone_settings.automatically": "Set automatically",
-  "mobile.timezone_settings.manual": "Change timezone",
-  "mobile.timezone_settings.select": "Select Timezone",
-  "mobile.tos_link": "Terms of Service",
-  "mobile.unsupported_server.message": "Attachments, link previews, reactions and embed data may not be displayed correctly. If this issue persists contact your System Administrator to upgrade your Mattermost server.",
-  "mobile.unsupported_server.ok": "OK",
-  "mobile.unsupported_server.title": "Unsupported server version",
-  "mobile.user_list.deactivated": "Deactivated",
-  "mobile.user_removed.message": "You were removed from the channel.",
-  "mobile.user_removed.title": "Removed from {channelName}",
-  "mobile.user.settings.notifications.email.fifteenMinutes": "Every 15 minutes",
-  "mobile.video_playback.failed_description": "An error occurred while trying to play the video.\n",
-  "mobile.video_playback.failed_title": "Video playback failed",
-  "mobile.youtube_playback_error.description": "An error occurred while trying to play the YouTube video.\nDetails: {details}",
-  "mobile.youtube_playback_error.title": "YouTube playback error",
-  "modal.manual_status.auto_responder.message_": "Would you like to switch your status to \"{status}\" and disable Automatic Replies?",
-  "modal.manual_status.auto_responder.message_away": "Would you like to switch your status to \"Away\" and disable Automatic Replies?",
-  "modal.manual_status.auto_responder.message_dnd": "Would you like to switch your status to \"Do Not Disturb\" and disable Automatic Replies?",
-  "modal.manual_status.auto_responder.message_offline": "Would you like to switch your status to \"Offline\" and disable Automatic Replies?",
-  "modal.manual_status.auto_responder.message_online": "Would you like to switch your status to \"Online\" and disable Automatic Replies?",
-  "more_channels.archivedChannels": "Archived Channels",
-  "more_channels.dropdownTitle": "Show",
-  "more_channels.noMore": "No more channels to join",
-  "more_channels.publicChannels": "Public Channels",
-  "more_channels.showArchivedChannels": "Show: Archived Channels",
-  "more_channels.showPublicChannels": "Show: Public Channels",
-  "more_channels.title": "More Channels",
-  "msg_typing.areTyping": "{users} and {last} are typing...",
-  "msg_typing.isTyping": "{user} is typing...",
-  "navbar.channel_drawer.button": "Channels and teams",
-  "navbar.channel_drawer.hint": "Opens the channels and teams drawer",
-  "navbar.leave": "Leave Channel",
-  "navbar.more_options.button": "More Options",
-  "navbar.more_options.hint": "Opens the more options right hand sidebar",
-  "navbar.search.button": "Channel Search",
-  "navbar.search.hint": "Opens the channel search modal",
   "password_form.title": "Password Reset",
   "password_send.checkInbox": "Please check your inbox.",
   "password_send.description": "To reset your password, enter the email address you used to sign up",
   "password_send.error": "Please enter a valid email address.",
   "password_send.link": "If the account exists, a password reset email will be sent to:",
   "password_send.reset": "Reset my password",
-  "permalink.error.access": "Permalink belongs to a deleted message or to a channel to which you do not have access.",
-  "permalink.error.link_not_found": "Link Not Found",
-  "post_body.check_for_out_of_channel_groups_mentions.message": "did not get notified by this mention because they are not in the channel. They are also not a member of the groups linked to this channel.",
-  "post_body.check_for_out_of_channel_mentions.link.and": " and ",
-  "post_body.check_for_out_of_channel_mentions.link.private": "add them to this private channel",
-  "post_body.check_for_out_of_channel_mentions.link.public": "add them to the channel",
-  "post_body.check_for_out_of_channel_mentions.message_last": "? They will have access to all message history.",
-  "post_body.check_for_out_of_channel_mentions.message.multiple": "were mentioned but they are not in the channel. Would you like to ",
-  "post_body.check_for_out_of_channel_mentions.message.one": "was mentioned but is not in the channel. Would you like to ",
-  "post_body.commentedOn": "Commented on {name}{apostrophe} message: ",
-  "post_body.deleted": "(message deleted)",
-  "post_info.auto_responder": "AUTOMATIC REPLY",
-  "post_info.bot": "BOT",
-  "post_info.del": "Delete",
-  "post_info.edit": "Edit",
-  "post_info.guest": "GUEST",
-  "post_info.message.show_less": "Show less",
-  "post_info.message.show_more": "Show more",
-  "post_info.system": "System",
-  "post_message_view.edited": "(edited)",
-  "posts_view.newMsg": "New Messages",
-  "rhs_thread.rootPostDeletedMessage.body": "Part of this thread has been deleted due to a data retention policy. You can no longer reply to this thread.",
-  "search_bar.search": "Search",
-  "search_header.results": "Search Results",
-  "search_header.title2": "Recent Mentions",
-  "search_header.title3": "Saved Messages",
-  "search_item.channelArchived": "Archived",
-  "sidebar_right_menu.logout": "Logout",
-  "sidebar_right_menu.report": "Report a Problem",
-  "sidebar.channels": "PUBLIC CHANNELS",
-  "sidebar.direct": "DIRECT MESSAGES",
-  "sidebar.favorite": "FAVORITE CHANNELS",
-  "sidebar.pg": "PRIVATE CHANNELS",
-  "sidebar.types.recent": "RECENT ACTIVITY",
-  "sidebar.unreads": "More unreads",
   "signup.email": "Email and Password",
+  "signup.google": "Google Apps",
   "signup.office365": "Office 365",
-  "status_dropdown.set_away": "Away",
-  "status_dropdown.set_dnd": "Do Not Disturb",
-  "status_dropdown.set_offline": "Offline",
-  "status_dropdown.set_online": "Online",
-  "status_dropdown.set_ooo": "Out of Office",
-  "suggestion.mention.all": "Notifies everyone in this channel",
-  "suggestion.mention.channel": "Notifies everyone in this channel",
-  "suggestion.mention.channels": "My Channels",
-  "suggestion.mention.groups": "Group Mentions",
-  "suggestion.mention.here": "Notifies everyone online in this channel",
-  "suggestion.mention.members": "Channel Members",
-  "suggestion.mention.morechannels": "Other Channels",
-  "suggestion.mention.nonmembers": "Not in Channel",
-  "suggestion.mention.special": "Special Mentions",
-  "suggestion.mention.you": "(you)",
-  "suggestion.search.direct": "Direct Messages",
-  "suggestion.search.private": "Private Channels",
-  "suggestion.search.public": "Public Channels",
-  "terms_of_service.agreeButton": "I Agree",
-  "terms_of_service.api_error": "Unable to complete the request. If this issue persists, contact your System Administrator.",
-  "user.settings.display.clockDisplay": "Clock Display",
-  "user.settings.display.custom_theme": "Custom Theme",
-  "user.settings.display.militaryClock": "24-hour clock (example: 16:00)",
-  "user.settings.display.normalClock": "12-hour clock (example: 4:00 PM)",
-  "user.settings.display.preferTime": "Select how you prefer time displayed.",
-  "user.settings.general.email": "Email",
-  "user.settings.general.emailCantUpdate": "Email must be updated using a web client or desktop application.",
-  "user.settings.general.emailGitlabCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.emailGoogleCantUpdate": "Login occurs through Google. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.emailHelp2": "Email has been disabled by your System Administrator. No notification emails will be sent until it is enabled.",
-  "user.settings.general.emailLdapCantUpdate": "Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.emailOffice365CantUpdate": "Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.emailSamlCantUpdate": "Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.field_handled_externally": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
-  "user.settings.general.firstName": "First Name",
-  "user.settings.general.lastName": "Last Name",
-  "user.settings.general.nickname": "Nickname",
-  "user.settings.general.position": "Position",
-  "user.settings.general.username": "Username",
-  "user.settings.modal.display": "Display",
-  "user.settings.modal.notifications": "Notifications",
-  "user.settings.notifications.allActivity": "For all activity",
-  "user.settings.notifications.comments": "Reply notifications",
-  "user.settings.notifications.email.disabled": "Email notifications are not enabled",
-  "user.settings.notifications.email.everyHour": "Every hour",
-  "user.settings.notifications.email.immediately": "Immediately",
-  "user.settings.notifications.email.never": "Never",
-  "user.settings.notifications.email.send": "Send email notifications",
-  "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.",
-  "user.settings.notifications.never": "Never",
-  "user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
-  "user.settings.push_notification.away": "Away or offline",
-  "user.settings.push_notification.disabled": "Push notifications are not enabled",
-  "user.settings.push_notification.disabled_long": "Push notifications have not been enabled by your System Administrator.",
-  "user.settings.push_notification.offline": "Offline",
-  "user.settings.push_notification.online": "Online, away or offline",
   "web.root.signup_info": "All team communication in one place, searchable and accessible anywhere"
 }
diff --git a/assets/base/images/google.png b/assets/base/images/google.png
new file mode 100644
index 000000000..927188432
Binary files /dev/null and b/assets/base/images/google.png differ
diff --git a/assets/base/images/logo.png b/assets/base/images/logo.png
new file mode 100755
index 000000000..2ed25e06d
Binary files /dev/null and b/assets/base/images/logo.png differ
diff --git a/babel.config.js b/babel.config.js
index 4b21c99fa..04b737a5b 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -19,19 +19,22 @@ module.exports = {
         ['module-resolver', {
             root: ['.'],
             alias: {
-                '@actions': './app/actions',
+                '@app': './app/',
                 '@assets': './dist/assets',
+                '@client': './app/client',
                 '@components': './app/components',
                 '@constants': './app/constants',
                 '@database': './app/database',
                 '@i18n': './app/i18n',
                 '@init': './app/init',
                 '@notifications': './app/notifications',
+                '@queries': './app/queries',
+                '@requests': './app/requests',
                 '@screens': './app/screens',
-                '@selectors': './app/selectors',
                 '@share': './share_extension',
                 '@store': './app/store',
                 '@telemetry': './app/telemetry',
+                '@test': './test',
                 '@typings': './types',
                 '@utils': './app/utils',
                 '@websocket': './app/client/websocket',
diff --git a/index.ts b/index.ts
index bed214276..c27789398 100644
--- a/index.ts
+++ b/index.ts
@@ -1,11 +1,20 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {Platform} from 'react-native';
+import {DeviceEventEmitter, Platform} from 'react-native';
 import 'react-native-gesture-handler';
+import {ComponentDidAppearEvent, ComponentDidDisappearEvent, Navigation} from 'react-native-navigation';
 
+import {Navigation as NavigationConstants, Screens} from './app/constants';
+import GlobalEventHandler from './app/init/global_event_handler';
+import './app/init/fetch';
+import {initialLaunch} from './app/init/launch';
+import ManagedApp from './app/init/managed_app';
+import {registerScreens} from './app/screens/index';
+import EphemeralStore from './app/store/ephemeral_store';
 import setFontFamily from './app/utils/font_family';
-import './app/mattermost';
+
+declare const global: { HermesInternal: null | {} };
 
 if (__DEV__) {
     const LogBox = require('react-native/Libraries/LogBox/LogBox');
@@ -17,37 +26,55 @@ if (__DEV__) {
 
 setFontFamily();
 
+if (global.HermesInternal) {
+    // Polyfills required to use Intl with Hermes engine
+    require('@formatjs/intl-getcanonicallocales/polyfill');
+    require('@formatjs/intl-locale/polyfill');
+    require('@formatjs/intl-pluralrules/polyfill');
+    require('@formatjs/intl-numberformat/polyfill');
+    require('@formatjs/intl-datetimeformat/polyfill');
+    require('@formatjs/intl-datetimeformat/add-golden-tz');
+}
+
 if (Platform.OS === 'android') {
     const ShareExtension = require('share_extension/index.tsx').default;
     const AppRegistry = require('react-native/Libraries/ReactNative/AppRegistry');
     AppRegistry.registerComponent('MattermostShare', () => ShareExtension);
 }
 
-// Uncomment the snippet below if you want to update the modules
-// defined in packager/modulePaths.js so they are included in the main bundle.
+Navigation.events().registerAppLaunchedListener(() => {
+    GlobalEventHandler.init();
+    ManagedApp.init();
+    registerNavigationListeners();
+    registerScreens();
+    initialLaunch();
+});
 
-/*
-//!* eslint-disable no-console *!/
-if (__DEV__) {
-    const modules = require.getModules();
-    const moduleIds = Object.keys(modules);
-    const loadedModuleNames = moduleIds.
-        filter((moduleId) => modules[moduleId].isInitialized).
-        map((moduleId) => modules[moduleId].verboseName);
+const registerNavigationListeners = () => {
+    Navigation.events().registerComponentDidAppearListener(componentDidAppearListener);
+    Navigation.events().registerComponentDidDisappearListener(componentDidDisappearListener);
+};
 
-    const waitingModuleNames = moduleIds.
-        filter((moduleId) => !modules[moduleId].isInitialized).
-        map((moduleId) => modules[moduleId].verboseName);
+function componentDidAppearListener({componentId}: ComponentDidAppearEvent) {
+    EphemeralStore.addNavigationComponentId(componentId);
 
-    // make sure that the modules you expect to be waiting are actually waiting
-    console.log(
-        'loaded:',
-        loadedModuleNames.length,
-        'waiting:',
-        waitingModuleNames.length,
-    );
-
-    // grab this text blob, and put it in a file named packager/moduleNames.js
-    console.log(`module.exports = ${JSON.stringify(loadedModuleNames.sort())};`);
+    switch (componentId) {
+        case 'MainSidebar':
+            DeviceEventEmitter.emit(NavigationConstants.MAIN_SIDEBAR_DID_OPEN, this.handleSidebarDidOpen);
+            DeviceEventEmitter.emit(NavigationConstants.BLUR_POST_DRAFT);
+            break;
+        case 'SettingsSidebar':
+            DeviceEventEmitter.emit(NavigationConstants.BLUR_POST_DRAFT);
+            break;
+    }
+}
+
+function componentDidDisappearListener({componentId}: ComponentDidDisappearEvent) {
+    if (componentId !== Screens.CHANNEL) {
+        EphemeralStore.removeNavigationComponentId(componentId);
+    }
+
+    if (componentId === 'MainSidebar') {
+        DeviceEventEmitter.emit(NavigationConstants.MAIN_SIDEBAR_DID_CLOSE);
+    }
 }
-*/
diff --git a/ios/DatabaseHelper/DatabaseHelper.xcodeproj/project.pbxproj b/ios/DatabaseHelper/DatabaseHelper.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..92d4f61e1
--- /dev/null
+++ b/ios/DatabaseHelper/DatabaseHelper.xcodeproj/project.pbxproj
@@ -0,0 +1,320 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		49415257267955890039D64E /* DatabaseHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49415256267955890039D64E /* DatabaseHelper.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		49415251267955890039D64E /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		49415253267955890039D64E /* libDatabaseHelper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDatabaseHelper.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		49415256267955890039D64E /* DatabaseHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseHelper.swift; sourceTree = "<group>"; };
+		4941526826795A600039D64E /* DatabaseHelper-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DatabaseHelper-Bridging-Header.h"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		49415250267955890039D64E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		4941524A267955890039D64E = {
+			isa = PBXGroup;
+			children = (
+				49415255267955890039D64E /* DatabaseHelper */,
+				49415254267955890039D64E /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		49415254267955890039D64E /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				49415253267955890039D64E /* libDatabaseHelper.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		49415255267955890039D64E /* DatabaseHelper */ = {
+			isa = PBXGroup;
+			children = (
+				49415256267955890039D64E /* DatabaseHelper.swift */,
+				4941526826795A600039D64E /* DatabaseHelper-Bridging-Header.h */,
+			);
+			path = DatabaseHelper;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		49415252267955890039D64E /* DatabaseHelper */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4941525A267955890039D64E /* Build configuration list for PBXNativeTarget "DatabaseHelper" */;
+			buildPhases = (
+				4941524F267955890039D64E /* Sources */,
+				49415250267955890039D64E /* Frameworks */,
+				49415251267955890039D64E /* CopyFiles */,
+				4941527A26795C470039D64E /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DatabaseHelper;
+			productName = DatabaseHelper;
+			productReference = 49415253267955890039D64E /* libDatabaseHelper.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		4941524B267955890039D64E /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1250;
+				LastUpgradeCheck = 1250;
+				TargetAttributes = {
+					49415252267955890039D64E = {
+						CreatedOnToolsVersion = 12.5;
+					};
+				};
+			};
+			buildConfigurationList = 4941524E267955890039D64E /* Build configuration list for PBXProject "DatabaseHelper" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 4941524A267955890039D64E;
+			productRefGroup = 49415254267955890039D64E /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				49415252267955890039D64E /* DatabaseHelper */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		4941527A26795C470039D64E /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\ntarget_dir=${BUILT_PRODUCTS_DIR}/include/${PRODUCT_MODULE_NAME}/\n\n# Ensure the target include path exists\nmkdir -p ${target_dir}\n\n# Copy any file that looks like a Swift generated header to the include path\ncp ${DERIVED_SOURCES_DIR}/*-Swift.h ${target_dir}\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		4941524F267955890039D64E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				49415257267955890039D64E /* DatabaseHelper.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		49415258267955890039D64E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		49415259267955890039D64E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		4941525B267955890039D64E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				MODULEMAP_FILE = "$(SRCROOT)/DatabaseHelper/module.modulemap";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "DatabaseHelper/DatabaseHelper-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		4941525C267955890039D64E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				MODULEMAP_FILE = "$(SRCROOT)/DatabaseHelper/module.modulemap";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "DatabaseHelper/DatabaseHelper-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		4941524E267955890039D64E /* Build configuration list for PBXProject "DatabaseHelper" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				49415258267955890039D64E /* Debug */,
+				49415259267955890039D64E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4941525A267955890039D64E /* Build configuration list for PBXNativeTarget "DatabaseHelper" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4941525B267955890039D64E /* Debug */,
+				4941525C267955890039D64E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 4941524B267955890039D64E /* Project object */;
+}
diff --git a/ios/DatabaseHelper/DatabaseHelper.xcodeproj/xcshareddata/xcschemes/DatabaseHelper.xcscheme b/ios/DatabaseHelper/DatabaseHelper.xcodeproj/xcshareddata/xcschemes/DatabaseHelper.xcscheme
new file mode 100644
index 000000000..1536083ef
--- /dev/null
+++ b/ios/DatabaseHelper/DatabaseHelper.xcodeproj/xcshareddata/xcschemes/DatabaseHelper.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1250"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "49415252267955890039D64E"
+               BuildableName = "libDatabaseHelper.a"
+               BlueprintName = "DatabaseHelper"
+               ReferencedContainer = "container:DatabaseHelper.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "49415252267955890039D64E"
+            BuildableName = "libDatabaseHelper.a"
+            BlueprintName = "DatabaseHelper"
+            ReferencedContainer = "container:DatabaseHelper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ios/DatabaseHelper/DatabaseHelper/DatabaseHelper-Bridging-Header.h b/ios/DatabaseHelper/DatabaseHelper/DatabaseHelper-Bridging-Header.h
new file mode 100644
index 000000000..12507aba4
--- /dev/null
+++ b/ios/DatabaseHelper/DatabaseHelper/DatabaseHelper-Bridging-Header.h
@@ -0,0 +1,12 @@
+//
+//  DatabaseHelper-Bridging-Header.h
+//  DatabaseHelper
+//
+//  Created by Miguel Alatzar on 6/15/21.
+//
+
+#ifndef DatabaseHelper_Bridging_Header_h
+#define DatabaseHelper_Bridging_Header_h
+
+
+#endif /* DatabaseHelper_Bridging_Header_h */
diff --git a/ios/DatabaseHelper/DatabaseHelper/DatabaseHelper.swift b/ios/DatabaseHelper/DatabaseHelper/DatabaseHelper.swift
new file mode 100644
index 000000000..fa8f158e8
--- /dev/null
+++ b/ios/DatabaseHelper/DatabaseHelper/DatabaseHelper.swift
@@ -0,0 +1,82 @@
+//
+//  DatabaseHelper.swift
+//  DatabaseHelper
+//
+//  Created by Miguel Alatzar on 6/14/21.
+//
+
+import Foundation
+import SQLite3
+
+// TODO: This should be exposed to Objective-C in order to handle
+// any DatabaseHelper throwable methods.
+enum DatabaseError: Error {
+    case OpenFailure(_ dbPath: String)
+    case MultipleServers
+    case NoResults(_ query: String)
+}
+
+extension DatabaseError: LocalizedError {
+    var errorDescription: String? {
+        switch self {
+        case .OpenFailure(dbPath: let dbPath):
+            return "Error opening database: \(dbPath)"
+        case .MultipleServers:
+            return "Cannot determine server URL as there are multiple servers"
+        case .NoResults(query: let query):
+            return "No results for query: \(query)"
+        }
+    }
+}
+
+public class DatabaseHelper: NSObject {
+    internal let DEFAULT_DB_NAME = "default.db"
+    internal var DEFAULT_DB_PATH: String
+    internal var defaultDB: OpaquePointer? = nil
+    
+    @objc public static let `default` = DatabaseHelper()
+    
+    override private init() {
+        let appGroupId = Bundle.main.object(forInfoDictionaryKey: "AppGroupIdentifier") as! String
+        let sharedDirectory = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupId)!
+        let databaseUrl = sharedDirectory.appendingPathComponent("databases/\(DEFAULT_DB_NAME)")
+        
+        DEFAULT_DB_PATH = databaseUrl.path
+    }
+    
+    @objc public func getOnlyServerUrlObjc() -> String {
+        do {
+            return try getOnlyServerUrl()
+        } catch {
+            print(error)
+            return ""
+        }
+    }
+    
+    public func getOnlyServerUrl() throws -> String {
+        if sqlite3_open(DEFAULT_DB_PATH, &defaultDB) != SQLITE_OK {
+            throw DatabaseError.OpenFailure(DEFAULT_DB_PATH)
+        }
+        
+        defer {
+            sqlite3_finalize(queryStatement)
+            sqlite3_close(defaultDB)
+        }
+                
+        var queryStatement: OpaquePointer?
+        let queryString = "SELECT url FROM servers;"
+        if sqlite3_prepare_v2(defaultDB, queryString, -1, &queryStatement, nil) == SQLITE_OK {
+            if sqlite3_step(queryStatement) == SQLITE_ROW,
+               let result = sqlite3_column_text(queryStatement, 0) {
+                return String(cString: result)
+            }
+            
+            if sqlite3_step(queryStatement) == SQLITE_ROW {
+                // Throw since we have more than one row in the `servers` table
+                throw DatabaseError.MultipleServers
+            }
+        }
+        
+        throw DatabaseError.NoResults(queryString)
+    }
+}
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index 743a0a438..01460b382 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -13,6 +13,9 @@
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		2D5296A8926B4D7FBAF2D6E2 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6561AEAC21CC40B8A72ABB93 /* OpenSans-Light.ttf */; };
+		49415295267A91230039D64E /* libDatabaseHelper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49415294267A911C0039D64E /* libDatabaseHelper.a */; };
+		49415296267A91290039D64E /* libDatabaseHelper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49415294267A911C0039D64E /* libDatabaseHelper.a */; };
+		49415297267A91300039D64E /* libDatabaseHelper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49415294267A911C0039D64E /* libDatabaseHelper.a */; };
 		4953BF602368AE8600593328 /* SwimeProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4953BF5F2368AE8600593328 /* SwimeProxy.swift */; };
 		49B4C050230C981C006E919E /* libUploadAttachments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FABE04522137F2A00D0F595 /* libUploadAttachments.a */; };
 		531BEBC72513E93C00BC05B1 /* compass-icons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */; };
@@ -48,6 +51,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		49415293267A911C0039D64E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4941528F267A911C0039D64E /* DatabaseHelper.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 49415253267955890039D64E;
+			remoteInfo = DatabaseHelper;
+		};
 		7F240A21220D3A2300637665 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -90,6 +100,27 @@
 			remoteGlobalIDString = 7FABE03522137F2900D0F595;
 			remoteInfo = UploadAttachments;
 		};
+		7FE6E441267C014600C99C18 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4941528F267A911C0039D64E /* DatabaseHelper.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 49415252267955890039D64E;
+			remoteInfo = DatabaseHelper;
+		};
+		7FE6E444267C014E00C99C18 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4941528F267A911C0039D64E /* DatabaseHelper.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 49415252267955890039D64E;
+			remoteInfo = DatabaseHelper;
+		};
+		7FE6E446267C015400C99C18 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4941528F267A911C0039D64E /* DatabaseHelper.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 49415252267955890039D64E;
+			remoteInfo = DatabaseHelper;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -137,6 +168,7 @@
 		34B20A903038487E8D7DEA1E /* Roboto-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto-Light.ttf"; sourceTree = "<group>"; };
 		3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-ExtraBold.ttf"; path = "../assets/fonts/OpenSans-ExtraBold.ttf"; sourceTree = "<group>"; };
 		41F3AFE83AAF4B74878AB78A /* OpenSans-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Italic.ttf"; path = "../assets/fonts/OpenSans-Italic.ttf"; sourceTree = "<group>"; };
+		4941528F267A911C0039D64E /* DatabaseHelper.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DatabaseHelper.xcodeproj; path = DatabaseHelper/DatabaseHelper.xcodeproj; sourceTree = "<group>"; };
 		4953BF5F2368AE8600593328 /* SwimeProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SwimeProxy.swift; path = Mattermost/SwimeProxy.swift; sourceTree = "<group>"; };
 		495BC95F23565ABF00C40C83 /* libXCDYouTubeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libXCDYouTubeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		495BC96123565ADD00C40C83 /* libYoutubePlayer-in-WKWebView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libYoutubePlayer-in-WKWebView.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -214,6 +246,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				49415295267A91230039D64E /* libDatabaseHelper.a in Frameworks */,
 				49B4C050230C981C006E919E /* libUploadAttachments.a in Frameworks */,
 				6C9B1EFD6561083917AF06CF /* libPods-Mattermost.a in Frameworks */,
 			);
@@ -223,6 +256,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				49415296267A91290039D64E /* libDatabaseHelper.a in Frameworks */,
 				7FABE0562213884700D0F595 /* libUploadAttachments.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -231,6 +265,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				49415297267A91300039D64E /* libDatabaseHelper.a in Frameworks */,
 				7F581F78221EEA7C0099E66B /* libUploadAttachments.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -328,6 +363,14 @@
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
+		49415290267A911C0039D64E /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				49415294267A911C0039D64E /* libDatabaseHelper.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		4B992D7BAAEDF8759DB525B5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -404,6 +447,7 @@
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				4941528F267A911C0039D64E /* DatabaseHelper.xcodeproj */,
 				7FABE04022137F2900D0F595 /* UploadAttachments.xcodeproj */,
 			);
 			name = Libraries;
@@ -459,6 +503,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				7FE6E442267C014600C99C18 /* PBXTargetDependency */,
 				7FAB45BA222DD0E300EBFFC8 /* PBXTargetDependency */,
 				7F240A22220D3A2300637665 /* PBXTargetDependency */,
 				7F581D38221ED5C60099E66B /* PBXTargetDependency */,
@@ -479,6 +524,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				7FE6E445267C014E00C99C18 /* PBXTargetDependency */,
 				7FAB4571222DD0DA00EBFFC8 /* PBXTargetDependency */,
 			);
 			name = MattermostShare;
@@ -497,6 +543,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				7FE6E447267C015400C99C18 /* PBXTargetDependency */,
 				7FE5F962227739E600FEFFE1 /* PBXTargetDependency */,
 			);
 			name = NotificationService;
@@ -571,6 +618,10 @@
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
 			projectDirPath = "";
 			projectReferences = (
+				{
+					ProductGroup = 49415290267A911C0039D64E /* Products */;
+					ProjectRef = 4941528F267A911C0039D64E /* DatabaseHelper.xcodeproj */;
+				},
 				{
 					ProductGroup = 7FABE04122137F2900D0F595 /* Products */;
 					ProjectRef = 7FABE04022137F2900D0F595 /* UploadAttachments.xcodeproj */;
@@ -586,6 +637,13 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		49415294267A911C0039D64E /* libDatabaseHelper.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libDatabaseHelper.a;
+			remoteRef = 49415293267A911C0039D64E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		7FABE04522137F2A00D0F595 /* libUploadAttachments.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -806,6 +864,21 @@
 			name = UploadAttachments;
 			targetProxy = 7FE5F961227739E600FEFFE1 /* PBXContainerItemProxy */;
 		};
+		7FE6E442267C014600C99C18 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = DatabaseHelper;
+			targetProxy = 7FE6E441267C014600C99C18 /* PBXContainerItemProxy */;
+		};
+		7FE6E445267C014E00C99C18 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = DatabaseHelper;
+			targetProxy = 7FE6E444267C014E00C99C18 /* PBXContainerItemProxy */;
+		};
+		7FE6E447267C015400C99C18 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = DatabaseHelper;
+			targetProxy = 7FE6E446267C015400C99C18 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -836,6 +909,7 @@
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"$(SRCROOT)/DatabaseHelper/DatabaseHelper",
 					"$(SRCROOT)/UploadAttachments/UploadAttachments",
 				);
 				INFOPLIST_FILE = Mattermost/Info.plist;
@@ -878,6 +952,7 @@
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"$(SRCROOT)/DatabaseHelper/DatabaseHelper",
 					"$(SRCROOT)/UploadAttachments/UploadAttachments",
 				);
 				INFOPLIST_FILE = Mattermost/Info.plist;
diff --git a/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/Mattermost.xcscheme b/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/Mattermost.xcscheme
index 341055bac..fae429713 100644
--- a/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/Mattermost.xcscheme
+++ b/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/Mattermost.xcscheme
@@ -14,26 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5C519960AB061400DBE7B093654CB72C"
+               BlueprintIdentifier = "7ACAA9BE580DD31A5CB9D97C45D9492D"
                BuildableName = "libReact-Core.a"
                BlueprintName = "React-Core"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7FABE03522137F2900D0F595"
-               BuildableName = "libUploadAttachments.a"
-               BlueprintName = "UploadAttachments"
-               ReferencedContainer = "container:UploadAttachments/UploadAttachments.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/MattermostShare.xcscheme b/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/MattermostShare.xcscheme
index 1c01c530e..1c8abaafb 100644
--- a/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/MattermostShare.xcscheme
+++ b/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/MattermostShare.xcscheme
@@ -7,20 +7,6 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7FABE03522137F2900D0F595"
-               BuildableName = "libUploadAttachments.a"
-               BlueprintName = "UploadAttachments"
-               ReferencedContainer = "container:UploadAttachments/UploadAttachments.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -42,8 +28,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -53,14 +37,15 @@
             ReferencedContainer = "container:Mattermost.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
+      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
@@ -81,8 +66,6 @@
             ReferencedContainer = "container:Mattermost.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme b/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme
index ec8fd1746..acef985ff 100644
--- a/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme
+++ b/ios/Mattermost.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme
@@ -4,7 +4,7 @@
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
-      parallelizeBuildables = "YES"
+      parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
@@ -21,20 +21,6 @@
                ReferencedContainer = "container:Mattermost.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-               BuildableName = "Mattermost.app"
-               BlueprintName = "Mattermost"
-               ReferencedContainer = "container:Mattermost.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -42,8 +28,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -53,32 +37,21 @@
             ReferencedContainer = "container:Mattermost.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
+      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "Mattermost.app"
-            BlueprintName = "Mattermost"
-            ReferencedContainer = "container:Mattermost.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -87,16 +60,15 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "Mattermost.app"
-            BlueprintName = "Mattermost"
+            BlueprintIdentifier = "7F581D31221ED5C60099E66B"
+            BuildableName = "NotificationService.appex"
+            BlueprintName = "NotificationService"
             ReferencedContainer = "container:Mattermost.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/ios/Mattermost/AppDelegate.m b/ios/Mattermost/AppDelegate.m
index 0a27c7cbb..f0e230390 100644
--- a/ios/Mattermost/AppDelegate.m
+++ b/ios/Mattermost/AppDelegate.m
@@ -7,9 +7,9 @@
 #import <UMCore/UMModuleRegistry.h>
 #import <UMReactNativeAdapter/UMNativeModulesProxy.h>
 #import <UMReactNativeAdapter/UMModuleRegistryAdapter.h>
-
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 #import <UploadAttachments/UploadAttachments-Swift.h>
+#import <DatabaseHelper/DatabaseHelper-Swift.h>
 #import <UserNotifications/UserNotifications.h>
 #import <RNHWKeyboardEvent.h>
 
@@ -92,14 +92,25 @@ NSString* const NOTIFICATION_UPDATE_BADGE_ACTION = @"update_badge";
   NSString* action = [userInfo objectForKey:@"type"];
   NSString* channelId = [userInfo objectForKey:@"channel_id"];
   NSString* ackId = [userInfo objectForKey:@"ack_id"];
+  
+  NSString* serverUrl = [userInfo objectForKey:@"server_url"];
+  if (serverUrl == nil) {
+    NSString* onlyServerUrl = [[DatabaseHelper default] getOnlyServerUrlObjc];
+    if ([onlyServerUrl length] > 0) {
+      serverUrl = onlyServerUrl;
+    }
+  }
+
   RuntimeUtils *utils = [[RuntimeUtils alloc] init];
 
   if ((action && [action isEqualToString: NOTIFICATION_CLEAR_ACTION]) || (state == UIApplicationStateInactive)) {
     // If received a notification that a channel was read, remove all notifications from that channel (only with app in foreground/background)
     [self cleanNotificationsFromChannel:channelId];
   }
+  
+  // TODO: Fetch channel data if action is of type message
 
-  [[UploadSession shared] notificationReceiptWithNotificationId:ackId receivedAt:round([[NSDate date] timeIntervalSince1970] * 1000.0) type:action];
+  [[UploadSession shared] notificationReceiptWithNotificationId:ackId serverUrl:serverUrl receivedAt:round([[NSDate date] timeIntervalSince1970] * 1000.0) type:action];
   [utils delayWithSeconds:0.2 closure:^(void) {
     // This is to notify the NotificationCenter that something has changed.
     completionHandler(UIBackgroundFetchResultNewData);
@@ -129,21 +140,19 @@ NSString* const NOTIFICATION_UPDATE_BADGE_ACTION = @"update_badge";
 }
 
 // Required for deeplinking
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options{
+  return [RCTLinkingManager application:application openURL:url options:options];
+}
 
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url
-  sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
-{
-  return [RCTLinkingManager application:application openURL:url
-                      sourceApplication:sourceApplication annotation:annotation];
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
+  return [RCTLinkingManager application:application openURL:url sourceApplication:sourceApplication annotation:annotation];
 }
 
 // Only if your app is using [Universal Links](https://developer.apple.com/library/prerelease/ios/documentation/General/Conceptual/AppSearch/UniversalLinks.html).
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity
  restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> *restorableObjects))restorationHandler
 {
-  return [RCTLinkingManager application:application
-                   continueUserActivity:userActivity
-                     restorationHandler:restorationHandler];
+  return [RCTLinkingManager application:application continueUserActivity:userActivity restorationHandler:restorationHandler];
 }
 
 - (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index 67b548b75..b429db41b 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -32,6 +32,7 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>mattermost</string>
+				<string>mmauthbeta</string>
 			</array>
 		</dict>
 	</array>
diff --git a/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m b/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m
index 34aeeac09..a3e1b3051 100644
--- a/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m
+++ b/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m
@@ -10,6 +10,7 @@
 #import "RNNotificationEventHandler+HandleReplyAction.h"
 #import <react-native-notifications/RNNotificationParser.h>
 #import <UploadAttachments-Bridging-Header.h>
+#import <DatabaseHelper/DatabaseHelper-Swift.h>
 #import <objc/runtime.h>
 
 #define notificationCenterKey @"notificationCenter"
@@ -44,15 +45,26 @@ NSString *const ReplyActionID = @"REPLY_ACTION";
 - (void)sendReply:(UNNotificationResponse *)response completionHandler:(void (^)(void))notificationCompletionHandler {
   StoreManager *store = [StoreManager shared];
   [store getEntities:true];
-  NSString *serverUrl = [store getServerUrl];
-  NSString *sessionToken = [store getToken];
-  if (serverUrl == nil || sessionToken == nil) {
+  
+  NSDictionary *parsedResponse = [RNNotificationParser parseNotificationResponse:response];
+  NSString *serverUrl = [parsedResponse valueForKeyPath:@"notification.server_url"];
+  
+  if (serverUrl == nil) {
+    NSString* onlyServerUrl = [[DatabaseHelper default] getOnlyServerUrlObjc];
+    if ([onlyServerUrl length] > 0) {
+      serverUrl = onlyServerUrl;
+    } else {
+      [self handleReplyFailure:@"" completionHandler:notificationCompletionHandler];
+    }
+  }
+  
+  NSString *sessionToken = [store getTokenForServerUrl:serverUrl];
+  if (sessionToken == nil) {
     [self handleReplyFailure:@"" completionHandler:notificationCompletionHandler];
     return;
   }
 
   NSString *completionKey = response.notification.request.identifier;
-  NSDictionary *parsedResponse = [RNNotificationParser parseNotificationResponse:response];
   NSString *message = [parsedResponse valueForKeyPath:@"action.text"];
   NSString *channelId = [parsedResponse valueForKeyPath:@"notification.channel_id"];
   NSString *rootId = [parsedResponse valueForKeyPath:@"notification.root_id"];
diff --git a/ios/Mattermost/SwimeProxy.swift b/ios/Mattermost/SwimeProxy.swift
index 8b3418467..bf06aa715 100644
--- a/ios/Mattermost/SwimeProxy.swift
+++ b/ios/Mattermost/SwimeProxy.swift
@@ -3,7 +3,8 @@
 //  Mattermost
 //
 //  Created by Elias Nahum on 15-10-19.
-//  Copyright © 2019 Facebook. All rights reserved.
+//  Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+//  See License.txt for license information.
 //
 
 import Foundation
diff --git a/ios/MattermostShare/ShareViewController.swift b/ios/MattermostShare/ShareViewController.swift
index 11ff1024b..5fb0fd3be 100644
--- a/ios/MattermostShare/ShareViewController.swift
+++ b/ios/MattermostShare/ShareViewController.swift
@@ -2,6 +2,7 @@ import UIKit
 import Social
 import MobileCoreServices
 import UploadAttachments
+import DatabaseHelper
 import LocalAuthentication
 
 extension Bundle {
@@ -17,11 +18,11 @@ class ShareViewController: SLComposeServiceViewController {
   private var store = StoreManager.shared() as StoreManager
   private var entities: [AnyHashable:Any]? = nil
   private var sessionToken: String?
-  private var serverURL: String?
+  private var serverUrl: String?
   private var message: String?
-  private var publicURL: String?
+  private var publicUrl: String?
   private var maxPostAlertShown: Bool = false
-  private var tempContainerURL: URL? = UploadSessionManager.shared.tempContainerURL() as URL?
+  private var tempContainerUrl: URL? = UploadSessionManager.shared.tempContainerUrl() as URL?
   
   fileprivate var selectedChannel: Item?
   fileprivate var selectedTeam: Item?
@@ -32,13 +33,18 @@ class ShareViewController: SLComposeServiceViewController {
   private var canUploadFiles: Bool = true
   
   required init?(coder aDecoder: NSCoder) {
-      super.init(coder: aDecoder)
+    super.init(coder: aDecoder)
+
+    entities = store.getEntities(true) as [AnyHashable:Any]?
   
-      entities = store.getEntities(true) as [AnyHashable:Any]?
-      sessionToken = store.getToken()
-      serverURL = store.getServerUrl()
-      maxMessageSize = Int(store.getMaxPostSize())
-      canUploadFiles = store.getCanUploadFiles()
+    // TODO: If we don't have a single server then we'll need the user to
+    // select the server from a dropdown. Once the server is selected we
+    // can fetch its token.
+    serverUrl = try? DatabaseHelper.default.getOnlyServerUrl()
+    sessionToken = serverUrl != nil ? store.getTokenForServerUrl(serverUrl) : nil
+  
+    maxMessageSize = Int(store.getMaxPostSize())
+    canUploadFiles = store.getCanUploadFiles()
   }
 
   // MARK: - Lifecycle methods
@@ -92,7 +98,7 @@ class ShareViewController: SLComposeServiceViewController {
   }
 
   func loadData() {
-    if sessionToken == nil || serverURL == nil {
+    if sessionToken == nil || serverUrl == nil {
       showErrorMessage(title: "", message: "Authentication required: Please first login using the app.", VC: self)
     } else if store.getCurrentTeamId() == "" || store.getMyTeams().count == 0 {
       showErrorMessage(title: "", message: "You must belong to a team before you can share files.", VC: self)
@@ -133,7 +139,7 @@ class ShareViewController: SLComposeServiceViewController {
       }
     }
 
-    return serverURL != nil &&
+    return serverUrl != nil &&
       sessionToken != nil &&
       attachmentsCount() == attachments.count &&
       selectedTeam != nil &&
@@ -147,13 +153,13 @@ class ShareViewController: SLComposeServiceViewController {
   
   override func didSelectPost() {
     // This is called after the user selects Post. Do the upload of contentText and/or NSExtensionContext attachments.
-    if publicURL != nil {
-      self.message = "\(contentText!)\n\n\(publicURL!)"
+    if publicUrl != nil {
+      self.message = "\(contentText!)\n\n\(publicUrl!)"
     } else {
       self.message = contentText
     }
 
-    UploadManager.shared.uploadFiles(baseURL: serverURL!, token: sessionToken!, channelId: selectedChannel!.id!, message: message, attachments: attachments, callback: {
+    UploadManager.shared.uploadFiles(baseUrl: serverUrl!, token: sessionToken!, channelId: selectedChannel!.id!, message: message, attachments: attachments, callback: {
       // Inform the host that we're done, so it un-blocks its UI. Note: Alternatively you could call super's -didSelectPost, which will similarly complete the extension context.
       self.extensionContext!.completeRequest(returningItems: [], completionHandler: nil)
     })
@@ -304,11 +310,11 @@ class ShareViewController: SLComposeServiceViewController {
                 }
               } else if let image = item as? UIImage {
                 if let data = image.pngData() {
-                  let tempImageURL = self.tempContainerURL?
+                  let tempImageUrl = self.tempContainerUrl?
                     .appendingPathComponent(UUID().uuidString)
                     .appendingPathExtension(".png")
-                  if (try? data.write(to: tempImageURL!)) != nil {
-                    let attachment = self.saveAttachment(url: tempImageURL!)
+                  if (try? data.write(to: tempImageUrl!)) != nil {
+                    let attachment = self.saveAttachment(url: tempImageUrl!)
                     if (attachment != nil) {
                       attachment?.type = kUTTypeImage as String
                       attachment?.imagePixels = self.getImagePixels(image: image)
@@ -337,7 +343,7 @@ class ShareViewController: SLComposeServiceViewController {
         } else if itemProvider.hasItemConformingToTypeIdentifier(kUTTypeURL as String) {
           itemProvider.loadItem(forTypeIdentifier: kUTTypeURL as String, options: nil, completionHandler: ({item, error in
             if let url = item as? URL {
-              self.publicURL = url.absoluteString
+              self.publicUrl = url.absoluteString
             }
           }))
         }
@@ -356,7 +362,7 @@ class ShareViewController: SLComposeServiceViewController {
     
     // If currentChannel is nil it means we don't have the channels for this team
     if (currentChannel == nil) {
-      let urlString = "\(serverURL!)/api/v4/users/me/teams/\(forTeamId)/channels"
+      let urlString = "\(serverUrl!)/api/v4/users/me/teams/\(forTeamId)/channels"
       let url = URL(string: urlString)
       var request = URLRequest(url: url!)
       let auth = "Bearer \(sessionToken!)" as String
@@ -462,18 +468,18 @@ class ShareViewController: SLComposeServiceViewController {
   func saveAttachment(url: URL) -> AttachmentItem? {
     let fileMgr = FileManager.default
     let fileName = url.lastPathComponent
-    let tempFileURL = tempContainerURL?.appendingPathComponent(fileName)
+    let tempFileUrl = tempContainerUrl?.appendingPathComponent(fileName)
 
     do {
-      if (tempFileURL != url) {
-        try? FileManager.default.removeItem(at: tempFileURL!)
-        try fileMgr.copyItem(at: url, to: tempFileURL!)
+      if (tempFileUrl != url) {
+        try? FileManager.default.removeItem(at: tempFileUrl!)
+        try fileMgr.copyItem(at: url, to: tempFileUrl!)
       }
 
-      let attr = try fileMgr.attributesOfItem(atPath: (tempFileURL?.path)!) as NSDictionary
+      let attr = try fileMgr.attributesOfItem(atPath: (tempFileUrl?.path)!) as NSDictionary
       let attachment = AttachmentItem()
       attachment.fileName = fileName
-      attachment.fileURL = tempFileURL
+      attachment.fileUrl = tempFileUrl
       attachment.fileSize = attr.fileSize()
 
       return attachment
diff --git a/ios/NotificationService/NotificationService.swift b/ios/NotificationService/NotificationService.swift
index 1f5e8b2f0..01dc89ef0 100644
--- a/ios/NotificationService/NotificationService.swift
+++ b/ios/NotificationService/NotificationService.swift
@@ -1,3 +1,4 @@
+import DatabaseHelper
 import UserNotifications
 import UploadAttachments
 
@@ -13,7 +14,7 @@ class NotificationService: UNNotificationServiceExtension {
 
     let fibonacciBackoffsInSeconds = [1.0, 2.0, 3.0, 5.0, 8.0]
 
-    func fetchReceipt(notificationId: String, receivedAt: Int, type: String, postId: String, idLoaded: Bool ) -> Void {
+    func fetchReceipt(notificationId: String, serverUrl: String?, receivedAt: Int, type: String, postId: String, idLoaded: Bool ) -> Void {
       if (self.retryIndex >= fibonacciBackoffsInSeconds.count) {
         contentHandler(self.bestAttemptContent!)
         return
@@ -21,6 +22,7 @@ class NotificationService: UNNotificationServiceExtension {
 
       UploadSession.shared.notificationReceipt(
         notificationId: notificationId,
+        serverUrl: serverUrl,
         receivedAt: receivedAt,
         type: type,
         postId: postId,
@@ -38,6 +40,7 @@ class NotificationService: UNNotificationServiceExtension {
               DispatchQueue.main.asyncAfter(deadline: .now() + backoffInSeconds, execute: {
                 fetchReceipt(
                   notificationId: notificationId,
+                  serverUrl: serverUrl,
                   receivedAt: Date().millisecondsSince1970,
                   type: type,
                   postId: postId,
@@ -59,9 +62,14 @@ class NotificationService: UNNotificationServiceExtension {
       let type = (bestAttemptContent.userInfo["type"] ?? "") as! String
       let postId = (bestAttemptContent.userInfo["post_id"] ?? "") as! String
       let idLoaded = (bestAttemptContent.userInfo["id_loaded"] ?? false) as! Bool
+      var serverUrl = (bestAttemptContent.userInfo["server_url"]) as! String?
+      if (serverUrl == nil) {
+        serverUrl = try? DatabaseHelper.default.getOnlyServerUrl()
+      }
 
       fetchReceipt(
         notificationId: ackId,
+        serverUrl: serverUrl,
         receivedAt: Date().millisecondsSince1970,
         type: type,
         postId: postId,
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 65f119c4b..279ad7122 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -253,7 +253,7 @@ PODS:
     - react-native-video/Video (= 5.1.1)
   - react-native-video/Video (5.1.1):
     - React-Core
-  - react-native-webview (11.4.0):
+  - react-native-webview (11.6.2):
     - React-Core
   - React-perflogger (0.64.0)
   - React-RCTActionSheet (0.64.0):
@@ -332,6 +332,8 @@ PODS:
     - React-Core
     - React-RCTImage
     - React-RCTText
+  - rn-fetch-blob (0.12.0):
+    - React-Core
   - RNCAsyncStorage (1.12.1):
     - React-Core
   - RNCClipboard (1.5.1):
@@ -492,6 +494,7 @@ DEPENDENCIES:
   - ReactNativeExceptionHandler (from `../node_modules/react-native-exception-handler`)
   - ReactNativeKeyboardTrackingView (from `../node_modules/react-native-keyboard-tracking-view`)
   - ReactNativeNavigation (from `../node_modules/react-native-navigation`)
+  - rn-fetch-blob (from `../node_modules/rn-fetch-blob`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
@@ -637,6 +640,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-keyboard-tracking-view"
   ReactNativeNavigation:
     :path: "../node_modules/react-native-navigation"
+  rn-fetch-blob:
+    :path: "../node_modules/rn-fetch-blob"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-community/async-storage"
   RNCClipboard:
@@ -711,7 +716,7 @@ SPEC CHECKSUMS:
   EXConstants: c00cd53a17a65b2e53ddb3890e4e74d3418e406e
   EXFileSystem: 35769beb727d5341d1276fd222710f9704f7164e
   FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5
-  FBReactNativeSpec: ebaa990b13e6f0496fd41894a824c585c4afab46
+  FBReactNativeSpec: a804c9d6c798f94831713302354003ee54ea18cb
   glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
   jail-monkey: 80c9e34da2cd54023e5ad08bf7051ec75bd43d5b
   libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
@@ -739,7 +744,7 @@ SPEC CHECKSUMS:
   react-native-paste-input: 003693cff6fcea476066172e66901beb7ef25670
   react-native-safe-area-context: e471852c5ed67eea4b10c5d9d43c1cebae3b231d
   react-native-video: 1574074179ecaf6a9dd067116c8f31bf9fec15c8
-  react-native-webview: fdd3c7c2ad173e8ca8c82729ed05f3fda2491a82
+  react-native-webview: 1f56115845c98f0a59dfbbac685797c014a821be
   React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
   React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
   React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f
@@ -755,6 +760,7 @@ SPEC CHECKSUMS:
   ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
   ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306
   ReactNativeNavigation: 4c4ca87edc0da4ee818158a62cb6188088454e5c
+  rn-fetch-blob: 17961aec08caae68bb8fc0e5b40f93b3acfa6932
   RNCAsyncStorage: cb9a623793918c6699586281f0b51cbc38f046f9
   RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3
   RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
diff --git a/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj b/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj
index 9d925610e..3ae54f662 100644
--- a/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj
+++ b/ios/UploadAttachments/UploadAttachments.xcodeproj/project.pbxproj
@@ -5,6 +5,7 @@
 	};
 	objectVersion = 50;
 	objects = {
+
 /* Begin PBXBuildFile section */
 		7F80232C229C91AD0034D6D4 /* MMMConstants.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7FABE054221387B500D0F595 /* MMMConstants.h */; };
 		7F82907122C295AC0035544F /* MMKeychainManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F82907022C295AC0035544F /* MMKeychainManager.m */; };
@@ -34,6 +35,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		49415298267AA00C0039D64E /* libDatabaseHelper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libDatabaseHelper.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7F82906F22C295AB0035544F /* MMKeychainManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMKeychainManager.h; sourceTree = "<group>"; };
 		7F82907022C295AC0035544F /* MMKeychainManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMKeychainManager.m; sourceTree = "<group>"; };
 		7F82907222C296970035544F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
@@ -69,6 +71,7 @@
 		7F82901A22C28F770035544F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				49415298267AA00C0039D64E /* libDatabaseHelper.a */,
 				7F82907422C296A10035544F /* LocalAuthentication.framework */,
 				7F82907222C296970035544F /* Security.framework */,
 			);
@@ -234,6 +237,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -295,6 +299,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/ios/UploadAttachments/UploadAttachments.xcodeproj/xcshareddata/xcschemes/UploadAttachments.xcscheme b/ios/UploadAttachments/UploadAttachments.xcodeproj/xcshareddata/xcschemes/UploadAttachments.xcscheme
index 8dd4cbe61..da4191ed8 100644
--- a/ios/UploadAttachments/UploadAttachments.xcodeproj/xcshareddata/xcschemes/UploadAttachments.xcscheme
+++ b/ios/UploadAttachments/UploadAttachments.xcodeproj/xcshareddata/xcschemes/UploadAttachments.xcscheme
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:UploadAttachments.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/ios/UploadAttachments/UploadAttachments/AttachmentItem.swift b/ios/UploadAttachments/UploadAttachments/AttachmentItem.swift
index dfd8200f8..afd5e88c8 100644
--- a/ios/UploadAttachments/UploadAttachments/AttachmentItem.swift
+++ b/ios/UploadAttachments/UploadAttachments/AttachmentItem.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public class AttachmentItem: NSObject {
     public var fileName: String?
-    public var fileURL: URL?
+    public var fileUrl: URL?
     public var fileSize: UInt64 = 0
     public var type: String?
     public var imagePixels:  UInt64 = 0
diff --git a/ios/UploadAttachments/UploadAttachments/StoreManager.h b/ios/UploadAttachments/UploadAttachments/StoreManager.h
index c740d3fac..6c86b59a5 100644
--- a/ios/UploadAttachments/UploadAttachments/StoreManager.h
+++ b/ios/UploadAttachments/UploadAttachments/StoreManager.h
@@ -20,8 +20,7 @@
 -(UInt64)getMaxFileSize;
 -(UInt64)getMaxPostSize;
 -(NSArray *)getMyTeams;
--(NSString *)getServerUrl;
--(NSString *)getToken;
+-(NSString *)getTokenForServerUrl:(NSString *)url;
 -(BOOL)getCanUploadFiles;
 -(void)updateEntities:(NSString *)content;
 @end
diff --git a/ios/UploadAttachments/UploadAttachments/StoreManager.m b/ios/UploadAttachments/UploadAttachments/StoreManager.m
index 5292ff3ba..bd8eb4d45 100644
--- a/ios/UploadAttachments/UploadAttachments/StoreManager.m
+++ b/ios/UploadAttachments/UploadAttachments/StoreManager.m
@@ -1,5 +1,6 @@
 #import "StoreManager.h"
 #import "MMMConstants.h"
+#import <DatabaseHelper/DatabaseHelper-Swift.h>
 
 @implementation StoreManager
 +(instancetype)shared {
@@ -143,27 +144,23 @@
   return [self sortDictArrayByDisplayName:myTeams];
 }
 
--(NSString *)getServerUrl {
-    NSDictionary *general = [self.entities objectForKey:@"general"];
-    NSDictionary *credentials = [general objectForKey:@"credentials"];
-  
-    if (credentials) {
-        return [credentials objectForKey:@"url"];
-    }
-    
-    return nil;
-}
-
--(NSString *)getToken {
+-(NSString *)getTokenForServer:(NSString *)url {
     NSBundle *bundle = [NSBundle mainBundle];
     NSString *appGroupId = [bundle objectForInfoDictionaryKey:@"AppGroupIdentifier"];
     NSDictionary *options = @{
         @"accessGroup": appGroupId
     };
-    NSString* serverUrl = [self getServerUrl];
+    
+    NSString *serverUrl = url;
+    if (serverUrl == nil) {
+      NSString* onlyServerUrl = [[DatabaseHelper default] getOnlyServerUrlObjc];
+      if ([onlyServerUrl length] > 0) {
+        serverUrl = onlyServerUrl;
+      }
+    }
 
     if (serverUrl) {
-        NSDictionary *credentials = [self.keychain getInternetCredentialsForServer:[self getServerUrl] withOptions:options];
+        NSDictionary *credentials = [self.keychain getInternetCredentialsForServer:serverUrl withOptions:options];
   
         return [credentials objectForKey:@"password"];
     }
diff --git a/ios/UploadAttachments/UploadAttachments/UploadManager.swift b/ios/UploadAttachments/UploadAttachments/UploadManager.swift
index fb1b5e316..097d992ec 100644
--- a/ios/UploadAttachments/UploadAttachments/UploadManager.swift
+++ b/ios/UploadAttachments/UploadAttachments/UploadManager.swift
@@ -9,8 +9,8 @@ import UIKit
         return Singleton.instance
     }
 
-    private func buildUploadURL(baseURL: String, channelId: String, fileName: String?) -> URL? {
-        let urlComponent = NSURLComponents(string: "\(baseURL)/api/v4/files")
+    private func buildUploadUrl(baseUrl: String, channelId: String, fileName: String?) -> URL? {
+        let urlComponent = NSURLComponents(string: "\(baseUrl)/api/v4/files")
         let queryChannel = URLQueryItem(name: "channel_id", value: channelId)
         let queryFile = URLQueryItem(name: "filename", value: fileName)
 
@@ -20,10 +20,11 @@ import UIKit
         return urlComponent?.url
     }
     
-    public func uploadFiles(baseURL: String, token: String, channelId: String, message: String?, attachments: AttachmentArray<AttachmentItem>, callback: () -> Void) {
+    public func uploadFiles(baseUrl: String, token: String, channelId: String, message: String?, attachments: AttachmentArray<AttachmentItem>, callback: () -> Void) {
         let identifier = "mattermost-share-upload-\(UUID().uuidString)"
         UploadSessionManager.shared.createUploadSessionData(
             identifier: identifier,
+            serverUrl: baseUrl,
             channelId: channelId,
             message: message ?? "",
             totalFiles: attachments.count
@@ -36,12 +37,12 @@ import UIKit
             for index in 0..<attachments.count {
                 guard let item = attachments[index] else {return}
 
-                let url = buildUploadURL(baseURL: baseURL, channelId: channelId, fileName: item.fileName)
+                let url = buildUploadUrl(baseUrl: baseUrl, channelId: channelId, fileName: item.fileName)
                 var uploadRequest = URLRequest(url: url!)
                 uploadRequest.httpMethod = "POST"
                 uploadRequest.addValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
 
-                let task = uploadSession.uploadTask(with: uploadRequest, fromFile: item.fileURL!)
+                let task = uploadSession.uploadTask(with: uploadRequest, fromFile: item.fileUrl!)
                 task.resume()
             }
         } else if message != nil {
diff --git a/ios/UploadAttachments/UploadAttachments/UploadSession.swift b/ios/UploadAttachments/UploadAttachments/UploadSession.swift
index bed189b52..aa28a4090 100644
--- a/ios/UploadAttachments/UploadAttachments/UploadSession.swift
+++ b/ios/UploadAttachments/UploadAttachments/UploadSession.swift
@@ -12,16 +12,19 @@ import os.log
     public var session: URLSession?
     
     public func createPost(identifier: String) {
+        guard let uploadSessionData = UploadSessionManager.shared.getUploadSessionData(identifier: identifier) else {
+            return
+        }
+        
         let store = StoreManager.shared() as StoreManager
         let _ = store.getEntities(true)
-        let serverURL = store.getServerUrl()
-        let sessionToken = store.getToken()
-        
-        if (serverURL != nil && sessionToken != nil) {
-            let urlString = "\(serverURL!)/api/v4/posts"
+
+        if let serverUrl = uploadSessionData.serverUrl, let sessionToken = store.getTokenForServerUrl(serverUrl) {
+            let urlString = "\(serverUrl)/api/v4/posts"
             
-            guard let uploadSessionData = UploadSessionManager.shared.getUploadSessionData(identifier: identifier) else {return}
-            guard let url = URL(string: urlString) else {return}
+            guard let url = URL(string: urlString) else {
+                return
+            }
             
             if uploadSessionData.message != "" || uploadSessionData.fileIds.count > 0 {
                 let jsonObject: [String: Any] = [
@@ -29,11 +32,13 @@ import os.log
                     "message": uploadSessionData.message as Any,
                     "file_ids": uploadSessionData.fileIds
                 ]
-                if !JSONSerialization.isValidJSONObject(jsonObject) {return}
+                if !JSONSerialization.isValidJSONObject(jsonObject) {
+                    return
+                }
                 
                 var request = URLRequest(url: url)
                 request.httpMethod = "POST"
-                request.setValue("Bearer \(sessionToken!)", forHTTPHeaderField: "Authorization")
+                request.setValue("Bearer \(sessionToken)", forHTTPHeaderField: "Authorization")
                 request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
                 request.httpBody = try? JSONSerialization.data(withJSONObject: jsonObject, options: .prettyPrinted)
                 
@@ -131,44 +136,39 @@ import os.log
         })
     }
 
-    public func notificationReceipt(notificationId: Any?, receivedAt: Int, type: Any?) {
-        notificationReceipt(notificationId:notificationId, receivedAt:receivedAt, type:type, postId:nil, idLoaded:false, completion:{_, _, _ in})
+    public func notificationReceipt(notificationId: Any?, serverUrl: String?, receivedAt: Int, type: Any?) {
+        notificationReceipt(notificationId:notificationId, serverUrl:serverUrl, receivedAt:receivedAt, type:type, postId:nil, idLoaded:false, completion:{_, _, _ in})
     }
 
-    public func notificationReceipt(notificationId: Any?, receivedAt: Int, type: Any?, postId: Any? = nil, idLoaded: Bool, completion: @escaping (Data?, URLResponse?, Error?) -> Void) {
-        if (notificationId != nil) {
+    public func notificationReceipt(notificationId: Any?, serverUrl: String?, receivedAt: Int, type: Any?, postId: Any? = nil, idLoaded: Bool, completion: @escaping (Data?, URLResponse?, Error?) -> Void) {
+        if (notificationId != nil && serverUrl != nil) {
             let store = StoreManager.shared() as StoreManager
-            let entities = store.getEntities(true)
-            if (entities != nil) {
-                let serverURL = store.getServerUrl()
-                let sessionToken = store.getToken()
+            
+            if let _ = store.getEntities(true), let sessionToken = store.getTokenForServerUrl(serverUrl) {
+                let urlString = "\(serverUrl!)/api/v4/notifications/ack"
                 
-                if (serverURL != nil && sessionToken != nil) {
-                    let urlString = "\(serverURL!)/api/v4/notifications/ack"
-                    
-                    let jsonObject: [String: Any] = [
-                        "id": notificationId as Any,
-                        "received_at": receivedAt,
-                        "platform": "ios",
-                        "type": type as Any,
-                        "post_id": postId as Any,
-                        "is_id_loaded": idLoaded as Bool
-                    ]
-                    
-                    if !JSONSerialization.isValidJSONObject(jsonObject) {return}
+                let jsonObject: [String: Any] = [
+                    "id": notificationId as Any,
+                    "received_at": receivedAt,
+                    "platform": "ios",
+                    "type": type as Any,
+                    "post_id": postId as Any,
+                    "is_id_loaded": idLoaded as Bool
+                ]
+                
+                if !JSONSerialization.isValidJSONObject(jsonObject) {return}
 
-                    guard let url = URL(string: urlString) else {return}
-                    var request = URLRequest(url: url)
-                    request.httpMethod = "POST"
-                    request.setValue("Bearer \(sessionToken!)", forHTTPHeaderField: "Authorization")
-                    request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
-                    request.httpBody = try? JSONSerialization.data(withJSONObject: jsonObject, options: .prettyPrinted)
+                guard let url = URL(string: urlString) else {return}
+                var request = URLRequest(url: url)
+                request.httpMethod = "POST"
+                request.setValue("Bearer \(sessionToken)", forHTTPHeaderField: "Authorization")
+                request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
+                request.httpBody = try? JSONSerialization.data(withJSONObject: jsonObject, options: .prettyPrinted)
 
-                    let task = URLSession(configuration: .ephemeral).dataTask(with: request) { data, response, error in
-                        completion(data, response, error)
-                    }
-                    task.resume()
+                let task = URLSession(configuration: .ephemeral).dataTask(with: request) { data, response, error in
+                    completion(data, response, error)
                 }
+                task.resume()
             }
         }
     }
diff --git a/ios/UploadAttachments/UploadAttachments/UploadSessionManager.swift b/ios/UploadAttachments/UploadAttachments/UploadSessionManager.swift
index e28533a82..ca7bb0979 100644
--- a/ios/UploadAttachments/UploadAttachments/UploadSessionManager.swift
+++ b/ios/UploadAttachments/UploadAttachments/UploadSessionManager.swift
@@ -1,6 +1,7 @@
 import Foundation
 
 @objc public class UploadSessionData: NSObject {
+    public var serverUrl: String?
     public var channelId: String?
     public var fileIds: [String] = []
     public var message: String = ""
@@ -17,9 +18,10 @@ import Foundation
         return Singleton.instance
     }
     
-    public func createUploadSessionData(identifier: String, channelId: String, message: String, totalFiles: Int) {
+    public func createUploadSessionData(identifier: String, serverUrl: String, channelId: String, message: String, totalFiles: Int) {
         let fileIds: [String] = []
         let uploadSessionData:  NSDictionary = [
+            "serverUrl": serverUrl,
             "channelId": channelId,
             "fileIds": fileIds,
             "message": message,
@@ -33,6 +35,7 @@ import Foundation
         let dictionary = bucket?.object(forKey: identifier) as? NSDictionary
         let sessionData = UploadSessionData()
 
+        sessionData.serverUrl = dictionary?.object(forKey: "serverUrl") as? String
         sessionData.channelId = dictionary?.object(forKey: "channelId") as? String
         sessionData.fileIds = dictionary?.object(forKey: "fileIds") as? [String] ?? []
         sessionData.message = dictionary?.object(forKey: "message") as! String
@@ -58,23 +61,23 @@ import Foundation
         }
     }
     
-    public func tempContainerURL() -> URL? {
+    public func tempContainerUrl() -> URL? {
         let filemgr = FileManager.default
         let appGroupId = Bundle.main.infoDictionary!["AppGroupIdentifier"] as! String
-        let containerURL = filemgr.containerURL(forSecurityApplicationGroupIdentifier: appGroupId)
-        guard let tempDirectoryURL = containerURL?.appendingPathComponent("shareTempItems") else {return nil}
+        let containerUrl = filemgr.containerURL(forSecurityApplicationGroupIdentifier: appGroupId)
+        guard let tempDirectoryUrl = containerUrl?.appendingPathComponent("shareTempItems") else {return nil}
         var isDirectory = ObjCBool(false)
-        let exists = filemgr.fileExists(atPath: tempDirectoryURL.path, isDirectory: &isDirectory)
+        let exists = filemgr.fileExists(atPath: tempDirectoryUrl.path, isDirectory: &isDirectory)
         if !exists && !isDirectory.boolValue {
-            try? filemgr.createDirectory(atPath: tempDirectoryURL.path, withIntermediateDirectories: true, attributes: nil)
+            try? filemgr.createDirectory(atPath: tempDirectoryUrl.path, withIntermediateDirectories: true, attributes: nil)
         }
         
-        return tempDirectoryURL
+        return tempDirectoryUrl
     }
     
     public func clearTempDirectory() {
-        guard let tempURL = tempContainerURL() else {return}
+        guard let tempUrl = tempContainerUrl() else {return}
         let fileMgr = FileManager.default
-        try? fileMgr.removeItem(atPath: tempURL.path)
+        try? fileMgr.removeItem(atPath: tempUrl.path)
     }
 }
diff --git a/jest.config.js b/jest.config.js
index 65718f6fd..675469b3d 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -11,21 +11,13 @@ module.exports = {
     },
     moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
     clearMocks: true,
-    setupFilesAfterEnv: [
-        '<rootDir>/test/setup.ts',
-    ],
-    collectCoverageFrom: [
-        'app/**/*.{js,jsx,ts,tsx}',
-    ],
-    coverageReporters: [
-        'lcov',
-        'text-summary',
-    ],
-    testPathIgnorePatterns: [
-        '/node_modules/',
-    ],
+    setupFilesAfterEnv: ['<rootDir>/test/setup.ts'],
+    collectCoverageFrom: ['app/**/*.{js,jsx,ts,tsx}'],
+    coverageReporters: ['lcov', 'text-summary'],
+    testPathIgnorePatterns: ['/node_modules/'],
     moduleNameMapper: {
-        'assets/images/video_player/(.*).png': '<rootDir>/dist/assets/images/video_player/$1@2x.png',
+        'assets/images/video_player/(.*).png':
+            '<rootDir>/dist/assets/images/video_player/$1@2x.png',
     },
     transformIgnorePatterns: [
         'node_modules/(?!(@react-native|react-native)|jail-monkey|@sentry/react-native|react-navigation|@react-native-community/cameraroll|react-clone-referenced-element|@react-native-community|expo(nent)?|@expo(nent)?/.*|react-navigation|@react-navigation/.*|@unimodules/.*|sentry-expo|native-base|unimodules-permissions-interface)',
diff --git a/metro.config.js b/metro.config.js
index 394e9166d..ed1e14e68 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -1,47 +1,13 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-/* eslint-disable no-console */
-const resolve = require('path').resolve;
-const fs = require('fs');
-
-const modulesRegex = /\/(node_modules)/;
-
-// This script will let the react native packager what modules to include
-// in the main bundle and what modules to blacklist from the inline requires
-// this modules are taken from the modulePaths.js file
-
-const config = {
+module.exports = {
     transformer: {
-        getTransformOptions: (entryFile, {platform}) => {
-            console.log('BUILDING MODULES FOR', platform);
-            const moduleMap = {};
-            let modulePaths = [];
-            if (platform === 'ios') {
-                modulePaths = require('./packager/modules.ios');
-            }
-            modulePaths.forEach((path) => {
-                let fsFile = path;
-                if (path.match(modulesRegex).length > 1) {
-                    fsFile = path.replace(modulesRegex, '');
-                }
-
-                if (fs.existsSync(fsFile)) {
-                    moduleMap[resolve(path)] = true;
-                }
-            });
-
-            return {
-                preloadedModules: moduleMap,
-                transform: {
-                    inlineRequires: {
-                        blockList: moduleMap,
-                    },
-                },
-            };
-        },
+        getTransformOptions: async () => ({
+            transform: {
+                experimentalImportSupport: false,
+                inlineRequires: true,
+            },
+        }),
     },
-    maxWorkers: 4,
 };
-
-module.exports = config;
diff --git a/package-lock.json b/package-lock.json
index 426190362..95f9b01ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2077,6 +2077,30 @@
         }
       }
     },
+    "@formatjs/intl-datetimeformat": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.3.5.tgz",
+      "integrity": "sha512-JbjkS2OHSyrNgHBiELmaywZ9Yy03HwRj69adWrc9N6baAl/sN6INtyxU+uv3MhTjOEyMtw5FrFO5Juk9VY5o5A==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.7.1",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.7.1.tgz",
+          "integrity": "sha512-FjewVLB2DVEVCvvC7IMffzXVhysvi442i6ed0H7qcrT6xtUpO4vr0oZgpOmsv6D9I4Io0GVebIuySwteS/k3gg==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
+      }
+    },
     "@formatjs/intl-displaynames": {
       "version": "4.0.13",
       "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.13.tgz",
@@ -2093,6 +2117,22 @@
         }
       }
     },
+    "@formatjs/intl-getcanonicallocales": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.10.tgz",
+      "integrity": "sha512-tFqGxZ9HkAzphupybyCKdWHzL1ge/sY8TtzEK57Hs3RCxrv/y+VxIPrE+Izw2oCFowQBz76cyi0zT6PjHuWArA==",
+      "requires": {
+        "cldr-core": "38",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
+      }
+    },
     "@formatjs/intl-listformat": {
       "version": "5.0.14",
       "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.14.tgz",
@@ -2109,6 +2149,104 @@
         }
       }
     },
+    "@formatjs/intl-locale": {
+      "version": "2.4.24",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.24.tgz",
+      "integrity": "sha512-+JOwvBRFS/GFuJlWiWbfAzBng0A+ANoGV1LRseXK+4uzp4Sn35GD8M/dfgU1lp2R2dTWpYie2yyoHe4k4aHF6w==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.7.1",
+        "@formatjs/intl-getcanonicallocales": "1.5.10",
+        "cldr-core": "38",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.7.1.tgz",
+          "integrity": "sha512-FjewVLB2DVEVCvvC7IMffzXVhysvi442i6ed0H7qcrT6xtUpO4vr0oZgpOmsv6D9I4Io0GVebIuySwteS/k3gg==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
+      }
+    },
+    "@formatjs/intl-numberformat": {
+      "version": "6.2.10",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.2.10.tgz",
+      "integrity": "sha512-b2pN56nxQ2JnYaT1ji8NYJbDv9rQmQ1BWHgyRJWIjKz6afYeeoVf/O7YIaDFawNOONgRrn5J1SFYtNdQzXJJkg==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.7.1",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.7.1.tgz",
+          "integrity": "sha512-FjewVLB2DVEVCvvC7IMffzXVhysvi442i6ed0H7qcrT6xtUpO4vr0oZgpOmsv6D9I4Io0GVebIuySwteS/k3gg==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
+      }
+    },
+    "@formatjs/intl-pluralrules": {
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.18.tgz",
+      "integrity": "sha512-qRFITPsNoeXfsiGc97pp8mVgqcC7aQNuXsiJjY9LpXVTkYNfjUP4ZpbYXflM4xoWCXMJNz3ilsrQhZWXy9td5g==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.7.1",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.7.1.tgz",
+          "integrity": "sha512-FjewVLB2DVEVCvvC7IMffzXVhysvi442i6ed0H7qcrT6xtUpO4vr0oZgpOmsv6D9I4Io0GVebIuySwteS/k3gg==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
+      }
+    },
+    "@formatjs/intl-relativetimeformat": {
+      "version": "8.1.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.1.8.tgz",
+      "integrity": "sha512-MIVrsgG7hvYrnes6TxJLflXhhTuxIaWCIdf6p5Iv6HguTtDJqqAFOCNRCqUnYQeYcNbgIQBgLb0Kh7djS0GU+w==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.7.1",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.7.1.tgz",
+          "integrity": "sha512-FjewVLB2DVEVCvvC7IMffzXVhysvi442i6ed0H7qcrT6xtUpO4vr0oZgpOmsv6D9I4Io0GVebIuySwteS/k3gg==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
+      }
+    },
     "@hapi/hoek": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
@@ -3277,6 +3415,13 @@
         "rambdax": "2.15.0",
         "rxjs": "^6.5.3",
         "sql-escape-string": "^1.1.0"
+      },
+      "dependencies": {
+        "lokijs": {
+          "version": "npm:@nozbe/lokijs@1.5.12-wmelon",
+          "resolved": "https://registry.npmjs.org/@nozbe/lokijs/-/lokijs-1.5.12-wmelon.tgz",
+          "integrity": "sha512-7xQUn80pzPBB9VcwvB/W2V9/60xIfuk+3IDIvS9cU7W29jJx4QBXe5dBWTaARmxD9hXozPCcPWh2wfd7m4dbTA=="
+        }
       }
     },
     "@nozbe/with-observables": {
@@ -6170,6 +6315,15 @@
         "csstype": "^3.0.2"
       }
     },
+    "@types/react-intl": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/react-intl/-/react-intl-3.0.0.tgz",
+      "integrity": "sha512-k8F3d05XQGEqSWIfK97bBjZe4z9RruXU9Wa7OZ2iUC5pdeIpzuQDZe/9C2J3Xir5//ZtAkhcv08Wfx3n5TBTQg==",
+      "dev": true,
+      "requires": {
+        "react-intl": "*"
+      }
+    },
     "@types/react-native": {
       "version": "0.64.4",
       "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.64.4.tgz",
@@ -6178,6 +6332,16 @@
         "@types/react": "*"
       }
     },
+    "@types/react-native-button": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/react-native-button/-/react-native-button-3.0.0.tgz",
+      "integrity": "sha512-mMZnJn3sf1STf5B5b/dGIaK0fFI9RosRuaRhVlOcAJwCSf2OBLfpZ75gD/ORytfh+EKRDoR//P0vH+RtOjGvlA==",
+      "dev": true,
+      "requires": {
+        "@types/react": "*",
+        "@types/react-native": "*"
+      }
+    },
     "@types/react-native-share": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/@types/react-native-share/-/react-native-share-3.3.2.tgz",
@@ -8237,6 +8401,11 @@
         }
       }
     },
+    "base-64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
+      "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
+    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -9082,6 +9251,11 @@
       "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==",
       "dev": true
     },
+    "cldr-core": {
+      "version": "38.1.0",
+      "resolved": "https://registry.npmjs.org/cldr-core/-/cldr-core-38.1.0.tgz",
+      "integrity": "sha512-Da9xKjDp4qGGIX0VDsBqTan09iR5nuYD2a/KkfEaUyqKhu6wFVNRiCpPDXeRbpVwPBY6PgemV8WiHatMhcpy4A=="
+    },
     "clean-css": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -15964,8 +16138,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.3",
@@ -16234,6 +16407,11 @@
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
       "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM="
     },
+    "lodash.set": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
+      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
+    },
     "lodash.template": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
@@ -16423,11 +16601,6 @@
         }
       }
     },
-    "lokijs": {
-      "version": "npm:@nozbe/lokijs@1.5.12-wmelon",
-      "resolved": "https://registry.npmjs.org/@nozbe/lokijs/-/lokijs-1.5.12-wmelon.tgz",
-      "integrity": "sha512-7xQUn80pzPBB9VcwvB/W2V9/60xIfuk+3IDIvS9cU7W29jJx4QBXe5dBWTaARmxD9hXozPCcPWh2wfd7m4dbTA=="
-    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -17779,6 +17952,17 @@
       "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
       "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
     },
+    "nock": {
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.1.0.tgz",
+      "integrity": "sha512-3N3DUY8XYrxxzWazQ+nSBpiaJ3q6gcpNh4gXovC/QBxrsvNp4tq+wsLHF6mJ3nrn3lPLn7KCJqKxy/9aD+0fdw==",
+      "requires": {
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash.set": "^4.3.2",
+        "propagate": "^2.0.0"
+      }
+    },
     "node-dir": {
       "version": "0.1.17",
       "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
@@ -19097,6 +19281,11 @@
         "react-is": "^16.8.1"
       }
     },
+    "propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag=="
+    },
     "proper-lockfile": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz",
@@ -19891,6 +20080,14 @@
         "prop-types": "^15.7.2"
       }
     },
+    "react-native-button": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/react-native-button/-/react-native-button-3.0.1.tgz",
+      "integrity": "sha512-Tkj7PwATNEXPOX4ubE+P8WnyJMenywU6Es/Bk2r2aR15204+AxSOEB3sp7JDP44LI+tUMetjudNBRRuKQOmoPw==",
+      "requires": {
+        "prop-types": "^15.5.10"
+      }
+    },
     "react-native-calendars": {
       "version": "1.1257.0",
       "resolved": "https://registry.npmjs.org/react-native-calendars/-/react-native-calendars-1.1257.0.tgz",
@@ -20000,6 +20197,20 @@
       "resolved": "https://registry.npmjs.org/react-native-hw-keyboard-event/-/react-native-hw-keyboard-event-0.0.4.tgz",
       "integrity": "sha512-G8qp0nm17PHigLb/axgdF9xg51BKCG2p1AGeq//J/luLp5zNczIcQJh+nm02R1MeEUE3e53wqO4LMe0MV3raZg=="
     },
+    "react-native-iphone-x-helper": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
+      "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg=="
+    },
+    "react-native-keyboard-aware-scroll-view": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.4.tgz",
+      "integrity": "sha512-9Q8lxGvUdEnyL2Q0/VZdcEjHUGjm1lOAMd/3bNnhknoA7RqjJDaRGOQDhOAjVW1iwrKUct+B1old87nIsiX6iw==",
+      "requires": {
+        "prop-types": "^15.6.2",
+        "react-native-iphone-x-helper": "^1.0.3"
+      }
+    },
     "react-native-keyboard-tracking-view": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/react-native-keyboard-tracking-view/-/react-native-keyboard-tracking-view-5.7.0.tgz",
@@ -20517,9 +20728,9 @@
       }
     },
     "react-native-webview": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.4.0.tgz",
-      "integrity": "sha512-il4OOJxBJgFXk8rtVgYQJIGRqYD5wJXc4By6nvnkHlH3hbyw1Mx5HKfP9Qmsy8xdCwHYgCBjUuCfHoGXJ9hMSA==",
+      "version": "11.6.2",
+      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.6.2.tgz",
+      "integrity": "sha512-7e5ltLBgqt1mX0gdTTS2nFPIjfS6y300wqJ4rLWqU71lDO+8ZeayfsF5qo83qxo2Go74CtLnSeWae4pdGwUqYw==",
       "requires": {
         "escape-string-regexp": "2.0.0",
         "invariant": "2.2.4"
@@ -20582,6 +20793,16 @@
         "react-transition-group": "^4.3.0"
       }
     },
+    "react-shallow-renderer": {
+      "version": "16.14.1",
+      "resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz",
+      "integrity": "sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "react-is": "^16.12.0 || ^17.0.0"
+      }
+    },
     "react-sizeme": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz",
@@ -20607,6 +20828,26 @@
         "refractor": "^3.1.0"
       }
     },
+    "react-test-renderer": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz",
+      "integrity": "sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "react-is": "^17.0.2",
+        "react-shallow-renderer": "^16.13.1",
+        "scheduler": "^0.20.2"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "17.0.2",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+          "dev": true
+        }
+      }
+    },
     "react-textarea-autosize": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz",
@@ -21247,6 +21488,30 @@
         "inherits": "^2.0.1"
       }
     },
+    "rn-fetch-blob": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/rn-fetch-blob/-/rn-fetch-blob-0.12.0.tgz",
+      "integrity": "sha512-+QnR7AsJ14zqpVVUbzbtAjq0iI8c9tCg49tIoKO2ezjzRunN7YL6zFSFSWZm6d+mE/l9r+OeDM3jmb2tBb2WbA==",
+      "requires": {
+        "base-64": "0.1.0",
+        "glob": "7.0.6"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
     "rn-placeholder": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/rn-placeholder/-/rn-placeholder-3.0.3.tgz",
diff --git a/package.json b/package.json
index 29a253c04..fc275223d 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,12 @@
   "private": true,
   "dependencies": {
     "@babel/runtime": "7.13.16",
+    "@formatjs/intl-datetimeformat": "3.3.5",
+    "@formatjs/intl-getcanonicallocales": "1.5.10",
+    "@formatjs/intl-locale": "2.4.24",
+    "@formatjs/intl-numberformat": "6.2.10",
+    "@formatjs/intl-pluralrules": "4.0.18",
+    "@formatjs/intl-relativetimeformat": "8.1.8",
     "@mattermost/react-native-emm": "1.1.1",
     "@mattermost/react-native-paste-input": "0.1.3",
     "@nozbe/watermelondb": "0.21.0",
@@ -29,11 +35,13 @@
     "jail-monkey": "2.3.3",
     "mime-db": "1.47.0",
     "moment-timezone": "0.5.33",
+    "nock": "13.1.0",
     "prop-types": "15.7.2",
     "react": "17.0.2",
     "react-intl": "5.15.8",
     "react-native": "0.64.0",
     "react-native-android-open-settings": "1.3.0",
+    "react-native-button": "3.0.1",
     "react-native-calendars": "1.1257.0",
     "react-native-device-info": "8.1.2",
     "react-native-document-picker": "5.0.3",
@@ -44,6 +52,7 @@
     "react-native-gesture-handler": "1.10.3",
     "react-native-haptic-feedback": "1.11.0",
     "react-native-hw-keyboard-event": "0.0.4",
+    "react-native-keyboard-aware-scroll-view": "0.9.4",
     "react-native-keyboard-tracking-view": "5.7.0",
     "react-native-keychain": "7.0.0",
     "react-native-linear-gradient": "2.5.6",
@@ -60,8 +69,9 @@
     "react-native-unimodules": "0.13.3",
     "react-native-vector-icons": "8.1.0",
     "react-native-video": "5.1.1",
-    "react-native-webview": "11.4.0",
+    "react-native-webview": "11.6.2",
     "react-native-youtube": "2.0.1",
+    "rn-fetch-blob": "0.12.0",
     "rn-placeholder": "3.0.3",
     "semver": "7.3.5",
     "serialize-error": "8.1.0",
@@ -87,7 +97,9 @@
     "@testing-library/react-native": "7.2.0",
     "@types/jest": "26.0.22",
     "@types/react": "17.0.3",
+    "@types/react-intl": "3.0.0",
     "@types/react-native": "0.64.4",
+    "@types/react-native-button": "3.0.0",
     "@types/react-native-share": "3.3.2",
     "@types/react-native-video": "5.0.4",
     "@types/react-test-renderer": "17.0.1",
@@ -109,6 +121,7 @@
     "eslint-plugin-jest": "24.3.5",
     "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#070ce792d105482ffb2b27cfc0b7e78b3d20acee",
     "eslint-plugin-react": "7.23.2",
+    "eslint-plugin-react-hooks": "4.2.0",
     "husky": "6.0.0",
     "isomorphic-fetch": "3.0.0",
     "jest": "26.6.3",
@@ -121,6 +134,7 @@
     "react-native-dev-menu": "4.0.2",
     "react-native-dotenv": "2.5.5",
     "react-native-storybook-loader": "2.0.2",
+    "react-test-renderer": "17.0.2",
     "ts-jest": "26.5.5",
     "typescript": "4.2.4",
     "underscore": "1.13.1",
diff --git a/packager/generateModulePaths.js b/packager/generateModulePaths.js
deleted file mode 100644
index 2c7d0099e..000000000
--- a/packager/generateModulePaths.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-/* eslint-disable no-console */
-const execSync = require('child_process').execSync;
-const fs = require('fs');
-const moduleNames = require('./moduleNames');
-
-const pjson = require('../package.json');
-const localPrefix = `${pjson.name}/`;
-
-// Transforming to Module Paths
-// This script will convert the module names found in moduleNames.js
-// to the absolute module path that we need.
-const modulePaths = moduleNames.map((moduleName) => {
-    if (moduleName.startsWith(localPrefix)) {
-        return `./${moduleName.substring(localPrefix.length)}`;
-    }
-    if (moduleName.endsWith('.js') || moduleName.endsWith('.ts')) {
-        return `./node_modules/${moduleName}`;
-    }
-    try {
-        const result = execSync(
-            `grep "@providesModule ${moduleName}" $(find . -name ${moduleName}\\\\.js) -l`,
-        ).toString().trim().split('\n')[0];
-
-        if (result != null) {
-            return result;
-        }
-    } catch (e) {
-        return null;
-    }
-    return null;
-});
-
-const paths = modulePaths.filter((path) => path != null).map((path) => `'${path}'`).join(',\n');
-
-const fileData = `module.exports = [${paths}];`;
-
-fs.writeFile('./packager/modulePaths.js', fileData, (err) => {
-    if (err) {
-        console.log(err);
-    }
-
-    console.log('Done');
-});
diff --git a/patches/react-native-button+3.0.1.patch b/patches/react-native-button+3.0.1.patch
new file mode 100644
index 000000000..d484eac71
--- /dev/null
+++ b/patches/react-native-button+3.0.1.patch
@@ -0,0 +1,28 @@
+diff --git a/node_modules/react-native-button/Button.js b/node_modules/react-native-button/Button.js
+index b248176..2ee35d5 100644
+--- a/node_modules/react-native-button/Button.js
++++ b/node_modules/react-native-button/Button.js
+@@ -71,7 +71,6 @@ export default class Button extends Component {
+       }
+ 
+       return (
+-        <View style={containerStyle}>
+           <TouchableNativeFeedback
+             {...touchableProps}
+             style={{flex: 1}}
+@@ -79,11 +78,12 @@ export default class Button extends Component {
+             accessibilityLabel={this.props.accessibilityLabel}
+             accessibilityRole="button"
+             background={background}>
+-            <View style={{padding: padding}}>
+-              {this._renderGroupedChildren()}
++              <View style={containerStyle}>
++                <View style={{padding: padding}}>
++                  {this._renderGroupedChildren()}
++                </View>
+             </View>
+           </TouchableNativeFeedback>
+-        </View>
+       );
+     }
+   }
diff --git a/patches/rn-fetch-blob+0.12.0.patch b/patches/rn-fetch-blob+0.12.0.patch
new file mode 100644
index 000000000..a97a6efe8
--- /dev/null
+++ b/patches/rn-fetch-blob+0.12.0.patch
@@ -0,0 +1,7792 @@
+diff --git a/node_modules/rn-fetch-blob/android/build.gradle b/node_modules/rn-fetch-blob/android/build.gradle
+index a4ca7a4..f3cd184 100644
+--- a/node_modules/rn-fetch-blob/android/build.gradle
++++ b/node_modules/rn-fetch-blob/android/build.gradle
+@@ -37,10 +37,13 @@ android {
+     }
+     productFlavors {
+     }
++    compileOptions {
++        sourceCompatibility 1.8
++        targetCompatibility 1.8
++    }
+ }
+
+ dependencies {
+     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
+-    //compile 'com.squareup.okhttp3:okhttp:+'
+-    //{RNFetchBlob_PRE_0.28_DEPDENDENCY}
++    implementation "com.squareup.okhttp3:okhttp:3.13.1"
+ }
+diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
+index 602d51d..78b7929 100644
+--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
++++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
+@@ -179,6 +179,11 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
+         RNFetchBlobFS.exists(path, callback);
+     }
+
++    @ReactMethod
++    public void existsWithDiffExt(String path, Callback callback) {
++        RNFetchBlobFS.existsWithDiffExt(path, callback);
++    }
++
+     @ReactMethod
+     public void cp(final String path, final String dest, final Callback callback) {
+         threadPool.execute(new Runnable() {
+diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java
+index adbe48b..b87d383 100644
+--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java
++++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java
+@@ -195,8 +195,8 @@ class RNFetchBlobBody extends RequestBody{
+         ReactApplicationContext ctx = RNFetchBlob.RCTContext;
+
+         for(FormField field : fields) {
+-            String data = field.data;
+-            String name = field.name;
++            String data = field.data.trim();
++            String name = field.name.trim();
+             // skip invalid fields
+             if(name == null || data == null)
+                 continue;
+@@ -256,8 +256,7 @@ class RNFetchBlobBody extends RequestBody{
+             }
+             // data field
+             else {
+-                header += "Content-Disposition: form-data; name=\"" + name + "\"\r\n";
+-                header += "Content-Type: " + field.mime + "\r\n\r\n";
++                header += "Content-Disposition: form-data; name=\"" + name + "\"\r\n\r\n";
+                 os.write(header.getBytes());
+                 byte[] fieldData = field.data.getBytes();
+                 os.write(fieldData);
+diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobConst.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobConst.java
+index b86902a..f1a16de 100644
+--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobConst.java
++++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobConst.java
+@@ -6,6 +6,7 @@ public class RNFetchBlobConst {
+     public static final String EVENT_PROGRESS = "RNFetchBlobProgress";
+     public static final String EVENT_HTTP_STATE = "RNFetchBlobState";
+     public static final String EVENT_MESSAGE = "RNFetchBlobMessage";
++    public static final String EVENT_SSL_TRUST_MESSAGE = "RNFetchBlobSslProblem";
+     public static final String FILE_PREFIX = "RNFetchBlob-file://";
+     public static final String CONTENT_PREFIX = "RNFetchBlob-content://";
+     public static final String FILE_PREFIX_BUNDLE_ASSET = "bundle-assets://";
+diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
+index a4d7015..f430865 100644
+--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
++++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java
+@@ -29,6 +29,7 @@ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.UUID;
++import java.util.regex.Pattern;
+
+ class RNFetchBlobFS {
+
+@@ -677,6 +678,46 @@ class RNFetchBlobFS {
+         }
+     }
+
++    /**
++     * Check if the file exists with a different extension and, if so,
++     * return the file path.
++     * @param path Path to check
++     * @param callback  JS context callback
++     */
++    static void existsWithDiffExt(String path, Callback callback) {
++            File file = new File(path);
++            String parent = file.getParent();
++            if (parent == null) {
++                callback.invoke("");
++                return;
++            }
++
++            File directory = new File(parent);
++            if (!directory.exists()) {
++                callback.invoke("");
++                return;
++            }
++
++            String filename = file.getName();
++            int extIndex = filename.lastIndexOf(".");
++            filename = extIndex == -1 ? filename : filename.substring(0, extIndex);
++
++            final Pattern p = Pattern.compile(filename + "\\.[a-z]{3,4}");
++            File[] files = directory.listFiles(new FileFilter() {
++                @Override
++                public boolean accept(File file) {
++                    return p.matcher(file.getName()).matches();
++                }
++            });
++
++            String filePath = "";
++            if (files != null && files.length != 0) {
++                filePath = files[0].getAbsolutePath();
++            }
++
++            callback.invoke(filePath);
++    }
++
+     /**
+      * List content of folder
+      * @param path Target folder
+diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
+index a8abd71..9078855 100644
+--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
++++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java
+@@ -233,7 +233,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+             if (this.options.trusty) {
+                 clientBuilder = RNFetchBlobUtils.getUnsafeOkHttpClient(client);
+             } else {
+-                clientBuilder = client.newBuilder();
++                clientBuilder = RNFetchBlobUtils.newOkHttpClientBuilder(client); // Emits warning if SSL connection problem encountered.
+             }
+
+             // wifi only, need ACCESS_NETWORK_STATE permission
+@@ -407,6 +407,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+                                 extended = new RNFetchBlobFileResp(
+                                         RNFetchBlob.RCTContext,
+                                         taskId,
++                                        originalResponse.headers(),
+                                         originalResponse.body(),
+                                         destPath,
+                                         options.overwrite);
+@@ -556,16 +557,13 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+                             return;
+                         }
+                         try {
+-                            encoder.encode(ByteBuffer.wrap(b).asCharBuffer());
+-                            // if the data contains invalid characters the following lines will be
+-                            // skipped.
++                            // Trying to decode the response directly as UTF-8.
+                             String utf8 = new String(b);
+                             callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_UTF8, utf8);
+                         }
+-                        // This usually mean the data is contains invalid unicode characters but still valid data,
+-                        // it's binary data, so send it as a normal string
+-                        catch(CharacterCodingException ignored) {
+-
++                        // This usually mean the data is contains invalid unicode characters, it's
++                        // binary data
++                        catch(Exception ignored) {
+                             if(responseFormat == ResponseFormat.UTF8) {
+                                 String utf8 = new String(b);
+                                 callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_UTF8, utf8);
+@@ -591,7 +589,19 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
+ //                    ignored.printStackTrace();
+                 }
+
+-                RNFetchBlobFileResp rnFetchBlobFileResp = (RNFetchBlobFileResp) responseBody;
++                RNFetchBlobFileResp rnFetchBlobFileResp;
++
++                try {
++                    rnFetchBlobFileResp = (RNFetchBlobFileResp) responseBody;
++                } catch (ClassCastException ex) {
++                    // unexpected response type
++                    if (responseBody != null) {
++                        callback.invoke("Unexpected FileStorage response file: " + responseBody.toString(), null);
++                    } else {
++                        callback.invoke("Unexpected FileStorage response with no file.", null);
++                    }
++                    return;
++                }
+
+                 if(rnFetchBlobFileResp != null && !rnFetchBlobFileResp.isDownloadComplete()){
+                     callback.invoke("Download interrupted.", null);
+diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobUtils.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobUtils.java
+index ab35fdd..a856e05 100644
+--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobUtils.java
++++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlobUtils.java
+@@ -6,12 +6,17 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+ import java.security.MessageDigest;
+ import java.security.cert.CertificateException;
++import java.security.KeyStore;
++import java.security.NoSuchAlgorithmException;
++import java.security.KeyStoreException;
+
+ import javax.net.ssl.HostnameVerifier;
++import javax.net.ssl.HttpsURLConnection;
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSession;
+ import javax.net.ssl.SSLSocketFactory;
+ import javax.net.ssl.TrustManager;
++import javax.net.ssl.TrustManagerFactory;
+ import javax.net.ssl.X509TrustManager;
+
+ import okhttp3.OkHttpClient;
+@@ -43,14 +48,16 @@ public class RNFetchBlobUtils {
+
+     }
+
+-    public static void emitWarningEvent(String data) {
++    public static void emitWarningEvent(String data, String... messageType) {
++        String msgType = messageType.length > 0 ? messageType[0] : RNFetchBlobConst.EVENT_MESSAGE;
++
+         WritableMap args = Arguments.createMap();
+         args.putString("event", "warn");
+         args.putString("detail", data);
+
+         // emit event to js context
+         RNFetchBlob.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+-                .emit(RNFetchBlobConst.EVENT_MESSAGE, args);
++                .emit(msgType, args);
+     }
+
+     public static OkHttpClient.Builder getUnsafeOkHttpClient(OkHttpClient client) {
+@@ -92,4 +99,72 @@ public class RNFetchBlobUtils {
+             throw new RuntimeException(e);
+         }
+     }
++
++    // Uses default, secure trust manager for connection validation.
++    public static OkHttpClient.Builder newOkHttpClientBuilder(OkHttpClient client) {
++        try {
++            final X509TrustManager defaultTrustManager = getDefaultTrustManager();
++
++            final X509TrustManager x509TrustManager = new X509TrustManager() {
++                @Override
++                public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
++                    defaultTrustManager.checkClientTrusted(chain, authType);
++                }
++
++                @Override
++                public void checkServerTrusted(java.security.cert.X509Certificate[] chain, final String authType) throws CertificateException {
++                    try {
++                        defaultTrustManager.checkServerTrusted(chain, authType);
++                    } catch(CertificateException ce) {
++                        emitWarningEvent("RNFetchBlob custom: Server presented problem with SSL handshake.", RNFetchBlobConst.EVENT_SSL_TRUST_MESSAGE);
++                        throw ce;
++                    }
++                }
++
++                @Override
++                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
++                    return defaultTrustManager.getAcceptedIssuers();
++                }
++            };
++
++            final TrustManager[] trustManagers = new TrustManager[]{x509TrustManager};
++
++            final SSLContext sslContext = SSLContext.getInstance("TLS");
++            sslContext.init(null, trustManagers, new java.security.SecureRandom());
++
++            final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
++            OkHttpClient.Builder builder = client.newBuilder();
++            builder.sslSocketFactory(sslSocketFactory, x509TrustManager);
++
++            builder.hostnameVerifier(new HostnameVerifier() {
++                @Override
++                public boolean verify(String hostname, SSLSession session) {
++                    HostnameVerifier hv = HttpsURLConnection.getDefaultHostnameVerifier();
++                    boolean result = hv.verify(hostname, session);
++                    if (!result) {
++                        emitWarningEvent("RNFetchBlob custom: Server presented problem with hostname verification.", RNFetchBlobConst.EVENT_SSL_TRUST_MESSAGE);
++                    }
++                    return result;
++                }
++            });
++
++            return builder;
++
++        } catch (Exception e) {
++            throw new RuntimeException(e);
++        }
++    }
++
++    public static X509TrustManager getDefaultTrustManager() throws NoSuchAlgorithmException, KeyStoreException {
++        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
++        trustManagerFactory.init((KeyStore) null); // Using null here initialises the TrustManagerFactory with the default trust store.
++
++        X509TrustManager defaultTrustManager = null;
++        for (TrustManager tm : trustManagerFactory.getTrustManagers()) {
++            if (tm instanceof X509TrustManager) {
++                defaultTrustManager = (X509TrustManager) tm;
++            }
++        }
++        return defaultTrustManager;
++    }
+ }
+diff --git a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
+index 2470eef..4e92989 100644
+--- a/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
++++ b/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
+@@ -14,6 +14,7 @@ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
+
++import okhttp3.Headers;
+ import okhttp3.MediaType;
+ import okhttp3.ResponseBody;
+ import okio.Buffer;
+@@ -28,6 +29,7 @@ import okio.Timeout;
+ public class RNFetchBlobFileResp extends ResponseBody {
+
+     String mTaskId;
++    Headers headers;
+     ResponseBody originalBody;
+     String mPath;
+     long bytesDownloaded = 0;
+@@ -35,10 +37,11 @@ public class RNFetchBlobFileResp extends ResponseBody {
+     FileOutputStream ofStream;
+     boolean isEndMarkerReceived;
+
+-    public RNFetchBlobFileResp(ReactApplicationContext ctx, String taskId, ResponseBody body, String path, boolean overwrite) throws IOException {
++    public RNFetchBlobFileResp(ReactApplicationContext ctx, String taskId, Headers headers, ResponseBody body, String path, boolean overwrite) throws IOException {
+         super();
+         this.rctContext = ctx;
+         this.mTaskId = taskId;
++        this.headers = headers;
+         this.originalBody = body;
+         assert path != null;
+         this.mPath = path;
+@@ -67,7 +70,18 @@ public class RNFetchBlobFileResp extends ResponseBody {
+
+     @Override
+     public long contentLength() {
+-        return originalBody.contentLength();
++        long expectedBytes = originalBody.contentLength();
++        String uncompressHeader = "X-Uncompressed-Content-Length";
++        String uncompressedLength = headers.get(uncompressHeader);
++        if (uncompressedLength == null) {
++            uncompressedLength = headers.get(uncompressHeader.toLowerCase());
++        }
++
++        if (uncompressedLength != null && uncompressedLength.length() > 0) {
++            expectedBytes = Long.parseLong(uncompressedLength);
++        }
++
++        return expectedBytes;
+     }
+
+     public boolean isDownloadComplete() {
+@@ -94,6 +108,7 @@ public class RNFetchBlobFileResp extends ResponseBody {
+                     // End marker has been received for chunked download
+                     isEndMarkerReceived = true;
+                 }
++
+                 RNFetchBlobProgressConfig reportConfig = RNFetchBlobReq.getReportProgress(mTaskId);
+
+                 if (contentLength() != 0) {
+diff --git a/node_modules/rn-fetch-blob/cba/index.js b/node_modules/rn-fetch-blob/cba/index.js
+new file mode 100644
+index 0000000..f3730ac
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/cba/index.js
+@@ -0,0 +1,7 @@
++import {NativeModules} from 'react-native'
++
++const RNFetchBlob = NativeModules.RNFetchBlob
++
++export default {
++    selectCertificate: RNFetchBlob.selectCertificate
++}
+diff --git a/node_modules/rn-fetch-blob/fs.js b/node_modules/rn-fetch-blob/fs.js
+index 77bbe7a..c0292ec 100644
+--- a/node_modules/rn-fetch-blob/fs.js
++++ b/node_modules/rn-fetch-blob/fs.js
+@@ -348,6 +348,27 @@ function exists(path: string): Promise<boolean> {
+
+ }
+
++/**
++ * Check if the file exists with a different extension.
++ * @param  {string} path Path to check
++ * @return {Promise<boolean>}
++ */
++function existsWithDiffExt(path: string): Promise<boolean> {
++  return new Promise((resolve, reject) => {
++    if (typeof path !== 'string') {
++      return reject(addCode('EINVAL', new TypeError('Missing argument "path" ')))
++    }
++    try {
++      RNFetchBlob.existsWithDiffExt(path, (fileWithExt) => {
++        resolve(fileWithExt)
++      })
++    }catch (err){
++      reject(addCode('EUNSPECIFIED', new Error(err)))
++    }
++  })
++
++}
++
+ function slice(src: string, dest: string, start: number, end: number): Promise {
+   if (typeof src !== 'string' || typeof dest !== 'string') {
+     return reject(addCode('EINVAL', new TypeError('Missing argument "src" and/or "destination"')))
+@@ -419,6 +440,7 @@ export default {
+   readFile,
+   hash,
+   exists,
++  existsWithDiffExt,
+   createFile,
+   isDir,
+   stat,
+@@ -427,5 +449,5 @@ export default {
+   dirs,
+   slice,
+   asset,
+-  df
++  df,
+ }
+diff --git a/node_modules/rn-fetch-blob/index.d.ts b/node_modules/rn-fetch-blob/index.d.ts
+index 58dc9e1..7a2bc3f 100644
+--- a/node_modules/rn-fetch-blob/index.d.ts
++++ b/node_modules/rn-fetch-blob/index.d.ts
+@@ -627,6 +627,8 @@ export interface RNFetchBlobConfig {
+      * Fix IOS request timeout issue #368 by change default request setting to defaultSessionConfiguration, and make backgroundSessionConfigurationWithIdentifier optional
+      */
+     IOSBackgroundTask?: boolean;
++
++    certificate?: string;
+ }
+
+ export interface AddAndroidDownloads {
+diff --git a/node_modules/rn-fetch-blob/index.js b/node_modules/rn-fetch-blob/index.js
+index 8ab5e96..66b0b60 100644
+--- a/node_modules/rn-fetch-blob/index.js
++++ b/node_modules/rn-fetch-blob/index.js
+@@ -25,6 +25,8 @@ import _ from 'lodash'
+ import android from './android'
+ import ios from './ios'
+ import JSONStream from './json-stream'
++import cba from './cba';
++
+ const {
+   RNFetchBlobSession,
+   readStream,
+@@ -574,5 +576,6 @@ export default {
+   fs,
+   wrap,
+   polyfill,
+-  JSONStream
++  JSONStream,
++  cba,
+ }
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer.storyboard b/node_modules/rn-fetch-blob/ios/KeyShareConsumer.storyboard
+new file mode 100644
+index 0000000..19e70b9
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer.storyboard
+@@ -0,0 +1,74 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
++    <device id="retina4_0" orientation="portrait">
++        <adaptation id="fullscreen"/>
++    </device>
++    <dependencies>
++        <deployment version="2352" identifier="iOS"/>
++        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
++        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
++        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
++        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
++    </dependencies>
++    <scenes>
++        <!--View Controller-->
++        <scene sceneID="tne-QT-ifu">
++            <objects>
++                <viewController id="BYZ-38-t0r" customClass="CBAViewController" sceneMemberID="viewController">
++                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
++                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
++                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
++                        <subviews>
++                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="s2F-x5-Lv6">
++                                <rect key="frame" x="14" y="58" width="292" height="482"/>
++                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
++                                <connections>
++                                    <outlet property="dataSource" destination="BYZ-38-t0r" id="2eX-Ud-Pqn"/>
++                                    <outlet property="delegate" destination="BYZ-38-t0r" id="uB2-Oo-O5Z"/>
++                                </connections>
++                            </tableView>
++                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fCA-uB-nbn">
++                                <rect key="frame" x="20" y="20" width="79" height="30"/>
++                                <constraints>
++                                    <constraint firstAttribute="width" constant="79" id="gZp-zo-dTl"/>
++                                </constraints>
++                                <state key="normal" title="Import Key">
++                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
++                                </state>
++                                <connections>
++                                    <action selector="openImportDocumentPicker:" destination="BYZ-38-t0r" eventType="touchUpInside" id="QQR-Nf-Rse"/>
++                                </connections>
++                            </button>
++                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hhu-eU-kQH">
++                                <rect key="frame" x="258" y="20" width="48" height="30"/>
++                                <state key="normal" title="Cancel">
++                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
++                                </state>
++                                <connections>
++                                    <action selector="close:" destination="BYZ-38-t0r" eventType="touchUpInside" id="N2N-e8-aR3"/>
++                                </connections>
++                            </button>
++                        </subviews>
++                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
++                        <constraints>
++                            <constraint firstItem="s2F-x5-Lv6" firstAttribute="trailing" secondItem="hhu-eU-kQH" secondAttribute="trailing" id="22Z-D9-3i3"/>
++                            <constraint firstItem="hhu-eU-kQH" firstAttribute="top" secondItem="k11-9p-T25" secondAttribute="top" id="77c-ha-usL"/>
++                            <constraint firstItem="s2F-x5-Lv6" firstAttribute="centerX" secondItem="k11-9p-T25" secondAttribute="centerX" id="Kp3-FJ-pX7"/>
++                            <constraint firstItem="s2F-x5-Lv6" firstAttribute="top" secondItem="fCA-uB-nbn" secondAttribute="bottom" constant="8" symbolic="YES" id="LS1-e5-n55"/>
++                            <constraint firstItem="s2F-x5-Lv6" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="-2" id="Pco-NV-Fdf"/>
++                            <constraint firstItem="fCA-uB-nbn" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="4" id="hjV-xC-rfW"/>
++                            <constraint firstItem="fCA-uB-nbn" firstAttribute="baseline" secondItem="hhu-eU-kQH" secondAttribute="baseline" id="o5a-K8-ztC"/>
++                            <constraint firstItem="k11-9p-T25" firstAttribute="bottom" secondItem="s2F-x5-Lv6" secondAttribute="bottom" constant="28" id="yUG-Ri-Rz9"/>
++                        </constraints>
++                        <viewLayoutGuide key="safeArea" id="k11-9p-T25"/>
++                    </view>
++                    <connections>
++                        <outlet property="tableViewKeyChain" destination="s2F-x5-Lv6" id="GnK-3t-7Wi"/>
++                    </connections>
++                </viewController>
++                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
++            </objects>
++            <point key="canvasLocation" x="564" y="538"/>
++        </scene>
++    </scenes>
++</document>
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/CBAViewController.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/CBAViewController.h
+new file mode 100644
+index 0000000..09017a1
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/CBAViewController.h
+@@ -0,0 +1,39 @@
++//
++//  ViewController.h
++//  KeyShareConsumer
++
++#import <UIKit/UIKit.h>
++#import "KeyChainDataSource.h"
++#import <React/RCTBridgeModule.h>
++
++@interface CBAViewController : UIViewController <UITableViewDelegate, UITableViewDataSource>
++{
++    //provides information about key chain contents
++    KeyChainDataSource* keyChain;
++
++    //table view to display summary of key chain contents
++    IBOutlet UITableView* tableViewKeyChain;
++
++    //string to receive password entered by user
++    NSString* passwordFromUser;
++
++    //buffer to receive PKCS12 file read from iCloud
++    NSData* pkcs12Data;
++}
++
++//Callbacks used by KeyDetailViewController for iTunes file sharing
++- (void)import:(int)index;
++- (void)dismissWithoutImporting:(int)index;
++- (void)setCallback:(RCTResponseSenderBlock)callback;
++
++//Button click handlers
++- (IBAction)openImportDocumentPicker:(id)sender;
++- (IBAction)close:(id)sender;
++
++@property (nonatomic, retain) UITableView *tableViewKeyChain;
++@property (nonatomic, retain) KeyChainDataSource *keyChain;
++@property (nonatomic, strong) NSMutableArray *composeCallbacks;
++@property (nonatomic, assign) int imageWidth;
++
++@end
++
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/CBAViewController.m b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/CBAViewController.m
+new file mode 100644
+index 0000000..102d2d6
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/CBAViewController.m
+@@ -0,0 +1,459 @@
++//
++//  ViewController.m
++//  KeyShareConsumer
++
++#import "CBAViewController.h"
++#import <UIKit/UIKit.h>
++#import <CommonCrypto/CommonDigest.h>
++#import <React/RCTBridgeModule.h>
++
++#import "ZipFile.h"
++#import "FileInZipInfo.h"
++#import "ZipReadStream.h"
++
++@interface CBAViewController ()<UIDocumentPickerDelegate>
++@end
++
++@implementation CBAViewController
++@synthesize tableViewKeyChain;
++@synthesize keyChain;
++
++//------------------------------------------------------------------------------
++#pragma mark - View controller functions
++//------------------------------------------------------------------------------
++- (void)viewDidLoad
++{
++    [super viewDidLoad];
++
++    //Set this class as the table delegate
++    [tableViewKeyChain setDelegate:self];
++
++    //Create a key chain data source object targeting identities
++    keyChain = [[KeyChainDataSource alloc] initWithMode:KSM_Identities];
++
++    //load the key chain to serve as backend for the table view
++    [keyChain LoadKeyChainContents];
++}
++
++- (void)setCallback:(RCTResponseSenderBlock)callback {
++    if (_composeCallbacks == nil) {
++        _composeCallbacks = [[NSMutableArray alloc] init];
++    }
++
++    [_composeCallbacks addObject:callback];
++}
++
++- (RCTResponseSenderBlock)getCallback {
++    RCTResponseSenderBlock callback = [_composeCallbacks lastObject];
++    [_composeCallbacks removeLastObject];
++    return callback;
++}
++
++- (void)didReceiveMemoryWarning
++{
++    [super didReceiveMemoryWarning];
++    // Dispose of any resources that can be recreated.
++}
++
++//------------------------------------------------------------------------------
++#pragma mark - Button click handlers
++//------------------------------------------------------------------------------
++- (IBAction)openImportDocumentPicker:(id)sender
++{
++    //Clear the pasteboard, since a password may be provided via that mechanism
++    UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
++    [pasteboard setString:@""];
++    passwordFromUser = @"";
++
++    NSUserDefaults* standardDefaults = [NSUserDefaults standardUserDefaults];
++    [standardDefaults synchronize];
++
++    NSMutableArray* utis = [[NSMutableArray alloc]init];
++
++    if([standardDefaults boolForKey:@"toggle_com_rsa_pkcs12"])
++        [utis addObject:@"com.rsa.pkcs-12"];
++    if([standardDefaults boolForKey:@"toggle_purebred_select_all"])
++        [utis addObject:@"purebred.select.all"];
++    if([standardDefaults boolForKey:@"toggle_purebred_select_all_user"])
++        [utis addObject:@"purebred.select.all_user"];
++    if([standardDefaults boolForKey:@"toggle_purebred_select_signature"])
++        [utis addObject:@"purebred.select.signature"];
++    if([standardDefaults boolForKey:@"toggle_purebred_select_encryption"])
++        [utis addObject:@"purebred.select.encryption"];
++    if([standardDefaults boolForKey:@"toggle_purebred_select_authentication"])
++        [utis addObject:@"purebred.select.authentication"];
++    if([standardDefaults boolForKey:@"toggle_purebred_select_device"])
++        [utis addObject:@"purebred.select.device"];
++    if([standardDefaults boolForKey:@"toggle_purebred_select_no_filter"])
++        [utis addObject:@"purebred.select.no_filter"];
++    if([standardDefaults boolForKey:@"toggle_purebred_zip_all"])
++        [utis addObject:@"purebred.zip.all"];
++    if([standardDefaults boolForKey:@"toggle_purebred_zip_all_user"])
++        [utis addObject:@"purebred.zip.all_user"];
++    if([standardDefaults boolForKey:@"toggle_purebred_zip_signature"])
++        [utis addObject:@"purebred.zip.signature"];
++    if([standardDefaults boolForKey:@"toggle_purebred_zip_encryption"])
++        [utis addObject:@"purebred.zip.encryption"];
++    if([standardDefaults boolForKey:@"toggle_purebred_zip_authentication"])
++        [utis addObject:@"purebred.zip.authentication"];
++    if([standardDefaults boolForKey:@"toggle_purebred_zip_device"])
++        [utis addObject:@"purebred.zip.device"];
++    if([standardDefaults boolForKey:@"toggle_purebred_zip_no_filter"])
++        [utis addObject:@"purebred.zip.no_filter"];
++
++    if(0 == [utis count])
++        [utis addObject:@"com.rsa.pkcs-12"];
++
++    //Display the UIDocumentPickerViewController to enable the user to select a key to import. Purebred Registration only works with UIDocumentPickerModeOpen mode.
++    UIDocumentPickerViewController *documentPicker = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:utis inMode:UIDocumentPickerModeOpen];
++    documentPicker.delegate = self;
++    documentPicker.modalPresentationStyle = UIModalPresentationFormSheet;
++    [self presentViewController:documentPicker animated:YES completion:nil];
++}
++
++- (IBAction)close:(id)sender
++{
++    [self getCallback](@[[NSNull null]]);
++    [self dismissViewControllerAnimated:@YES completion:nil];
++}
++
++//------------------------------------------------------------------------------
++#pragma mark - UIDocumentPickerViewController delegate functions
++//------------------------------------------------------------------------------
++- (void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller
++{
++    NSLog(@"Cancelled");
++}
++
++- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url {
++    if(controller.documentPickerMode == UIDocumentPickerModeOpen)
++    {
++        BOOL startAccessingWorked = [url startAccessingSecurityScopedResource];
++        NSURL *ubiquityURL = [[NSFileManager defaultManager] URLForUbiquityContainerIdentifier:nil];
++        NSLog(@"ubiquityURL %@",ubiquityURL);
++        NSLog(@"start %d",startAccessingWorked);
++
++        NSFileCoordinator *fileCoordinator = [[NSFileCoordinator alloc] init];
++        NSError *error;
++        [fileCoordinator coordinateReadingItemAtURL:url options:0 error:&error byAccessor:^(NSURL *newURL) {
++            NSData *data = [NSData dataWithContentsOfURL:newURL];
++
++            NSLog(@"error %@",error);
++            NSLog(@"data %@",data);
++            if(nil == data)
++                return;
++
++            // Read the password from the pasteboard
++            UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
++            NSString* pw = [pasteboard string];
++
++            if(nil != pw && 0 != [pw length])
++            {
++                passwordFromUser = pw;
++            }
++
++            pkcs12Data = data;
++        }];
++        [url stopAccessingSecurityScopedResource];
++
++        if(nil == passwordFromUser || 0 == [passwordFromUser length])
++        {
++            UIAlertView * alert = [[UIAlertView alloc] initWithTitle:@"Enter Password" message:@"Please enter the password for the selected PKCS #12 file" delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles: @"OK", nil];
++            alert.alertViewStyle = UIAlertViewStyleSecureTextInput;
++            [alert show];
++        }
++        else{
++            [self importP12:pkcs12Data password:passwordFromUser];
++        }
++    }
++}
++
++//------------------------------------------------------------------------------
++#pragma mark - Table view data source
++//------------------------------------------------------------------------------
++- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
++{
++    return 1;
++}
++
++- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
++{
++    //The KeyChainDataSource is written to supply cells in groups where each group is an identity.
++    //This view is written to list each identity on one row.  Thus, return the number of sections
++    //recognized by the data source.
++    return [keyChain numItems];
++}
++#define FONT_SIZE 14.0f
++#define CELL_CONTENT_MARGIN 10.0f
++
++- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath;
++{
++    NSString *text = [keyChain GetIdentityNameAtIndex:indexPath.row];
++
++    CGRect frameRect = [tableView frame];
++    CGSize constraint = CGSizeMake(frameRect.size.width - (CELL_CONTENT_MARGIN * 2), 20000.0f);
++
++    CGSize size = [text boundingRectWithSize:constraint
++                                     options:NSStringDrawingUsesLineFragmentOrigin
++                                  attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:FONT_SIZE]}
++                                     context:nil].size;
++
++    CGFloat height = MAX(size.height, 44.0f);
++
++    return height + (CELL_CONTENT_MARGIN * 2);
++}
++
++- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
++{
++    static NSString *CellIdentifier = @"Cell";
++
++    UILabel* label = nil;
++    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
++    if (cell == nil)
++    {
++        cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] ;
++
++        label = [[UILabel alloc] initWithFrame:CGRectZero] ;
++        [label setLineBreakMode:NSLineBreakByCharWrapping];
++        [label setMinimumScaleFactor:FONT_SIZE];
++        [label setNumberOfLines:0];
++        [label setFont:[UIFont systemFontOfSize:FONT_SIZE]];
++        [label setTag:1];
++
++        [[cell contentView] addSubview:label];
++
++    }
++    NSString *text = [keyChain GetIdentityNameAtIndex:indexPath.row];
++
++    CGRect frameRect = [tableView frame];
++    CGSize constraint = CGSizeMake(frameRect.size.width - (CELL_CONTENT_MARGIN * 2), 20000.0f);
++
++    CGSize size = [text boundingRectWithSize:constraint
++                                     options:NSStringDrawingUsesLineFragmentOrigin
++                                  attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:FONT_SIZE]}
++                                     context:nil].size;
++
++    if (!label)
++        label = (UILabel*)[cell viewWithTag:1];
++
++    //display the keys icon for each entry in the table
++    UIImage* image = [UIImage imageNamed:@"0155-keys.png"];
++    if (image != nil) {
++        [cell.imageView setImage:image];
++        [cell setSeparatorInset:UIEdgeInsetsZero];
++    }
++
++    self.imageWidth = 44;
++
++    [label setText:text];
++    [label setFrame:CGRectMake((CELL_CONTENT_MARGIN*2) + self.imageWidth, CELL_CONTENT_MARGIN, frameRect.size.width - (CELL_CONTENT_MARGIN * 2) - self.imageWidth, MAX(size.height, 44.0f))];
++
++    return cell;
++}
++
++- (UITableViewCellEditingStyle)tableView:(UITableView *)aTableView
++           editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
++{
++    return UITableViewCellEditingStyleDelete;
++}
++
++- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath
++{
++    // If the table view is asking to commit a delete command...
++    if (editingStyle == UITableViewCellEditingStyleDelete)
++    {
++        // We remove the row being deleted from the source
++        [keyChain removeObjectAtIndex:[indexPath row]];
++
++        [tableView reloadData];
++    }
++}
++
++//------------------------------------------------------------------------------
++#pragma mark - Table view delegate
++//------------------------------------------------------------------------------
++- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
++{
++    NSString *identityToUse = [keyChain GetIdentityNameAtIndex:indexPath.row];
++    [self getCallback](@[identityToUse]);
++    [self dismissViewControllerAnimated:@YES completion:nil];
++}
++
++
++//------------------------------------------------------------------------------
++#pragma mark - Utility functions
++//------------------------------------------------------------------------------
++-(void)resetKeychain {
++    [self deleteAllKeysForSecClass:kSecClassGenericPassword];
++    [self deleteAllKeysForSecClass:kSecClassInternetPassword];
++    [self deleteAllKeysForSecClass:kSecClassCertificate];
++    [self deleteAllKeysForSecClass:kSecClassKey];
++    [self deleteAllKeysForSecClass:kSecClassIdentity];
++}
++
++-(void)deleteAllKeysForSecClass:(CFTypeRef)secClass {
++    NSMutableDictionary* dict = [NSMutableDictionary dictionary];
++    [dict setObject:(__bridge id)secClass forKey:(__bridge id)kSecClass];
++    OSStatus result = SecItemDelete((__bridge CFDictionaryRef) dict);
++    NSAssert(result == noErr || result == errSecItemNotFound, @"Error deleting keychain data (%ld)", (long)result);
++}
++
++//Called to solicit password from user when file is chosen from iCloud (or other non-Purebred source)
++- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
++{
++    if(1 == buttonIndex)
++    {
++        passwordFromUser = [[alertView textFieldAtIndex:0] text];
++        if(nil != passwordFromUser && 0 != [passwordFromUser length])
++        {
++            [self importP12:pkcs12Data password:passwordFromUser];
++        }
++    }
++}
++
++//Called to parse a PKCS12 object, decrypt it and import it into app's key chain
++- (void)importP12:(NSData*) pkcs12DataToImport password:(NSString*)password
++{
++    CFDataRef inPKCS12Data = (__bridge CFDataRef)pkcs12DataToImport;
++
++    OSStatus securityError = errSecSuccess;
++
++    //SecPKCS12Import requires a dictionary with a single value (only one option is supported)
++    NSMutableDictionary * optionsDictionary = [[NSMutableDictionary alloc] init];
++    [optionsDictionary setObject:(id)password forKey:(id)kSecImportExportPassphrase];
++    [optionsDictionary setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnRef];
++    [optionsDictionary setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnData];
++    [optionsDictionary setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnAttributes];
++
++    //Create an array to receive the data parsed from the PKCS12 blob
++    CFArrayRef items = CFArrayCreate(NULL, 0, 0, NULL);
++
++    //Parse the PKCS12 blob
++    securityError = SecPKCS12Import(inPKCS12Data, (CFDictionaryRef)optionsDictionary, &items);
++    if (securityError == errSecAuthFailed) {
++        NSString *alertMessage = [NSString stringWithFormat:@"Failed to import key from PKCS #12 file with wrong password\nerror code= %d", (int)securityError];
++        NSLog(@"%@", alertMessage);
++        dispatch_async(dispatch_get_main_queue(), ^{
++            UIAlertController *alertController = [UIAlertController
++                                                  alertControllerWithTitle:@"Import Error"
++                                                  message:alertMessage
++                                                  preferredStyle:UIAlertControllerStyleAlert];
++            [alertController addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:nil]];
++            [self presentViewController:alertController animated:YES completion:nil];
++        });
++    }
++    else if(securityError == errSecSuccess)
++    {
++        long count = CFArrayGetCount(items);
++        if(count > 1)
++        {
++            NSLog(@"%s %d %s - %s", __FILE__, __LINE__, __PRETTY_FUNCTION__, "SecPKCS12Import returned more than one item.  Ignoring all but the first item.");
++        }
++
++        for(long ii = 0; ii < count; ++ii)
++        {
++            //get the first time from the array populated by SecPKCS12Import
++            if (CFArrayGetCount(items) > 0) {
++                CFDictionaryRef pkcs12Contents = (CFDictionaryRef)CFArrayGetValueAtIndex(items, ii);
++
++                //we're primarily interested in the identity value
++                if(CFDictionaryContainsKey(pkcs12Contents, kSecImportItemIdentity))
++                {
++                    //Grab the identity from the dictionary
++                    SecIdentityRef identity = (SecIdentityRef)CFDictionaryGetValue(pkcs12Contents, kSecImportItemIdentity);
++
++                    SecCertificateRef certRef = NULL;
++                    SecIdentityCopyCertificate(identity, &certRef);
++                    CFStringRef summaryRef = SecCertificateCopySubjectSummary(certRef);
++                    NSString *tagstr = (__bridge_transfer NSString*)summaryRef;
++
++                    NSMutableDictionary* dict = [[NSMutableDictionary alloc]init];
++                    [dict setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnPersistentRef];
++                    [dict setObject:(__bridge id)identity forKey:(id)kSecValueRef];
++                    [dict setObject:tagstr forKey:(id)kSecAttrLabel];
++//                    [optionsDictionary setObject:(id)kSecAttrAccessGroup forKey:(id)kSecAttrAccessGroup];
++                    CFTypeRef persistent_ref;
++                    securityError = SecItemAdd((CFDictionaryRef)dict, &persistent_ref);
++
++                    if(errSecSuccess != securityError)
++                    {
++                        NSLog(@"%s %d %s - %s %s", __FILE__, __LINE__, __PRETTY_FUNCTION__, "SecItemAdd failed to import identity harvested from PKCS #12 data with error code ", [[[NSNumber numberWithInt:securityError] stringValue] UTF8String]);
++
++                        if(errSecDuplicateItem == securityError)
++                        {
++                            NSLog(@"Failed to import because item is there already");
++                        }
++                        else
++                        {
++                            NSString *alertMessage = [NSString stringWithFormat:@"Failed to import key from PKCS #12 file with error code %d", (int)securityError];
++                            NSLog(@"%@", alertMessage);
++                            dispatch_async(dispatch_get_main_queue(), ^{
++                                UIAlertController *alertController = [UIAlertController
++                                                                      alertControllerWithTitle:@"Import Error"
++                                                                      message:alertMessage
++                                                                      preferredStyle:UIAlertControllerStyleAlert];
++                                [alertController addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:nil]];
++                                [self presentViewController:alertController animated:YES completion:nil];
++                            });
++                        }
++                    }
++
++                    [keyChain LoadKeyChainContents];
++                    [[self tableViewKeyChain] reloadData];
++                }
++            }
++        }
++    }
++    else
++    {
++        //Get the destination folder for the files
++        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
++        NSString *documentsDirectory = [paths objectAtIndex:0];
++
++        //Generate a file name using the sha1 hash of the certificate with .p8 extension for private key and .der for certificate
++        NSString* zipFile = @"tmp.zip";
++        NSString *zipPath = [documentsDirectory stringByAppendingPathComponent:zipFile];
++
++        [pkcs12DataToImport writeToFile:zipPath atomically:YES];
++
++        ZipFile *unzipFile= [[ZipFile alloc] initWithFileName:zipPath mode:ZipFileModeUnzip];
++        if(NULL != unzipFile)
++        {
++            NSArray *infos= [unzipFile listFileInZipInfos];
++            [unzipFile goToFirstFileInZip];
++
++            for (FileInZipInfo *info in infos)
++            {
++                ZipReadStream *read1= [unzipFile readCurrentFileInZip];
++
++                NSData *data= [read1 readDataOfLength:info.length];
++
++                if(data)
++                {
++                    [self importP12:data password:password];
++                }
++
++
++                [read1 finishedReading];
++                [unzipFile goToNextFileInZip];
++            }
++
++            [unzipFile close];
++            [[NSFileManager defaultManager] removeItemAtPath:zipPath error:nil];
++        }
++        else{
++            NSString *alertMessage = [NSString stringWithFormat:@"Failed to parse or decrypt PKCS #12 file with error code %d", (int)securityError];
++            NSLog(@"%@", alertMessage);
++            dispatch_async(dispatch_get_main_queue(), ^{
++                UIAlertController *alertController = [UIAlertController
++                                                      alertControllerWithTitle:@"Import Error"
++                                                      message:alertMessage
++                                                      preferredStyle:UIAlertControllerStyleAlert];
++                [alertController addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:nil]];
++                [self presentViewController:alertController animated:YES completion:nil];
++            });
++        }
++    }
++}
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/KeyChainDataSource.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/KeyChainDataSource.h
+new file mode 100644
+index 0000000..7a7ccbe
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/KeyChainDataSource.h
+@@ -0,0 +1,85 @@
++//
++//  KeyChainDataSource.h
++//  KeyShareConsumer
++
++#import <Foundation/Foundation.h>
++
++/**
++ KeyChainDataSource has three modes of usage, each defined by the type of
++ item sought in the key chain.
++ */
++enum KeyChainDataSourceMode
++{
++    KSM_Certificates,
++    KSM_Identities,
++    KSM_Keys
++};
++
++/**
++ The KeyChainDataSource class is intended to function as a data source for table views displaying
++ various information from a key chain.  Each KeyStore instance is associated with a type
++ of key chain item, i.e., identity, certificate, key.
++
++ Each item is a section in the table with various information appropriate to the item
++ displayed in the section.
++
++ Should only be used with tables with table style UITableViewStyleGrouped.
++ */
++@interface KeyChainDataSource : NSObject
++{
++
++@public
++    //!When false, empty attributes are not returned, when true empty attributes are returned with
++    // empty string value.
++    bool displayEmptyAttributes;
++
++    //!userQuery can be specified to change the search behavior applied by KeyChainDataSource
++    // before serving data to a table view.
++    NSMutableDictionary* userQuery;
++
++    //!mode indicates the type of object associated with an instance (set upon instantiation)
++    enum KeyChainDataSourceMode mode;
++
++@private
++    //!initialized indicates whether LoadKeyChainContents has been successfully executed.
++    bool initialized;
++
++    //!items contains the values retrieved from the key chain
++    NSMutableArray* items;
++
++    //!dictionary with friendly attribute names (prepared in init)
++    NSMutableDictionary* attrNames;
++}
++
++//Public properties
++@property (nonatomic, assign) bool displayEmptyAttributes;
++@property (nonatomic, retain) NSMutableDictionary* userQuery;
++
++//Private properties
++@property (nonatomic, retain) NSArray* items;
++@property (nonatomic, assign) enum KeyChainDataSourceMode mode;
++@property (nonatomic, assign) bool initialized;
++@property (nonatomic, retain) NSMutableDictionary* attrNames;
++
++- (id) initWithMode:(enum KeyChainDataSourceMode)mode;
++- (void) ClearContents;
++- (void) LoadKeyChainContents;
++- (NSString*) GetIdentityNameAtIndex:(long)index;
++- (NSString*) GetEmailAddressAtIndex:(long)index;
++- (void) removeObjectAtIndex:(long)index;
++- (int) numItems;
++- (SecIdentityRef) GetIdentityAtIndex:(long)index;
++- (NSData*) GetPKCS12AtIndex:(long)index;
++- (NSData*) GetPrivateKeyAtIndex:(long)index;
++
++- (int) numAttrGroups:(long)index;
++- (NSString*) getAttrStringAtIndex:(long)index attrGroup:(long)attrGroup;
++
++- (NSString*) getAttrNameAtSection:(long)sectionIndex attrIndex:(long)attrIndex;
++- (NSString*) getAttrValueAtSection:(long)sectionIndex attrIndex:(long)attrIndex;
++- (NSString*) getAttrValueAtSection:(long)sectionIndex attrType:(CFTypeRef)attrType;
++
++- (SecCertificateRef) getCertificateAt:(long)index;
++- (SecIdentityRef) GetIdentityByName:(NSString *)name;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/KeyChainDataSource.mm b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/KeyChainDataSource.mm
+new file mode 100644
+index 0000000..ceb52a8
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/KeyChainDataSource.mm
+@@ -0,0 +1,947 @@
++//
++//  KeyChainDataSource.mm
++//  KeyShareConsumer
++
++#import "KeyChainDataSource.h"
++#import <UIKit/UIKit.h>
++
++#include <sstream>
++
++//--------------------------------------------------------------
++// Arrays containing attributes for each type of item associated
++// with this class: certificate, key, identity
++//--------------------------------------------------------------
++CFTypeRef g_certAttrs[] = {
++    kSecAttrAccessible,
++    kSecAttrAccessGroup,
++    kSecAttrCertificateType,
++    kSecAttrCertificateEncoding,
++    kSecAttrLabel,
++    kSecAttrSubject,
++    kSecAttrIssuer,
++    kSecAttrSerialNumber,
++    kSecAttrSubjectKeyID,
++    kSecAttrPublicKeyHash,
++    NULL
++};
++
++CFTypeRef g_keyAttrs[] = {
++    kSecAttrAccessible,
++    kSecAttrAccessGroup,
++    kSecAttrKeyClass,
++    kSecAttrLabel,
++    kSecAttrApplicationLabel,
++    kSecAttrIsPermanent,
++    kSecAttrApplicationTag,
++    kSecAttrKeyType,
++    kSecAttrKeySizeInBits,
++    kSecAttrEffectiveKeySize,
++    kSecAttrCanEncrypt,
++    kSecAttrCanDecrypt,
++    kSecAttrCanDerive,
++    kSecAttrCanSign,
++    kSecAttrCanVerify,
++    kSecAttrCanWrap,
++    kSecAttrCanUnwrap,
++    NULL
++};
++
++CFTypeRef g_identityAttrs[] = {
++    kSecAttrAccessible,
++    kSecAttrAccessGroup,
++    kSecAttrCertificateType,
++    kSecAttrCertificateEncoding,
++    kSecAttrLabel,
++    kSecAttrSubject,
++    kSecAttrIssuer,
++    kSecAttrSerialNumber,
++    kSecAttrSubjectKeyID,
++    kSecAttrPublicKeyHash,
++    kSecAttrKeyClass,
++    kSecAttrApplicationLabel,
++    kSecAttrIsPermanent,
++    kSecAttrApplicationTag,
++    kSecAttrKeyType,
++    kSecAttrKeySizeInBits,
++    kSecAttrEffectiveKeySize,
++    kSecAttrCanEncrypt,
++    kSecAttrCanDecrypt,
++    kSecAttrCanDerive,
++    kSecAttrCanSign,
++    kSecAttrCanVerify,
++    kSecAttrCanWrap,
++    kSecAttrCanUnwrap,
++    NULL
++};
++
++//--------------------------------------------------------------
++// Arrays containing attributes that are grouped together in a
++// single table cell for display purposes, i.e., a single string
++// is returned containing information for all attributes in the
++// group.
++//--------------------------------------------------------------
++CFTypeRef g_keyRelatedAttrs[] = {
++    kSecAttrKeyClass,
++    kSecAttrKeyType,
++    kSecAttrKeySizeInBits,
++    kSecAttrEffectiveKeySize,
++    NULL
++};
++
++CFTypeRef g_capabilityRelatedAttrs[] = {
++    kSecAttrCanEncrypt,
++    kSecAttrCanDecrypt,
++    kSecAttrCanDerive,
++    kSecAttrCanSign,
++    kSecAttrCanVerify,
++    kSecAttrCanWrap,
++    kSecAttrCanUnwrap,
++    NULL
++};
++
++CFTypeRef g_certRelatedAttrs[] = {
++    kSecAttrCertificateType,
++    kSecAttrCertificateEncoding,
++    kSecAttrSubject,
++    kSecAttrIssuer,
++    kSecAttrSerialNumber,
++    kSecAttrSubjectKeyID,
++    kSecAttrPublicKeyHash,
++    NULL
++};
++
++CFTypeRef g_miscRelatedAttrs[] = {
++    kSecAttrLabel,
++    kSecAttrAccessible,
++    kSecAttrAccessGroup,
++    kSecAttrApplicationLabel,
++    kSecAttrIsPermanent,
++    kSecAttrApplicationTag,
++    NULL
++};
++
++//--------------------------------------------------------------
++// Internal conversion helper functions
++//--------------------------------------------------------------
++@interface KeyChainDataSource (ConversionRoutines)
++
++    //These return strings that should be autoreleased
++    + (NSString*) getCFDateAsString:(CFDateRef) date;
++    + (NSString*) getCFNumberAsString:(CFNumberRef) number;
++    + (NSString*) getCFBooleanAsString:(CFBooleanRef) cfBool;
++    + (NSString*) getCertificateTypeAsString:(CFNumberRef) number;
++    + (NSString*) getKeyTypeAsString:(CFNumberRef) number;
++    + (NSString*) getKeyClassAsString:(CFNumberRef) number;
++    + (NSString*) getCertificateEncodingAsString:(CFNumberRef) number;
++    + (NSString*) getAttrAccessibleAsString:(CFStringRef) attrAccessible;
++
++    //The return freshly alloc'ed string
++    + (NSString*) getDataAsAsciiHexString:(NSData*)data;
++    + (NSString*) getDataAsNameString:(NSData*)data;
++
++@end
++
++@implementation KeyChainDataSource (ConversionRoutines)
++
+++ (NSString*) getCFDateAsString:(CFDateRef) date
++{
++    NSDate* nsDate = (__bridge NSDate*)date;
++    return [nsDate description];
++}
++
+++ (NSString*) getCFNumberAsString:(CFNumberRef) number
++{
++    NSNumber* nsNumber = (__bridge NSNumber*)number;
++    return [nsNumber stringValue];
++}
++
+++ (NSString*) getCFBooleanAsString:(CFBooleanRef) cfBool
++{
++    if(CFBooleanGetValue(cfBool))
++        return NSLocalizedString(@"Yes", nil);
++    else
++        return NSLocalizedString(@"No", nil);
++}
++
+++ (NSString*) getCertificateTypeAsString:(CFNumberRef) number
++{
++    NSNumber* nsNumber = (__bridge NSNumber*)number;
++    switch([nsNumber intValue])
++    {
++        case 1:
++            return NSLocalizedString(@"X509v1", nil);
++        case 2:
++            return NSLocalizedString(@"X509v2", nil);
++        case 3:
++            return NSLocalizedString(@"X509v3", nil);
++        default:
++            return NSLocalizedString(@"Unknown type", nil);
++    }
++}
++
+++ (NSString*) getKeyClassAsString:(CFNumberRef) number
++{
++    NSString* nStr = [self getCFNumberAsString:number];
++
++    if(NSOrderedSame == [(NSString*)kSecAttrKeyClassPublic compare:nStr])
++        return NSLocalizedString(@"Public key", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrKeyClassPrivate compare:nStr])
++        return NSLocalizedString(@"Private key", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrKeyClassSymmetric compare:nStr])
++        return NSLocalizedString(@"Symmetric key", nil);
++    else
++        return NSLocalizedString(@"Unknown type", nil);
++}
++
+++ (NSString*) getKeyTypeAsString:(CFNumberRef) number
++{
++    NSString* nStr = [self getCFNumberAsString:number];
++
++    if(NSOrderedSame == [(NSString*)kSecAttrKeyTypeRSA compare:nStr])
++        return NSLocalizedString(@"RSA", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrKeyTypeRSA compare:nStr])
++        return NSLocalizedString(@"Elliptic curve", nil);
++    else
++        return NSLocalizedString(@"Unknown type", nil);
++}
++
+++ (NSString*) getAttrAccessibleAsString:(CFStringRef) attrAccessible
++{
++    NSString* nStr = (__bridge NSString*)attrAccessible;
++
++    if(NSOrderedSame == [(NSString*)kSecAttrAccessibleWhenUnlocked compare:nStr])
++        return NSLocalizedString(@"kSecAttrAccessibleWhenUnlocked", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrAccessibleAfterFirstUnlock compare:nStr])
++        return NSLocalizedString(@"kSecAttrAccessibleAfterFirstUnlock", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrAccessibleAlways compare:nStr])
++        return NSLocalizedString(@"kSecAttrAccessibleAlways", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrAccessibleWhenUnlockedThisDeviceOnly compare:nStr])
++        return NSLocalizedString(@"kSecAttrAccessibleWhenUnlockedThisDeviceOnly", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly compare:nStr])
++        return NSLocalizedString(@"kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly", nil);
++    else if(NSOrderedSame == [(NSString*)kSecAttrAccessibleAlwaysThisDeviceOnly compare:nStr])
++        return NSLocalizedString(@"kSecAttrAccessibleAlwaysThisDeviceOnly", nil);
++    else
++        return NSLocalizedString(@"Unknown type", nil);
++}
++
+++ (NSString*) getCertificateEncodingAsString:(CFNumberRef) number
++{
++    NSNumber* nsNumber = (__bridge NSNumber*)number;
++    if(3 == [nsNumber intValue])
++        return NSLocalizedString(@"DER", nil);
++    else
++        return NSLocalizedString(@"Unknown type", nil);
++}
++
+++ (NSString *) hexString:(NSData*)data
++{
++    NSUInteger bytesCount = [data length];
++    if (bytesCount) {
++        const char *hexChars = "0123456789ABCDEF";
++        const unsigned char *dataBuffer = (unsigned char*)[data bytes];
++        char *chars = (char*)malloc(sizeof(char) * (bytesCount * 2 + 1));
++        char *s = chars;
++        for (unsigned i = 0; i < bytesCount; ++i) {
++            *s++ = hexChars[((*dataBuffer & 0xF0) >> 4)];
++            *s++ = hexChars[(*dataBuffer & 0x0F)];
++            dataBuffer++;
++        }
++        *s = '\0';
++        NSString *hexString = [NSString stringWithUTF8String:chars];
++        free(chars);
++        return hexString;
++    }
++    return @"";
++}
++
+++ (NSString*) getDataAsAsciiHexString:(NSData*)data
++{
++    return [self hexString:data];
++}
++
+++ (NSString*) getDataAsNameString:(NSData*)data
++{
++    //Implement after linking useful PKE support
++    return nil;
++}
++
++@end
++
++//--------------------------------------------------------------
++// Internal conversion helper functions
++//--------------------------------------------------------------
++@interface KeyChainDataSource (PrivateMethods)
++
++- (void) populateAttrMap;
++- (int) countAttributesAtIndex:(long)index;
++- (NSString*) getAttrValueAsString:(CFTypeRef)attribute value:(CFTypeRef)value;
++
++@end
++
++@implementation KeyChainDataSource (PrivateMethods)
++
++- (void) populateAttrMap
++{
++    if(attrNames)
++    {
++        //[attrNames release];
++        attrNames = nil;
++    }
++
++    attrNames = [[NSMutableDictionary alloc] init];
++
++    //Set up the friendly names for each attribute that can be read from one
++    //of the three types of items this class cares about.
++    [attrNames setObject:(id)@"Accessible" forKey:(id)kSecAttrAccessible];
++    [attrNames setObject:(id)@"Access group" forKey:(id)kSecAttrAccessGroup];
++    [attrNames setObject:(id)@"Certificate type" forKey:(id)kSecAttrCertificateType];
++    [attrNames setObject:(id)@"Certificate encoding" forKey:(id)kSecAttrCertificateEncoding];
++    [attrNames setObject:(id)@"Label" forKey:(id)kSecAttrLabel];
++
++    //Re-enable these if linking in a certificate parser
++    //[attrNames setObject:(id)@"Subject" forKey:(id)kSecAttrSubject];
++    //[attrNames setObject:(id)@"Issuer" forKey:(id)kSecAttrIssuer];
++    [attrNames setObject:(id)@"Serial number" forKey:(id)kSecAttrSerialNumber];
++    [attrNames setObject:(id)@"Subject key ID" forKey:(id)kSecAttrSubjectKeyID];
++    [attrNames setObject:(id)@"Public key hash" forKey:(id)kSecAttrPublicKeyHash];
++    [attrNames setObject:(id)@"Key class" forKey:(id)kSecAttrKeyClass];
++    [attrNames setObject:(id)@"Application label" forKey:(id)kSecAttrApplicationLabel];
++    [attrNames setObject:(id)@"Is permanent" forKey:(id)kSecAttrIsPermanent];
++    [attrNames setObject:(id)@"Application tag" forKey:(id)kSecAttrApplicationTag];
++    [attrNames setObject:(id)@"Key type" forKey:(id)kSecAttrKeyType];
++    [attrNames setObject:(id)@"Key size in bits" forKey:(id)kSecAttrKeySizeInBits];
++    [attrNames setObject:(id)@"Effective key size" forKey:(id)kSecAttrEffectiveKeySize];
++    [attrNames setObject:(id)@"Can encrypt" forKey:(id)kSecAttrCanEncrypt];
++    [attrNames setObject:(id)@"Can decrypt" forKey:(id)kSecAttrCanDecrypt];
++    [attrNames setObject:(id)@"Can derive" forKey:(id)kSecAttrCanDerive];
++    [attrNames setObject:(id)@"Can sign" forKey:(id)kSecAttrCanSign];
++    [attrNames setObject:(id)@"Can verify" forKey:(id)kSecAttrCanVerify];
++    [attrNames setObject:(id)@"Can wrap" forKey:(id)kSecAttrCanWrap];
++    [attrNames setObject:(id)@"Can unwrap" forKey:(id)kSecAttrCanUnwrap];
++}
++
++- (int) countAttributesAtIndex:(long)index
++{
++    int count = 0;
++
++    CFTypeRef* attrs = NULL;
++
++    switch (mode) {
++        case KSM_Certificates:
++            attrs = g_certAttrs;
++            break;
++        case KSM_Identities:
++            attrs = g_identityAttrs;
++            break;
++        case KSM_Keys:
++            attrs = g_keyAttrs;
++            break;
++        default:
++            return 0;
++    }
++
++    @try
++    {
++        CFDictionaryRef dict = (__bridge CFDictionaryRef)[items objectAtIndex:index];
++
++        for(int ii = 0; attrs[ii]; ++ii)
++        {
++            if(true == CFDictionaryGetValueIfPresent(dict, attrs[ii], NULL))
++                ++count;
++        }
++    }
++    @catch (NSException* rangeException)
++    {
++        return 0;
++    }
++
++    return count;
++}
++
++- (NSString*) getAttrValueAsString:(CFTypeRef)attribute value:(CFTypeRef)value
++ {
++     NSString* attributeValueString = nil;
++
++    if(kSecAttrAccessible == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getAttrAccessibleAsString:(CFStringRef)value];
++    }
++    else if(kSecAttrAccessGroup == attribute)
++    {
++        attributeValueString = [[NSString alloc] initWithString:(__bridge NSString*)value] ;
++    }
++    else if(kSecAttrCertificateType == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCertificateTypeAsString:(CFNumberRef)value];
++    }
++    else if(kSecAttrCertificateEncoding == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCertificateEncodingAsString:(CFNumberRef)value];
++    }
++    else if(kSecAttrLabel == attribute)
++    {
++        attributeValueString = [[NSString alloc] initWithString:(__bridge NSString*)value] ;
++    }
++    else if(kSecAttrSubject == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getDataAsNameString:(__bridge NSData*)value];
++    }
++    else if(kSecAttrIssuer == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getDataAsNameString:(__bridge NSData*)value];
++    }
++    else if(kSecAttrSerialNumber == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getDataAsAsciiHexString:(__bridge NSData*)value];
++    }
++    else if(kSecAttrSubjectKeyID == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getDataAsAsciiHexString:(__bridge NSData*)value];
++    }
++    else if(kSecAttrPublicKeyHash == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getDataAsAsciiHexString:(__bridge NSData*)value];
++    }
++    else if(kSecAttrKeyClass == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getKeyClassAsString:(CFNumberRef)value];
++    }
++    else if(kSecAttrApplicationLabel == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getDataAsAsciiHexString:(__bridge NSData*)value];
++    }
++    else if(kSecAttrIsPermanent == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else if(kSecAttrApplicationTag == attribute)
++    {
++        if(CFGetTypeID(value) == CFDataGetTypeID())
++        {
++            NSData* d = (__bridge NSData*)value;
++            attributeValueString = [NSString stringWithUTF8String:(char*)[d bytes]];
++        }
++        else
++        {
++            attributeValueString = [[NSString alloc] initWithString:(__bridge NSString*)value] ;
++        }
++    }
++    else if(kSecAttrKeyType == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getKeyTypeAsString:(CFNumberRef)value];
++    }
++    else if(kSecAttrKeySizeInBits == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFNumberAsString:(CFNumberRef)value];
++    }
++    else if(kSecAttrEffectiveKeySize == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFNumberAsString:(CFNumberRef)value];
++    }
++    else if(kSecAttrCanEncrypt == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else if(kSecAttrCanDecrypt == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else if(kSecAttrCanDerive == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else if(kSecAttrCanSign == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else if(kSecAttrCanVerify == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else if(kSecAttrCanWrap == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else if(kSecAttrCanUnwrap == attribute)
++    {
++        attributeValueString = [KeyChainDataSource getCFBooleanAsString:(CFBooleanRef)value];
++    }
++    else
++    {
++        attributeValueString = @"Unknown value";
++    }
++
++    return attributeValueString;
++}
++
++@end
++
++//--------------------------------------------------------------
++// KeyChainDataSource implementation
++//--------------------------------------------------------------
++@implementation KeyChainDataSource
++
++//Public members
++@synthesize displayEmptyAttributes;
++@synthesize userQuery;
++
++//Private members
++@synthesize items;
++@synthesize mode;
++@synthesize initialized;
++@synthesize attrNames;
++
++- (int) numAttrGroups:(long)index
++{
++    return [self countAttributesAtIndex:index];
++}
++
++- (NSString*) getAttrStringForGroup:(CFTypeRef*)attrArray forItem:(long)index
++{
++    std::ostringstream oss;
++    for(int ii = 0; attrArray[ii]; ++ii)
++    {
++        NSString* attrName = (NSString*)[attrNames objectForKey:(__bridge id)attrArray[ii]];
++        if(attrName)
++        {
++            NSString* attrValue = [self getAttrValueAtSection:index attrType:attrArray[ii]];
++            if(attrValue)
++            {
++                oss << [attrName UTF8String] << ": " << [attrValue UTF8String] << std::endl;
++            }
++        }
++    }
++    NSString* retVal = [[NSString alloc] initWithCString:oss.str().c_str() encoding:NSUTF8StringEncoding] ;
++    return retVal;
++}
++
++- (NSString*) getAttrStringAtIndex:(long)index attrGroup:(long)attrGroup
++{
++    return [self getAttrValueAtSection:index attrIndex:attrGroup];
++}
++
++/**
++ LoadKeyChainContents prepares a dictionary containing a query filter based on the current mode.
++ The results are stored in the items member variable with mode-specific contents.
++ */
++- (void) LoadKeyChainContents
++{
++    [self ClearContents];
++
++    OSStatus resultCode = noErr;
++
++    if(nil == userQuery)
++    {
++        NSMutableDictionary * query = [[NSMutableDictionary alloc] init];
++
++        //Set up the invariant pieces of the query
++        [query setObject:(id)kSecMatchLimitAll forKey:(id)kSecMatchLimit];
++        [query setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnRef];
++        [query setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnData];
++        [query setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnAttributes];
++//        [query setObject:@"com.mattermost.rnbeta" forKey:(id)kSecAttrAccessGroup];
++
++        //Set up the mode-specific pieces of the query
++        switch(mode)
++        {
++            case KSM_Certificates:
++            {
++                [query setObject:(id)kSecClassCertificate forKey:(id)kSecClass];
++                break;
++            }
++            case KSM_Identities:
++            {
++                [query setObject:(id)kSecClassIdentity forKey:(id)kSecClass];
++                break;
++            }
++            case KSM_Keys:
++            {
++                [query setObject:(id)kSecClassKey forKey:(id)kSecClass];
++                break;
++            }
++        }
++
++        CFTypeRef result = nil;
++        //Execute the query saving the results in items.
++        resultCode = SecItemCopyMatching((CFDictionaryRef)query, &result);
++        items = (__bridge_transfer NSMutableArray*)result;
++
++        //[query release];
++    }
++    else
++    {
++        CFTypeRef result = nil;
++        resultCode = SecItemCopyMatching((CFDictionaryRef)userQuery, &result);
++        items = (__bridge_transfer NSMutableArray*)result;
++    }
++
++    if(resultCode != noErr)
++    {
++        //clean up anything that might have landed in items
++        [self ClearContents];
++    }
++    else
++    {
++        //set the initialized flag
++        initialized = true;
++    }
++
++    return;
++}
++
++- (SecIdentityRef) GetIdentityByName:(NSString *)name
++{
++
++    NSMutableDictionary * query = [[NSMutableDictionary alloc] init];
++    NSData* tag = [name dataUsingEncoding:NSUTF8StringEncoding];
++
++    //Set up the invariant pieces of the query
++    [query setObject:(id)kSecMatchLimitAll forKey:(id)kSecMatchLimit];
++    [query setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnRef];
++    [query setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnData];
++    [query setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnAttributes];
++    [query setObject:(id)kSecClassIdentity forKey:(id)kSecClass];
++    [query setObject:name forKey:(id)kSecAttrLabel];
++
++    OSStatus resultCode = noErr;
++    CFTypeRef result = nil;
++    //Execute the query saving the results in items.
++    resultCode = SecItemCopyMatching((CFDictionaryRef)query, &result);
++    if (CFArrayGetCount((CFArrayRef)result) > 0) {
++        CFDictionaryRef item = (CFDictionaryRef)CFArrayGetValueAtIndex((CFArrayRef)result, 0);
++        if (item != nil) {
++            SecIdentityRef identity = nil;
++            CFTypeRef value;
++            if(CFDictionaryGetValueIfPresent(item, kSecValueRef, &value))
++            {
++                identity = (SecIdentityRef)value;
++            }
++
++            return identity;
++        }
++    }
++    return nil;
++}
++
++//--------------------------------------------------------------
++// KeyChainDataSource initialization/destruction
++//--------------------------------------------------------------
++- (id) init
++{
++    self = [super init];
++    if(self)
++    {
++        mode = KSM_Identities;
++        initialized = false;
++        items = nil;
++        displayEmptyAttributes = false;
++        [self populateAttrMap];
++    }
++    return self;
++}
++
++- (id) initWithMode:(enum KeyChainDataSourceMode)kcdsMode
++{
++    self = [super init];
++    if(self)
++    {
++        mode = kcdsMode;
++        initialized = false;
++        items = nil;
++        displayEmptyAttributes = false;
++        [self populateAttrMap];
++    }
++    return self;
++}
++
++- (void)dealloc
++{
++    //[items release];
++    items = nil;
++
++    //[attrNames release];
++    attrNames = nil;
++
++    //[userQuery release];
++    userQuery = nil;
++
++    [self ClearContents];
++    //[super dealloc];
++}
++
++- (void) ClearContents
++{
++    //[items release];
++    items = nil;
++
++    initialized = false;
++}
++
++- (int) numItems
++{
++    //each item gets its own section
++    if(nil == items)
++        return 0;
++    else
++        return [items count];
++}
++
++- (NSString*) GetEmailAddressAtIndex:(long)index
++{
++    //Implement after linking useful PKE support
++    return nil;
++}
++
++- (NSString*) GetCommonNameAtIndex:(long)index
++{
++    SecCertificateRef certRef = [self getCertificateAt:index];
++    if(certRef)
++    {
++        CFStringRef summaryRef = SecCertificateCopySubjectSummary(certRef);
++        return (__bridge_transfer NSString*)summaryRef;
++    }
++
++    return nil;
++}
++- (NSString*) GetIdentityNameAtIndex:(long)index
++{
++    //look for email address first, failing that use the default keychain label
++    NSString* emailAddress = [self GetEmailAddressAtIndex:index];
++    if(!emailAddress)
++    {
++        NSString* subject = [self GetCommonNameAtIndex:index];
++        if(!subject)
++            return [self getAttrValueAtSection:index attrType:kSecAttrLabel];
++        else
++            return subject;
++    }
++    else
++        return emailAddress;
++}
++
++- (SecIdentityRef) GetIdentityAtIndex:(long)index
++{
++    if(index >= [items count])
++        return nil;
++    CFDictionaryRef item = (__bridge CFDictionaryRef)[items objectAtIndex:index];
++
++    SecIdentityRef identity = nil;
++    CFTypeRef value;
++    if(CFDictionaryGetValueIfPresent(item, kSecValueRef, &value))
++    {
++        identity = (SecIdentityRef)value;
++    }
++
++    return identity;
++}
++
++- (NSData*) GetPrivateKeyAtIndex:(long)index
++{
++    if(index >= [items count])
++        return nil;
++    CFDictionaryRef item = (__bridge CFDictionaryRef)[items objectAtIndex:index];
++
++    NSData* privateKey = nil;
++    CFTypeRef label;
++    if(CFDictionaryGetValueIfPresent(item, kSecValueData, &label))
++    {
++        CFDataRef aCFString = (CFDataRef)label;
++        privateKey = (__bridge NSData *)aCFString;
++    }
++    return privateKey;
++}
++
++- (void) removeObjectAtIndex:(long)index
++{
++    if(index >= [items count])
++        return;
++
++    CFDictionaryRef item = (__bridge CFDictionaryRef)[items objectAtIndex:index];
++
++    CFTypeRef value;
++    if(CFDictionaryGetValueIfPresent(item, kSecValueRef, &value))
++    {
++        SecIdentityRef identity = (SecIdentityRef)value;
++
++        NSMutableDictionary * query = [[NSMutableDictionary alloc] init];
++
++        //Set up the invariant pieces of the query
++        [query setObject:(__bridge id)identity forKey:(id)kSecValueRef];
++
++        //Execute the query saving the results in items.
++        OSStatus resultCode = SecItemDelete((CFDictionaryRef) query);
++        query = nil;
++
++        if(errSecSuccess == resultCode)
++        {
++            [self LoadKeyChainContents];
++        }
++        else
++        {
++            NSLog(@"Failed to delete selected identity with error code %d.", (int)resultCode);
++
++        }
++    }
++}
++
++- (NSString*) getAttrNameAtSection:(long)sectionIndex attrIndex:(long)attrIndex
++{
++    CFTypeRef attribute, value;
++    NSString* attrFriendlyName = nil;
++
++    @try
++    {
++        CFDictionaryRef dict = (__bridge CFDictionaryRef)[items objectAtIndex:sectionIndex];
++        CFTypeRef* attrs = NULL;
++
++        switch (mode) {
++            case KSM_Certificates:
++                attrs = g_certAttrs;
++                break;
++            case KSM_Identities:
++                attrs = g_identityAttrs;
++                break;
++            case KSM_Keys:
++                attrs = g_keyAttrs;
++                break;
++            default:
++                return 0;
++        }
++
++        for(int ii = 0, jj = 0; attrs[ii]; ++ii)
++        {
++            if(CFDictionaryGetValueIfPresent(dict, attrs[ii], &value))
++            {
++                if(jj == attrIndex)
++                {
++                    attribute = attrs[ii];
++                    break;
++                }
++                else
++                    ++jj;
++            }
++        }
++    }
++    @catch (NSException* rangeException)
++    {
++        return 0;
++    }
++
++    //get the friendly name of the attribute
++    attrFriendlyName = (NSString*)[attrNames objectForKey:(__bridge id)attribute];
++    if(nil == attrFriendlyName)
++        attrFriendlyName = NSLocalizedString(@"Unrecognized attribute",nil);
++
++    return attrFriendlyName;
++}
++
++/**
++ This function returns the attrIndex-th present value from the sectionIndex-th item
++ */
++- (NSString*) getAttrValueAtSection:(long)sectionIndex attrIndex:(long)attrIndex
++{
++    CFTypeRef attribute, value;
++
++    @try
++    {
++        CFDictionaryRef dict = (__bridge CFDictionaryRef)[items objectAtIndex:sectionIndex];
++        CFTypeRef* attrs = NULL;
++
++        switch (mode) {
++            case KSM_Certificates:
++                attrs = g_certAttrs;
++                break;
++            case KSM_Identities:
++                attrs = g_identityAttrs;
++                break;
++            case KSM_Keys:
++                attrs = g_keyAttrs;
++                break;
++            default:
++                return 0;
++        }
++
++        for(int ii = 0, jj = 0; attrs[ii]; ++ii)
++        {
++            if(CFDictionaryGetValueIfPresent(dict, attrs[ii], &value))
++            {
++                if(jj == attrIndex)
++                {
++                    attribute = attrs[ii];
++                    break;
++                }
++                else
++                    ++jj;
++            }
++        }
++    }
++    @catch (NSException* rangeException)
++    {
++        return nil;
++    }
++
++    return [self getAttrValueAsString:attribute value:value];
++}
++
++- (NSString*) getAttrValueAtSection:(long)sectionIndex attrType:(CFTypeRef)attrType
++{
++    CFTypeRef value;
++
++    @try
++    {
++        CFDictionaryRef dict = (__bridge CFDictionaryRef)[items objectAtIndex:sectionIndex];
++        if(!CFDictionaryGetValueIfPresent(dict, attrType, &value))
++        {
++            return nil;
++        }
++    }
++    @catch (NSException* rangeException)
++    {
++        return nil;
++    }
++
++    return [self getAttrValueAsString:attrType value:value];
++}
++
++- (SecCertificateRef) getCertificateAt:(long)index
++{
++    if(index >= [items count])
++       return nil;
++
++    switch (mode) {
++        case KSM_Certificates:
++        {
++            CFDictionaryRef dict = (__bridge CFDictionaryRef)[items objectAtIndex:index];
++            SecCertificateRef cert = (SecCertificateRef)CFDictionaryGetValue(dict, kSecValueRef);
++            return cert;
++        }
++        case KSM_Identities:
++        {
++            CFDictionaryRef dict = (__bridge CFDictionaryRef)[items objectAtIndex:index];
++            SecIdentityRef identity = (SecIdentityRef)CFDictionaryGetValue(dict, kSecValueRef);
++            SecCertificateRef cert = nil;
++            OSStatus stat = SecIdentityCopyCertificate(identity, &cert);
++            if(errSecSuccess == stat)
++                return cert;
++            else
++                return nil;
++        }
++        case KSM_Keys:
++        {
++            return nil;
++        }
++        default:
++        {
++            return nil;
++        }
++    }
++}
++
++- (NSData*) GetPKCS12AtIndex:(long)index
++{
++    //Implement after linking useful PKE support
++    return nil;
++}
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/ioapi.c b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/ioapi.c
+new file mode 100644
+index 0000000..f1bee23
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/ioapi.c
+@@ -0,0 +1,177 @@
++/* ioapi.c -- IO base function header for compress/uncompress .zip
++   files using zlib + zip or unzip API
++
++   Version 1.01e, February 12th, 2005
++
++   Copyright (C) 1998-2005 Gilles Vollant
++*/
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#include "zlib.h"
++#include "ioapi.h"
++
++
++
++/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
++
++#ifndef SEEK_CUR
++#define SEEK_CUR    1
++#endif
++
++#ifndef SEEK_END
++#define SEEK_END    2
++#endif
++
++#ifndef SEEK_SET
++#define SEEK_SET    0
++#endif
++
++voidpf ZCALLBACK fopen_file_func OF((
++   voidpf opaque,
++   const char* filename,
++   int mode));
++
++uLong ZCALLBACK fread_file_func OF((
++   voidpf opaque,
++   voidpf stream,
++   void* buf,
++   uLong size));
++
++uLong ZCALLBACK fwrite_file_func OF((
++   voidpf opaque,
++   voidpf stream,
++   const void* buf,
++   uLong size));
++
++long ZCALLBACK ftell_file_func OF((
++   voidpf opaque,
++   voidpf stream));
++
++long ZCALLBACK fseek_file_func OF((
++   voidpf opaque,
++   voidpf stream,
++   uLong offset,
++   int origin));
++
++int ZCALLBACK fclose_file_func OF((
++   voidpf opaque,
++   voidpf stream));
++
++int ZCALLBACK ferror_file_func OF((
++   voidpf opaque,
++   voidpf stream));
++
++
++voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
++   voidpf opaque;
++   const char* filename;
++   int mode;
++{
++    FILE* file = NULL;
++    const char* mode_fopen = NULL;
++    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
++        mode_fopen = "rb";
++    else
++    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
++        mode_fopen = "r+b";
++    else
++    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
++        mode_fopen = "wb";
++
++    if ((filename!=NULL) && (mode_fopen != NULL))
++        file = fopen(filename, mode_fopen);
++    return file;
++}
++
++
++uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
++   voidpf opaque;
++   voidpf stream;
++   void* buf;
++   uLong size;
++{
++    uLong ret;
++    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
++    return ret;
++}
++
++
++uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
++   voidpf opaque;
++   voidpf stream;
++   const void* buf;
++   uLong size;
++{
++    uLong ret;
++    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
++    return ret;
++}
++
++long ZCALLBACK ftell_file_func (opaque, stream)
++   voidpf opaque;
++   voidpf stream;
++{
++    long ret;
++    ret = ftell((FILE *)stream);
++    return ret;
++}
++
++long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
++   voidpf opaque;
++   voidpf stream;
++   uLong offset;
++   int origin;
++{
++    int fseek_origin=0;
++    long ret;
++    switch (origin)
++    {
++    case ZLIB_FILEFUNC_SEEK_CUR :
++        fseek_origin = SEEK_CUR;
++        break;
++    case ZLIB_FILEFUNC_SEEK_END :
++        fseek_origin = SEEK_END;
++        break;
++    case ZLIB_FILEFUNC_SEEK_SET :
++        fseek_origin = SEEK_SET;
++        break;
++    default: return -1;
++    }
++    ret = 0;
++    fseek((FILE *)stream, offset, fseek_origin);
++    return ret;
++}
++
++int ZCALLBACK fclose_file_func (opaque, stream)
++   voidpf opaque;
++   voidpf stream;
++{
++    int ret;
++    ret = fclose((FILE *)stream);
++    return ret;
++}
++
++int ZCALLBACK ferror_file_func (opaque, stream)
++   voidpf opaque;
++   voidpf stream;
++{
++    int ret;
++    ret = ferror((FILE *)stream);
++    return ret;
++}
++
++void fill_fopen_filefunc (pzlib_filefunc_def)
++  zlib_filefunc_def* pzlib_filefunc_def;
++{
++    pzlib_filefunc_def->zopen_file = fopen_file_func;
++    pzlib_filefunc_def->zread_file = fread_file_func;
++    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
++    pzlib_filefunc_def->ztell_file = ftell_file_func;
++    pzlib_filefunc_def->zseek_file = fseek_file_func;
++    pzlib_filefunc_def->zclose_file = fclose_file_func;
++    pzlib_filefunc_def->zerror_file = ferror_file_func;
++    pzlib_filefunc_def->opaque = NULL;
++}
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/ioapi.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/ioapi.h
+new file mode 100644
+index 0000000..7d457ba
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/ioapi.h
+@@ -0,0 +1,75 @@
++/* ioapi.h -- IO base function header for compress/uncompress .zip
++   files using zlib + zip or unzip API
++
++   Version 1.01e, February 12th, 2005
++
++   Copyright (C) 1998-2005 Gilles Vollant
++*/
++
++#ifndef _ZLIBIOAPI_H
++#define _ZLIBIOAPI_H
++
++
++#define ZLIB_FILEFUNC_SEEK_CUR (1)
++#define ZLIB_FILEFUNC_SEEK_END (2)
++#define ZLIB_FILEFUNC_SEEK_SET (0)
++
++#define ZLIB_FILEFUNC_MODE_READ      (1)
++#define ZLIB_FILEFUNC_MODE_WRITE     (2)
++#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
++
++#define ZLIB_FILEFUNC_MODE_EXISTING (4)
++#define ZLIB_FILEFUNC_MODE_CREATE   (8)
++
++
++#ifndef ZCALLBACK
++
++#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
++#define ZCALLBACK CALLBACK
++#else
++#define ZCALLBACK
++#endif
++#endif
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
++typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
++typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
++typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
++typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
++typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
++typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
++
++typedef struct zlib_filefunc_def_s
++{
++    open_file_func      zopen_file;
++    read_file_func      zread_file;
++    write_file_func     zwrite_file;
++    tell_file_func      ztell_file;
++    seek_file_func      zseek_file;
++    close_file_func     zclose_file;
++    testerror_file_func zerror_file;
++    voidpf              opaque;
++} zlib_filefunc_def;
++
++
++
++void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
++
++#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
++#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
++#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
++#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
++#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
++#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
++
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/mztools.c b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/mztools.c
+new file mode 100644
+index 0000000..b51d0e0
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/mztools.c
+@@ -0,0 +1,282 @@
++/*
++  Additional tools for Minizip
++  Code: Xavier Roche '2004
++  License: Same as ZLIB (www.gzip.org)
++*/
++
++/* Code */
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "zlib.h"
++#include "unzip.h"
++#include "mztools.h"
++
++#define READ_8(adr)  ((unsigned char)*(adr))
++#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
++#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
++
++#define WRITE_8(buff, n) do { \
++  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
++} while(0)
++#define WRITE_16(buff, n) do { \
++  WRITE_8((unsigned char*)(buff), n); \
++  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
++} while(0)
++#define WRITE_32(buff, n) do { \
++  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
++  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
++} while(0)
++
++extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
++const char* file;
++const char* fileOut;
++const char* fileOutTmp;
++uLong* nRecovered;
++uLong* bytesRecovered;
++{
++  int err = Z_OK;
++  FILE* fpZip = fopen(file, "rb");
++  FILE* fpOut = fopen(fileOut, "wb");
++  FILE* fpOutCD = fopen(fileOutTmp, "wb");
++  if (fpZip != NULL &&  fpOut != NULL) {
++    int entries = 0;
++    uLong totalBytes = 0;
++    char header[30];
++    char filename[256];
++    char extra[1024];
++    int offset = 0;
++    int offsetCD = 0;
++    while ( fread(header, 1, 30, fpZip) == 30 ) {
++      int currentOffset = offset;
++
++      /* File entry */
++      if (READ_32(header) == 0x04034b50) {
++        unsigned int version = READ_16(header + 4);
++        unsigned int gpflag = READ_16(header + 6);
++        unsigned int method = READ_16(header + 8);
++        unsigned int filetime = READ_16(header + 10);
++        unsigned int filedate = READ_16(header + 12);
++        unsigned int crc = READ_32(header + 14); /* crc */
++        unsigned int cpsize = READ_32(header + 18); /* compressed size */
++        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
++        unsigned int fnsize = READ_16(header + 26); /* file name length */
++        unsigned int extsize = READ_16(header + 28); /* extra field length */
++        filename[0] = extra[0] = '\0';
++
++        /* Header */
++        if (fwrite(header, 1, 30, fpOut) == 30) {
++          offset += 30;
++        } else {
++          err = Z_ERRNO;
++          break;
++        }
++
++        /* Filename */
++        if (fnsize > 0) {
++          if (fread(filename, 1, fnsize, fpZip) == fnsize) {
++            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
++              offset += fnsize;
++            } else {
++              err = Z_ERRNO;
++              break;
++            }
++          } else {
++            err = Z_ERRNO;
++            break;
++          }
++        } else {
++          err = Z_STREAM_ERROR;
++          break;
++        }
++
++        /* Extra field */
++        if (extsize > 0) {
++          if (fread(extra, 1, extsize, fpZip) == extsize) {
++            if (fwrite(extra, 1, extsize, fpOut) == extsize) {
++              offset += extsize;
++            } else {
++              err = Z_ERRNO;
++              break;
++            }
++          } else {
++            err = Z_ERRNO;
++            break;
++          }
++        }
++
++        /* Data */
++        {
++          int dataSize = cpsize;
++          if (dataSize == 0) {
++            dataSize = uncpsize;
++          }
++          if (dataSize > 0) {
++            char* data = malloc(dataSize);
++            if (data != NULL) {
++              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
++                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
++                  offset += dataSize;
++                  totalBytes += dataSize;
++                } else {
++                  err = Z_ERRNO;
++                }
++              } else {
++                err = Z_ERRNO;
++              }
++              free(data);
++              if (err != Z_OK) {
++                break;
++              }
++            } else {
++              err = Z_MEM_ERROR;
++              break;
++            }
++          }
++        }
++
++        /* Central directory entry */
++        {
++          char cdeHeader[46];
++          char* comment = "";
++          int comsize = (int) strlen(comment);
++          WRITE_32(cdeHeader, 0x02014b50);
++          WRITE_16(cdeHeader + 4, version);
++          WRITE_16(cdeHeader + 6, version);
++          WRITE_16(cdeHeader + 8, gpflag);
++          WRITE_16(cdeHeader + 10, method);
++          WRITE_16(cdeHeader + 12, filetime);
++          WRITE_16(cdeHeader + 14, filedate);
++          WRITE_32(cdeHeader + 16, crc);
++          WRITE_32(cdeHeader + 20, cpsize);
++          WRITE_32(cdeHeader + 24, uncpsize);
++          WRITE_16(cdeHeader + 28, fnsize);
++          WRITE_16(cdeHeader + 30, extsize);
++          WRITE_16(cdeHeader + 32, comsize);
++          WRITE_16(cdeHeader + 34, 0);     /* disk # */
++          WRITE_16(cdeHeader + 36, 0);     /* int attrb */
++          WRITE_32(cdeHeader + 38, 0);     /* ext attrb */
++          WRITE_32(cdeHeader + 42, currentOffset);
++          /* Header */
++          if (fwrite(cdeHeader, 1, 46, fpOutCD) == 46) {
++            offsetCD += 46;
++
++            /* Filename */
++            if (fnsize > 0) {
++              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
++                offsetCD += fnsize;
++              } else {
++                err = Z_ERRNO;
++                break;
++              }
++            } else {
++              err = Z_STREAM_ERROR;
++              break;
++            }
++
++            /* Extra field */
++            if (extsize > 0) {
++              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
++                offsetCD += extsize;
++              } else {
++                err = Z_ERRNO;
++                break;
++              }
++            }
++
++            /* Comment field */
++            if (comsize > 0) {
++              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
++                offsetCD += comsize;
++              } else {
++                err = Z_ERRNO;
++                break;
++              }
++            }
++
++
++          } else {
++            err = Z_ERRNO;
++            break;
++          }
++        }
++
++        /* Success */
++        entries++;
++
++      } else {
++        break;
++      }
++    }
++
++	/* Final central directory  */
++	{
++		int entriesZip = entries;
++		char fcdHeader[22];
++		char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
++		int comsize = (int) strlen(comment);
++		if (entriesZip > 0xffff) {
++		  entriesZip = 0xffff;
++		}
++		WRITE_32(fcdHeader, 0x06054b50);
++		WRITE_16(fcdHeader + 4, 0);    /* disk # */
++		WRITE_16(fcdHeader + 6, 0);    /* disk # */
++		WRITE_16(fcdHeader + 8, entriesZip);   /* hack */
++		WRITE_16(fcdHeader + 10, entriesZip);  /* hack */
++		WRITE_32(fcdHeader + 12, offsetCD);    /* size of CD */
++		WRITE_32(fcdHeader + 16, offset);      /* offset to CD */
++		WRITE_16(fcdHeader + 20, comsize);     /* comment */
++
++		/* Header */
++		if (fwrite(fcdHeader, 1, 22, fpOutCD) == 22) {
++
++		  /* Comment field */
++		  if (comsize > 0) {
++			  if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
++				  err = Z_ERRNO;
++			  }
++		  }
++
++		} else {
++		  err = Z_ERRNO;
++		}
++	}
++
++    /* Final merge (file + central directory) */
++    fclose(fpOutCD);
++    if (err == Z_OK) {
++      fpOutCD = fopen(fileOutTmp, "rb");
++      if (fpOutCD != NULL) {
++        int nRead;
++        char buffer[8192];
++        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
++          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
++            err = Z_ERRNO;
++            break;
++          }
++        }
++        fclose(fpOutCD);
++      }
++    }
++
++    /* Close */
++    fclose(fpZip);
++    fclose(fpOut);
++
++    /* Wipe temporary file */
++    (void)remove(fileOutTmp);
++
++    /* Number of recovered entries */
++    if (err == Z_OK) {
++      if (nRecovered != NULL) {
++        *nRecovered = entries;
++      }
++      if (bytesRecovered != NULL) {
++        *bytesRecovered = totalBytes;
++      }
++    }
++  } else {
++    err = Z_STREAM_ERROR;
++  }
++  return err;
++}
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/mztools.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/mztools.h
+new file mode 100644
+index 0000000..eee78dc
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/mztools.h
+@@ -0,0 +1,31 @@
++/*
++  Additional tools for Minizip
++  Code: Xavier Roche '2004
++  License: Same as ZLIB (www.gzip.org)
++*/
++
++#ifndef _zip_tools_H
++#define _zip_tools_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifndef _ZLIB_H
++#include "zlib.h"
++#endif
++
++#include "unzip.h"
++
++/* Repair a ZIP file (missing central directory)
++   file: file to recover
++   fileOut: output file after recovery
++   fileOutTmp: temporary file name used for recovery
++*/
++extern int ZEXPORT unzRepair(const char* file,
++                             const char* fileOut,
++                             const char* fileOutTmp,
++                             uLong* nRecovered,
++                             uLong* bytesRecovered);
++
++#endif
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/unzip.c b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/unzip.c
+new file mode 100644
+index 0000000..2cca7e3
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/unzip.c
+@@ -0,0 +1,1600 @@
++/* unzip.c -- IO for uncompress .zip files using zlib
++   Version 1.01e, February 12th, 2005
++
++   Copyright (C) 1998-2005 Gilles Vollant
++
++   Read unzip.h for more info
++*/
++
++/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
++compatibility with older software. The following is from the original crypt.c. Code
++woven in by Terry Thorsen 1/2003.
++*/
++/*
++  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
++
++  See the accompanying file LICENSE, version 2000-Apr-09 or later
++  (the contents of which are also included in zip.h) for terms of use.
++  If, for some reason, all these files are missing, the Info-ZIP license
++  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
++*/
++/*
++  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
++
++  The encryption/decryption parts of this source code (as opposed to the
++  non-echoing password parts) were originally written in Europe.  The
++  whole source package can be freely distributed, including from the USA.
++  (Prior to January 2000, re-export from the US was a violation of US law.)
++ */
++
++/*
++  This encryption code is a direct transcription of the algorithm from
++  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
++  file (appnote.txt) is distributed with the PKZIP program (even in the
++  version without encryption capabilities).
++ */
++
++#define NOCRYPT
++#define NOUNCRYPT
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "zlib.h"
++#include "unzip.h"
++
++#ifdef STDC
++#  include <stddef.h>
++#  include <string.h>
++#  include <stdlib.h>
++#endif
++#ifdef NO_ERRNO_H
++    extern int errno;
++#else
++#   include <errno.h>
++#endif
++
++
++#ifndef local
++#  define local static
++#endif
++/* compile with -Dlocal if your debugger can't find static symbols */
++
++
++#ifndef CASESENSITIVITYDEFAULT_NO
++#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
++#    define CASESENSITIVITYDEFAULT_NO
++#  endif
++#endif
++
++
++#ifndef UNZ_BUFSIZE
++#define UNZ_BUFSIZE (16384)
++#endif
++
++#ifndef UNZ_MAXFILENAMEINZIP
++#define UNZ_MAXFILENAMEINZIP (256)
++#endif
++
++#ifndef ALLOC
++# define ALLOC(size) (malloc(size))
++#endif
++#ifndef TRYFREE
++# define TRYFREE(p) {if (p) free(p);}
++#endif
++
++#define SIZECENTRALDIRITEM (0x2e)
++#define SIZEZIPLOCALHEADER (0x1e)
++
++
++
++
++const char unz_copyright[] =
++   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
++
++/* unz_file_info_interntal contain internal info about a file in zipfile*/
++typedef struct unz_file_info_internal_s
++{
++    uLong offset_curfile;/* relative offset of local header 4 bytes */
++} unz_file_info_internal;
++
++
++/* file_in_zip_read_info_s contain internal information about a file in zipfile,
++    when reading and decompress it */
++typedef struct
++{
++    char  *read_buffer;         /* internal buffer for compressed data */
++    z_stream stream;            /* zLib stream structure for inflate */
++
++    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
++    uLong stream_initialised;   /* flag set if stream structure is initialised*/
++
++    uLong offset_local_extrafield;/* offset of the local extra field */
++    uInt  size_local_extrafield;/* size of the local extra field */
++    uLong pos_local_extrafield;   /* position in the local extra field in read*/
++
++    uLong crc32;                /* crc32 of all data uncompressed */
++    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
++    uLong rest_read_compressed; /* number of byte to be decompressed */
++    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
++    zlib_filefunc_def z_filefunc;
++    voidpf filestream;        /* io structore of the zipfile */
++    uLong compression_method;   /* compression method (0==store) */
++    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
++    int   raw;
++} file_in_zip_read_info_s;
++
++
++/* unz_s contain internal information about the zipfile
++*/
++typedef struct
++{
++    zlib_filefunc_def z_filefunc;
++    voidpf filestream;        /* io structore of the zipfile */
++    unz_global_info gi;       /* public global information */
++    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
++    uLong num_file;             /* number of the current file in the zipfile*/
++    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
++    uLong current_file_ok;      /* flag about the usability of the current file*/
++    uLong central_pos;          /* position of the beginning of the central dir*/
++
++    uLong size_central_dir;     /* size of the central directory  */
++    uLong offset_central_dir;   /* offset of start of central directory with
++                                   respect to the starting disk number */
++
++    unz_file_info cur_file_info; /* public info about the current file in zip*/
++    unz_file_info_internal cur_file_info_internal; /* private info about it*/
++    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
++                                        file if we are decompressing it */
++    int encrypted;
++#    ifndef NOUNCRYPT
++    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
++    const unsigned long* pcrc_32_tab;
++#    endif
++} unz_s;
++
++
++#ifndef NOUNCRYPT
++#include "crypt.h"
++#endif
++
++/* ===========================================================================
++     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
++   for end of file.
++   IN assertion: the stream s has been sucessfully opened for reading.
++*/
++
++
++local int unzlocal_getByte OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream,
++    int *pi));
++
++local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++    int *pi;
++{
++    unsigned char c;
++    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
++    if (err==1)
++    {
++        *pi = (int)c;
++        return UNZ_OK;
++    }
++    else
++    {
++        if (ZERROR(*pzlib_filefunc_def,filestream))
++            return UNZ_ERRNO;
++        else
++            return UNZ_EOF;
++    }
++}
++
++
++/* ===========================================================================
++   Reads a long in LSB order from the given gz_stream. Sets
++*/
++local int unzlocal_getShort OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream,
++    uLong *pX));
++
++local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++    uLong *pX;
++{
++    uLong x ;
++    int i;
++    int err;
++
++    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x = (uLong)i;
++
++    if (err==UNZ_OK)
++        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<8;
++
++    if (err==UNZ_OK)
++        *pX = x;
++    else
++        *pX = 0;
++    return err;
++}
++
++local int unzlocal_getLong OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream,
++    uLong *pX));
++
++local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++    uLong *pX;
++{
++    uLong x ;
++    int i;
++    int err;
++
++    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x = (uLong)i;
++
++    if (err==UNZ_OK)
++        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<8;
++
++    if (err==UNZ_OK)
++        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<16;
++
++    if (err==UNZ_OK)
++        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<24;
++
++    if (err==UNZ_OK)
++        *pX = x;
++    else
++        *pX = 0;
++    return err;
++}
++
++
++/* My own strcmpi / strcasecmp */
++local int strcmpcasenosensitive_internal (fileName1,fileName2)
++    const char* fileName1;
++    const char* fileName2;
++{
++    for (;;)
++    {
++        char c1=*(fileName1++);
++        char c2=*(fileName2++);
++        if ((c1>='a') && (c1<='z'))
++            c1 -= 0x20;
++        if ((c2>='a') && (c2<='z'))
++            c2 -= 0x20;
++        if (c1=='\0')
++            return ((c2=='\0') ? 0 : -1);
++        if (c2=='\0')
++            return 1;
++        if (c1<c2)
++            return -1;
++        if (c1>c2)
++            return 1;
++    }
++}
++
++
++#ifdef  CASESENSITIVITYDEFAULT_NO
++#define CASESENSITIVITYDEFAULTVALUE 2
++#else
++#define CASESENSITIVITYDEFAULTVALUE 1
++#endif
++
++#ifndef STRCMPCASENOSENTIVEFUNCTION
++#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
++#endif
++
++/*
++   Compare two filename (fileName1,fileName2).
++   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
++   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
++                                                                or strcasecmp)
++   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
++        (like 1 on Unix, 2 on Windows)
++
++*/
++extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
++    const char* fileName1;
++    const char* fileName2;
++    int iCaseSensitivity;
++{
++    if (iCaseSensitivity==0)
++        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
++
++    if (iCaseSensitivity==1)
++        return strcmp(fileName1,fileName2);
++
++    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
++}
++
++#ifndef BUFREADCOMMENT
++#define BUFREADCOMMENT (0x400)
++#endif
++
++/*
++  Locate the Central directory of a zipfile (at the end, just before
++    the global comment)
++*/
++local uLong unzlocal_SearchCentralDir OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream));
++
++local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++{
++    unsigned char* buf;
++    uLong uSizeFile;
++    uLong uBackRead;
++    uLong uMaxBack=0xffff; /* maximum size of global comment */
++    uLong uPosFound=0;
++
++    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
++        return 0;
++
++
++    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
++
++    if (uMaxBack>uSizeFile)
++        uMaxBack = uSizeFile;
++
++    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
++    if (buf==NULL)
++        return 0;
++
++    uBackRead = 4;
++    while (uBackRead<uMaxBack)
++    {
++        uLong uReadSize,uReadPos ;
++        int i;
++        if (uBackRead+BUFREADCOMMENT>uMaxBack)
++            uBackRead = uMaxBack;
++        else
++            uBackRead+=BUFREADCOMMENT;
++        uReadPos = uSizeFile-uBackRead ;
++
++        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
++                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
++        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
++            break;
++
++        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
++            break;
++
++        for (i=(int)uReadSize-3; (i--)>0;)
++            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
++                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
++            {
++                uPosFound = uReadPos+i;
++                break;
++            }
++
++        if (uPosFound!=0)
++            break;
++    }
++    TRYFREE(buf);
++    return uPosFound;
++}
++
++/*
++  Open a Zip file. path contain the full pathname (by example,
++     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
++     "zlib/zlib114.zip".
++     If the zipfile cannot be opened (file doesn't exist or in not valid), the
++       return value is NULL.
++     Else, the return value is a unzFile Handle, usable with other function
++       of this unzip package.
++*/
++extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
++    const char *path;
++    zlib_filefunc_def* pzlib_filefunc_def;
++{
++    unz_s us;
++    unz_s *s;
++    uLong central_pos,uL;
++
++    uLong number_disk;          /* number of the current dist, used for
++                                   spaning ZIP, unsupported, always 0*/
++    uLong number_disk_with_CD;  /* number the the disk with central dir, used
++                                   for spaning ZIP, unsupported, always 0*/
++    uLong number_entry_CD;      /* total number of entries in
++                                   the central dir
++                                   (same than number_entry on nospan) */
++
++    int err=UNZ_OK;
++
++    if (unz_copyright[0]!=' ')
++        return NULL;
++
++    if (pzlib_filefunc_def==NULL)
++        fill_fopen_filefunc(&us.z_filefunc);
++    else
++        us.z_filefunc = *pzlib_filefunc_def;
++
++    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
++                                                 path,
++                                                 ZLIB_FILEFUNC_MODE_READ |
++                                                 ZLIB_FILEFUNC_MODE_EXISTING);
++    if (us.filestream==NULL)
++        return NULL;
++
++    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
++    if (central_pos==0)
++        err=UNZ_ERRNO;
++
++    if (ZSEEK(us.z_filefunc, us.filestream,
++                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
++        err=UNZ_ERRNO;
++
++    /* the signature, already checked */
++    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    /* number of this disk */
++    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    /* number of the disk with the start of the central directory */
++    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    /* total number of entries in the central dir on this disk */
++    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    /* total number of entries in the central dir */
++    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if ((number_entry_CD!=us.gi.number_entry) ||
++        (number_disk_with_CD!=0) ||
++        (number_disk!=0))
++        err=UNZ_BADZIPFILE;
++
++    /* size of the central directory */
++    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    /* offset of start of central directory with respect to the
++          starting disk number */
++    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    /* zipfile comment length */
++    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
++        (err==UNZ_OK))
++        err=UNZ_BADZIPFILE;
++
++    if (err!=UNZ_OK)
++    {
++        ZCLOSE(us.z_filefunc, us.filestream);
++        return NULL;
++    }
++
++    us.byte_before_the_zipfile = central_pos -
++                            (us.offset_central_dir+us.size_central_dir);
++    us.central_pos = central_pos;
++    us.pfile_in_zip_read = NULL;
++    us.encrypted = 0;
++
++
++    s=(unz_s*)ALLOC(sizeof(unz_s));
++    *s=us;
++    unzGoToFirstFile((unzFile)s);
++    return (unzFile)s;
++}
++
++
++extern unzFile ZEXPORT unzOpen (path)
++    const char *path;
++{
++    return unzOpen2(path, NULL);
++}
++
++/*
++  Close a ZipFile opened with unzipOpen.
++  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
++    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
++  return UNZ_OK if there is no problem. */
++extern int ZEXPORT unzClose (file)
++    unzFile file;
++{
++    unz_s* s;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++
++    if (s->pfile_in_zip_read!=NULL)
++        unzCloseCurrentFile(file);
++
++    ZCLOSE(s->z_filefunc, s->filestream);
++    TRYFREE(s);
++    return UNZ_OK;
++}
++
++
++/*
++  Write info about the ZipFile in the *pglobal_info structure.
++  No preparation of the structure is needed
++  return UNZ_OK if there is no problem. */
++extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
++    unzFile file;
++    unz_global_info *pglobal_info;
++{
++    unz_s* s;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    *pglobal_info=s->gi;
++    return UNZ_OK;
++}
++
++
++/*
++   Translate date/time from Dos format to tm_unz (readable more easilty)
++*/
++local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
++    uLong ulDosDate;
++    tm_unz* ptm;
++{
++    uLong uDate;
++    uDate = (uLong)(ulDosDate>>16);
++    ptm->tm_mday = (uInt)(uDate&0x1f) ;
++    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
++    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
++
++    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
++    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
++    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
++}
++
++/*
++  Get Info about the current file in the zipfile, with internal only info
++*/
++local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
++                                                  unz_file_info *pfile_info,
++                                                  unz_file_info_internal
++                                                  *pfile_info_internal,
++                                                  char *szFileName,
++                                                  uLong fileNameBufferSize,
++                                                  void *extraField,
++                                                  uLong extraFieldBufferSize,
++                                                  char *szComment,
++                                                  uLong commentBufferSize));
++
++local int unzlocal_GetCurrentFileInfoInternal (file,
++                                              pfile_info,
++                                              pfile_info_internal,
++                                              szFileName, fileNameBufferSize,
++                                              extraField, extraFieldBufferSize,
++                                              szComment,  commentBufferSize)
++    unzFile file;
++    unz_file_info *pfile_info;
++    unz_file_info_internal *pfile_info_internal;
++    char *szFileName;
++    uLong fileNameBufferSize;
++    void *extraField;
++    uLong extraFieldBufferSize;
++    char *szComment;
++    uLong commentBufferSize;
++{
++    unz_s* s;
++    unz_file_info file_info;
++    unz_file_info_internal file_info_internal;
++    int err=UNZ_OK;
++    uLong uMagic;
++    long lSeek=0;
++
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    if (ZSEEK(s->z_filefunc, s->filestream,
++              s->pos_in_central_dir+s->byte_before_the_zipfile,
++              ZLIB_FILEFUNC_SEEK_SET)!=0)
++        err=UNZ_ERRNO;
++
++
++    /* we check the magic */
++    if (err==UNZ_OK)
++        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
++            err=UNZ_ERRNO;
++        else if (uMagic!=0x02014b50)
++            err=UNZ_BADZIPFILE;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    lSeek+=file_info.size_filename;
++    if ((err==UNZ_OK) && (szFileName!=NULL))
++    {
++        uLong uSizeRead ;
++        if (file_info.size_filename<fileNameBufferSize)
++        {
++            *(szFileName+file_info.size_filename)='\0';
++            uSizeRead = file_info.size_filename;
++        }
++        else
++            uSizeRead = fileNameBufferSize;
++
++        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
++            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
++                err=UNZ_ERRNO;
++        lSeek -= uSizeRead;
++    }
++
++
++    if ((err==UNZ_OK) && (extraField!=NULL))
++    {
++        uLong uSizeRead ;
++        if (file_info.size_file_extra<extraFieldBufferSize)
++            uSizeRead = file_info.size_file_extra;
++        else
++            uSizeRead = extraFieldBufferSize;
++
++        if (lSeek!=0)
++            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
++                lSeek=0;
++            else
++                err=UNZ_ERRNO;
++        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
++            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
++                err=UNZ_ERRNO;
++        lSeek += file_info.size_file_extra - uSizeRead;
++    }
++    else
++        lSeek+=file_info.size_file_extra;
++
++
++    if ((err==UNZ_OK) && (szComment!=NULL))
++    {
++        uLong uSizeRead ;
++        if (file_info.size_file_comment<commentBufferSize)
++        {
++            *(szComment+file_info.size_file_comment)='\0';
++            uSizeRead = file_info.size_file_comment;
++        }
++        else
++            uSizeRead = commentBufferSize;
++
++        if (lSeek!=0)
++            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
++                lSeek=0;
++            else
++                err=UNZ_ERRNO;
++        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
++            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
++                err=UNZ_ERRNO;
++        lSeek+=file_info.size_file_comment - uSizeRead;
++    }
++    else
++        lSeek+=file_info.size_file_comment;
++
++    if ((err==UNZ_OK) && (pfile_info!=NULL))
++        *pfile_info=file_info;
++
++    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
++        *pfile_info_internal=file_info_internal;
++
++    return err;
++}
++
++
++
++/*
++  Write info about the ZipFile in the *pglobal_info structure.
++  No preparation of the structure is needed
++  return UNZ_OK if there is no problem.
++*/
++extern int ZEXPORT unzGetCurrentFileInfo (file,
++                                          pfile_info,
++                                          szFileName, fileNameBufferSize,
++                                          extraField, extraFieldBufferSize,
++                                          szComment,  commentBufferSize)
++    unzFile file;
++    unz_file_info *pfile_info;
++    char *szFileName;
++    uLong fileNameBufferSize;
++    void *extraField;
++    uLong extraFieldBufferSize;
++    char *szComment;
++    uLong commentBufferSize;
++{
++    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
++                                                szFileName,fileNameBufferSize,
++                                                extraField,extraFieldBufferSize,
++                                                szComment,commentBufferSize);
++}
++
++/*
++  Set the current file of the zipfile to the first file.
++  return UNZ_OK if there is no problem
++*/
++extern int ZEXPORT unzGoToFirstFile (file)
++    unzFile file;
++{
++    int err=UNZ_OK;
++    unz_s* s;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    s->pos_in_central_dir=s->offset_central_dir;
++    s->num_file=0;
++    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
++                                             &s->cur_file_info_internal,
++                                             NULL,0,NULL,0,NULL,0);
++    s->current_file_ok = (err == UNZ_OK);
++    return err;
++}
++
++/*
++  Set the current file of the zipfile to the next file.
++  return UNZ_OK if there is no problem
++  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
++*/
++extern int ZEXPORT unzGoToNextFile (file)
++    unzFile file;
++{
++    unz_s* s;
++    int err;
++
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    if (!s->current_file_ok)
++        return UNZ_END_OF_LIST_OF_FILE;
++    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
++      if (s->num_file+1==s->gi.number_entry)
++        return UNZ_END_OF_LIST_OF_FILE;
++
++    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
++            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
++    s->num_file++;
++    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
++                                               &s->cur_file_info_internal,
++                                               NULL,0,NULL,0,NULL,0);
++    s->current_file_ok = (err == UNZ_OK);
++    return err;
++}
++
++
++/*
++  Try locate the file szFileName in the zipfile.
++  For the iCaseSensitivity signification, see unzipStringFileNameCompare
++
++  return value :
++  UNZ_OK if the file is found. It becomes the current file.
++  UNZ_END_OF_LIST_OF_FILE if the file is not found
++*/
++extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
++    unzFile file;
++    const char *szFileName;
++    int iCaseSensitivity;
++{
++    unz_s* s;
++    int err;
++
++    /* We remember the 'current' position in the file so that we can jump
++     * back there if we fail.
++     */
++    unz_file_info cur_file_infoSaved;
++    unz_file_info_internal cur_file_info_internalSaved;
++    uLong num_fileSaved;
++    uLong pos_in_central_dirSaved;
++
++
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++
++    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
++        return UNZ_PARAMERROR;
++
++    s=(unz_s*)file;
++    if (!s->current_file_ok)
++        return UNZ_END_OF_LIST_OF_FILE;
++
++    /* Save the current state */
++    num_fileSaved = s->num_file;
++    pos_in_central_dirSaved = s->pos_in_central_dir;
++    cur_file_infoSaved = s->cur_file_info;
++    cur_file_info_internalSaved = s->cur_file_info_internal;
++
++    err = unzGoToFirstFile(file);
++
++    while (err == UNZ_OK)
++    {
++        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
++        err = unzGetCurrentFileInfo(file,NULL,
++                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
++                                    NULL,0,NULL,0);
++        if (err == UNZ_OK)
++        {
++            if (unzStringFileNameCompare(szCurrentFileName,
++                                            szFileName,iCaseSensitivity)==0)
++                return UNZ_OK;
++            err = unzGoToNextFile(file);
++        }
++    }
++
++    /* We failed, so restore the state of the 'current file' to where we
++     * were.
++     */
++    s->num_file = num_fileSaved ;
++    s->pos_in_central_dir = pos_in_central_dirSaved ;
++    s->cur_file_info = cur_file_infoSaved;
++    s->cur_file_info_internal = cur_file_info_internalSaved;
++    return err;
++}
++
++
++/*
++///////////////////////////////////////////
++// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
++// I need random access
++//
++// Further optimization could be realized by adding an ability
++// to cache the directory in memory. The goal being a single
++// comprehensive file read to put the file I need in a memory.
++*/
++
++/*
++typedef struct unz_file_pos_s
++{
++    uLong pos_in_zip_directory;   // offset in file
++    uLong num_of_file;            // # of file
++} unz_file_pos;
++*/
++
++extern int ZEXPORT unzGetFilePos(file, file_pos)
++    unzFile file;
++    unz_file_pos* file_pos;
++{
++    unz_s* s;
++
++    if (file==NULL || file_pos==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    if (!s->current_file_ok)
++        return UNZ_END_OF_LIST_OF_FILE;
++
++    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
++    file_pos->num_of_file           = s->num_file;
++
++    return UNZ_OK;
++}
++
++extern int ZEXPORT unzGoToFilePos(file, file_pos)
++    unzFile file;
++    unz_file_pos* file_pos;
++{
++    unz_s* s;
++    int err;
++
++    if (file==NULL || file_pos==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++
++    /* jump to the right spot */
++    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
++    s->num_file           = file_pos->num_of_file;
++
++    /* set the current file */
++    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
++                                               &s->cur_file_info_internal,
++                                               NULL,0,NULL,0,NULL,0);
++    /* return results */
++    s->current_file_ok = (err == UNZ_OK);
++    return err;
++}
++
++/*
++// Unzip Helper Functions - should be here?
++///////////////////////////////////////////
++*/
++
++/*
++  Read the local header of the current zipfile
++  Check the coherency of the local header and info in the end of central
++        directory about this file
++  store in *piSizeVar the size of extra info in local header
++        (filename and size of extra field data)
++*/
++local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
++                                                    poffset_local_extrafield,
++                                                    psize_local_extrafield)
++    unz_s* s;
++    uInt* piSizeVar;
++    uLong *poffset_local_extrafield;
++    uInt  *psize_local_extrafield;
++{
++    uLong uMagic,uData,uFlags;
++    uLong size_filename;
++    uLong size_extra_field;
++    int err=UNZ_OK;
++
++    *piSizeVar = 0;
++    *poffset_local_extrafield = 0;
++    *psize_local_extrafield = 0;
++
++    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
++                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
++        return UNZ_ERRNO;
++
++
++    if (err==UNZ_OK)
++        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
++            err=UNZ_ERRNO;
++        else if (uMagic!=0x04034b50)
++            err=UNZ_BADZIPFILE;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
++        err=UNZ_ERRNO;
++/*
++    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
++        err=UNZ_BADZIPFILE;
++*/
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
++        err=UNZ_ERRNO;
++    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
++        err=UNZ_BADZIPFILE;
++
++    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
++                         (s->cur_file_info.compression_method!=Z_DEFLATED))
++        err=UNZ_BADZIPFILE;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
++        err=UNZ_ERRNO;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
++        err=UNZ_ERRNO;
++    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
++                              ((uFlags & 8)==0))
++        err=UNZ_BADZIPFILE;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
++        err=UNZ_ERRNO;
++    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
++                              ((uFlags & 8)==0))
++        err=UNZ_BADZIPFILE;
++
++    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
++        err=UNZ_ERRNO;
++    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
++                              ((uFlags & 8)==0))
++        err=UNZ_BADZIPFILE;
++
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
++        err=UNZ_ERRNO;
++    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
++        err=UNZ_BADZIPFILE;
++
++    *piSizeVar += (uInt)size_filename;
++
++    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
++        err=UNZ_ERRNO;
++    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
++                                    SIZEZIPLOCALHEADER + size_filename;
++    *psize_local_extrafield = (uInt)size_extra_field;
++
++    *piSizeVar += (uInt)size_extra_field;
++
++    return err;
++}
++
++/*
++  Open for reading data the current file in the zipfile.
++  If there is no error and the file is opened, the return value is UNZ_OK.
++*/
++extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
++    unzFile file;
++    int* method;
++    int* level;
++    int raw;
++    const char* password;
++{
++    int err=UNZ_OK;
++    uInt iSizeVar;
++    unz_s* s;
++    file_in_zip_read_info_s* pfile_in_zip_read_info;
++    uLong offset_local_extrafield;  /* offset of the local extra field */
++    uInt  size_local_extrafield;    /* size of the local extra field */
++#    ifndef NOUNCRYPT
++    char source[12];
++#    else
++    if (password != NULL)
++        return UNZ_PARAMERROR;
++#    endif
++
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    if (!s->current_file_ok)
++        return UNZ_PARAMERROR;
++
++    if (s->pfile_in_zip_read != NULL)
++        unzCloseCurrentFile(file);
++
++    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
++                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
++        return UNZ_BADZIPFILE;
++
++    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
++                                        ALLOC(sizeof(file_in_zip_read_info_s));
++    if (pfile_in_zip_read_info==NULL)
++        return UNZ_INTERNALERROR;
++
++    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
++    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
++    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
++    pfile_in_zip_read_info->pos_local_extrafield=0;
++    pfile_in_zip_read_info->raw=raw;
++
++    if (pfile_in_zip_read_info->read_buffer==NULL)
++    {
++        TRYFREE(pfile_in_zip_read_info);
++        return UNZ_INTERNALERROR;
++    }
++
++    pfile_in_zip_read_info->stream_initialised=0;
++
++    if (method!=NULL)
++        *method = (int)s->cur_file_info.compression_method;
++
++    if (level!=NULL)
++    {
++        *level = 6;
++        switch (s->cur_file_info.flag & 0x06)
++        {
++          case 6 : *level = 1; break;
++          case 4 : *level = 2; break;
++          case 2 : *level = 9; break;
++        }
++    }
++
++    if ((s->cur_file_info.compression_method!=0) &&
++        (s->cur_file_info.compression_method!=Z_DEFLATED))
++        err=UNZ_BADZIPFILE;
++
++    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
++    pfile_in_zip_read_info->crc32=0;
++    pfile_in_zip_read_info->compression_method =
++            s->cur_file_info.compression_method;
++    pfile_in_zip_read_info->filestream=s->filestream;
++    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
++    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
++
++    pfile_in_zip_read_info->stream.total_out = 0;
++
++    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
++        (!raw))
++    {
++      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
++      pfile_in_zip_read_info->stream.zfree = (free_func)0;
++      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
++      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
++      pfile_in_zip_read_info->stream.avail_in = 0;
++
++      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
++      if (err == Z_OK)
++        pfile_in_zip_read_info->stream_initialised=1;
++      else
++      {
++        TRYFREE(pfile_in_zip_read_info);
++        return err;
++      }
++        /* windowBits is passed < 0 to tell that there is no zlib header.
++         * Note that in this case inflate *requires* an extra "dummy" byte
++         * after the compressed stream in order to complete decompression and
++         * return Z_STREAM_END.
++         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
++         * size of both compressed and uncompressed data
++         */
++    }
++    pfile_in_zip_read_info->rest_read_compressed =
++            s->cur_file_info.compressed_size ;
++    pfile_in_zip_read_info->rest_read_uncompressed =
++            s->cur_file_info.uncompressed_size ;
++
++
++    pfile_in_zip_read_info->pos_in_zipfile =
++            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
++              iSizeVar;
++
++    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
++
++    s->pfile_in_zip_read = pfile_in_zip_read_info;
++
++#    ifndef NOUNCRYPT
++    if (password != NULL)
++    {
++        int i;
++        s->pcrc_32_tab = get_crc_table();
++        init_keys(password,s->keys,s->pcrc_32_tab);
++        if (ZSEEK(s->z_filefunc, s->filestream,
++                  s->pfile_in_zip_read->pos_in_zipfile +
++                     s->pfile_in_zip_read->byte_before_the_zipfile,
++                  SEEK_SET)!=0)
++            return UNZ_INTERNALERROR;
++        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
++            return UNZ_INTERNALERROR;
++
++        for (i = 0; i<12; i++)
++            zdecode(s->keys,s->pcrc_32_tab,source[i]);
++
++        s->pfile_in_zip_read->pos_in_zipfile+=12;
++        s->encrypted=1;
++    }
++#    endif
++
++
++    return UNZ_OK;
++}
++
++extern int ZEXPORT unzOpenCurrentFile (file)
++    unzFile file;
++{
++    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
++}
++
++extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
++    unzFile file;
++    const char* password;
++{
++    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
++}
++
++extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
++    unzFile file;
++    int* method;
++    int* level;
++    int raw;
++{
++    return unzOpenCurrentFile3(file, method, level, raw, NULL);
++}
++
++/*
++  Read bytes from the current file.
++  buf contain buffer where data must be copied
++  len the size of buf.
++
++  return the number of byte copied if somes bytes are copied
++  return 0 if the end of file was reached
++  return <0 with error code if there is an error
++    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
++*/
++extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
++    unzFile file;
++    voidp buf;
++    unsigned len;
++{
++    int err=UNZ_OK;
++    uInt iRead = 0;
++    unz_s* s;
++    file_in_zip_read_info_s* pfile_in_zip_read_info;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    pfile_in_zip_read_info=s->pfile_in_zip_read;
++
++    if (pfile_in_zip_read_info==NULL)
++        return UNZ_PARAMERROR;
++
++
++    if (pfile_in_zip_read_info->read_buffer == NULL)
++        return UNZ_END_OF_LIST_OF_FILE;
++    if (len==0)
++        return 0;
++
++    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
++
++    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
++
++    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
++        (!(pfile_in_zip_read_info->raw)))
++        pfile_in_zip_read_info->stream.avail_out =
++            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
++
++    if ((len>pfile_in_zip_read_info->rest_read_compressed+
++           pfile_in_zip_read_info->stream.avail_in) &&
++         (pfile_in_zip_read_info->raw))
++        pfile_in_zip_read_info->stream.avail_out =
++            (uInt)pfile_in_zip_read_info->rest_read_compressed+
++            pfile_in_zip_read_info->stream.avail_in;
++
++    while (pfile_in_zip_read_info->stream.avail_out>0)
++    {
++        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
++            (pfile_in_zip_read_info->rest_read_compressed>0))
++        {
++            uInt uReadThis = UNZ_BUFSIZE;
++            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
++                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
++            if (uReadThis == 0)
++                return UNZ_EOF;
++            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
++                      pfile_in_zip_read_info->filestream,
++                      pfile_in_zip_read_info->pos_in_zipfile +
++                         pfile_in_zip_read_info->byte_before_the_zipfile,
++                         ZLIB_FILEFUNC_SEEK_SET)!=0)
++                return UNZ_ERRNO;
++            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
++                      pfile_in_zip_read_info->filestream,
++                      pfile_in_zip_read_info->read_buffer,
++                      uReadThis)!=uReadThis)
++                return UNZ_ERRNO;
++
++
++#            ifndef NOUNCRYPT
++            if(s->encrypted)
++            {
++                uInt i;
++                for(i=0;i<uReadThis;i++)
++                  pfile_in_zip_read_info->read_buffer[i] =
++                      zdecode(s->keys,s->pcrc_32_tab,
++                              pfile_in_zip_read_info->read_buffer[i]);
++            }
++#            endif
++
++
++            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
++
++            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
++
++            pfile_in_zip_read_info->stream.next_in =
++                (Bytef*)pfile_in_zip_read_info->read_buffer;
++            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
++        }
++
++        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
++        {
++            uInt uDoCopy,i ;
++
++            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
++                (pfile_in_zip_read_info->rest_read_compressed == 0))
++                return (iRead==0) ? UNZ_EOF : iRead;
++
++            if (pfile_in_zip_read_info->stream.avail_out <
++                            pfile_in_zip_read_info->stream.avail_in)
++                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
++            else
++                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
++
++            for (i=0;i<uDoCopy;i++)
++                *(pfile_in_zip_read_info->stream.next_out+i) =
++                        *(pfile_in_zip_read_info->stream.next_in+i);
++
++            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
++                                pfile_in_zip_read_info->stream.next_out,
++                                uDoCopy);
++            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
++            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
++            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
++            pfile_in_zip_read_info->stream.next_out += uDoCopy;
++            pfile_in_zip_read_info->stream.next_in += uDoCopy;
++            pfile_in_zip_read_info->stream.total_out += uDoCopy;
++            iRead += uDoCopy;
++        }
++        else
++        {
++            uLong uTotalOutBefore,uTotalOutAfter;
++            const Bytef *bufBefore;
++            uLong uOutThis;
++            int flush=Z_SYNC_FLUSH;
++
++            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
++            bufBefore = pfile_in_zip_read_info->stream.next_out;
++
++            /*
++            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
++                     pfile_in_zip_read_info->stream.avail_out) &&
++                (pfile_in_zip_read_info->rest_read_compressed == 0))
++                flush = Z_FINISH;
++            */
++            err=inflate(&pfile_in_zip_read_info->stream,flush);
++
++            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
++              err = Z_DATA_ERROR;
++
++            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
++            uOutThis = uTotalOutAfter-uTotalOutBefore;
++
++            pfile_in_zip_read_info->crc32 =
++                crc32(pfile_in_zip_read_info->crc32,bufBefore,
++                        (uInt)(uOutThis));
++
++            pfile_in_zip_read_info->rest_read_uncompressed -=
++                uOutThis;
++
++            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
++
++            if (err==Z_STREAM_END)
++                return (iRead==0) ? UNZ_EOF : iRead;
++            if (err!=Z_OK)
++                break;
++        }
++    }
++
++    if (err==Z_OK)
++        return iRead;
++    return err;
++}
++
++
++/*
++  Give the current position in uncompressed data
++*/
++extern z_off_t ZEXPORT unztell (file)
++    unzFile file;
++{
++    unz_s* s;
++    file_in_zip_read_info_s* pfile_in_zip_read_info;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    pfile_in_zip_read_info=s->pfile_in_zip_read;
++
++    if (pfile_in_zip_read_info==NULL)
++        return UNZ_PARAMERROR;
++
++    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
++}
++
++
++/*
++  return 1 if the end of file was reached, 0 elsewhere
++*/
++extern int ZEXPORT unzeof (file)
++    unzFile file;
++{
++    unz_s* s;
++    file_in_zip_read_info_s* pfile_in_zip_read_info;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    pfile_in_zip_read_info=s->pfile_in_zip_read;
++
++    if (pfile_in_zip_read_info==NULL)
++        return UNZ_PARAMERROR;
++
++    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
++        return 1;
++    else
++        return 0;
++}
++
++
++
++/*
++  Read extra field from the current file (opened by unzOpenCurrentFile)
++  This is the local-header version of the extra field (sometimes, there is
++    more info in the local-header version than in the central-header)
++
++  if buf==NULL, it return the size of the local extra field that can be read
++
++  if buf!=NULL, len is the size of the buffer, the extra header is copied in
++    buf.
++  the return value is the number of bytes copied in buf, or (if <0)
++    the error code
++*/
++extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
++    unzFile file;
++    voidp buf;
++    unsigned len;
++{
++    unz_s* s;
++    file_in_zip_read_info_s* pfile_in_zip_read_info;
++    uInt read_now;
++    uLong size_to_read;
++
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    pfile_in_zip_read_info=s->pfile_in_zip_read;
++
++    if (pfile_in_zip_read_info==NULL)
++        return UNZ_PARAMERROR;
++
++    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
++                pfile_in_zip_read_info->pos_local_extrafield);
++
++    if (buf==NULL)
++        return (int)size_to_read;
++
++    if (len>size_to_read)
++        read_now = (uInt)size_to_read;
++    else
++        read_now = (uInt)len ;
++
++    if (read_now==0)
++        return 0;
++
++    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
++              pfile_in_zip_read_info->filestream,
++              pfile_in_zip_read_info->offset_local_extrafield +
++              pfile_in_zip_read_info->pos_local_extrafield,
++              ZLIB_FILEFUNC_SEEK_SET)!=0)
++        return UNZ_ERRNO;
++
++    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
++              pfile_in_zip_read_info->filestream,
++              buf,read_now)!=read_now)
++        return UNZ_ERRNO;
++
++    return (int)read_now;
++}
++
++/*
++  Close the file in zip opened with unzipOpenCurrentFile
++  Return UNZ_CRCERROR if all the file was read but the CRC is not good
++*/
++extern int ZEXPORT unzCloseCurrentFile (file)
++    unzFile file;
++{
++    int err=UNZ_OK;
++
++    unz_s* s;
++    file_in_zip_read_info_s* pfile_in_zip_read_info;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    pfile_in_zip_read_info=s->pfile_in_zip_read;
++
++    if (pfile_in_zip_read_info==NULL)
++        return UNZ_PARAMERROR;
++
++
++    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
++        (!pfile_in_zip_read_info->raw))
++    {
++        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
++            err=UNZ_CRCERROR;
++    }
++
++
++    TRYFREE(pfile_in_zip_read_info->read_buffer);
++    pfile_in_zip_read_info->read_buffer = NULL;
++    if (pfile_in_zip_read_info->stream_initialised)
++        inflateEnd(&pfile_in_zip_read_info->stream);
++
++    pfile_in_zip_read_info->stream_initialised = 0;
++    TRYFREE(pfile_in_zip_read_info);
++
++    s->pfile_in_zip_read=NULL;
++
++    return err;
++}
++
++
++/*
++  Get the global comment string of the ZipFile, in the szComment buffer.
++  uSizeBuf is the size of the szComment buffer.
++  return the number of byte copied or an error code <0
++*/
++extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
++    unzFile file;
++    char *szComment;
++    uLong uSizeBuf;
++{
++//    int err=UNZ_OK;
++    unz_s* s;
++    uLong uReadThis ;
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++
++    uReadThis = uSizeBuf;
++    if (uReadThis>s->gi.size_comment)
++        uReadThis = s->gi.size_comment;
++
++    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
++        return UNZ_ERRNO;
++
++    if (uReadThis>0)
++    {
++      *szComment='\0';
++      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
++        return UNZ_ERRNO;
++    }
++
++    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
++        *(szComment+s->gi.size_comment)='\0';
++    return (int)uReadThis;
++}
++
++/* Additions by RX '2004 */
++extern uLong ZEXPORT unzGetOffset (file)
++    unzFile file;
++{
++    unz_s* s;
++
++    if (file==NULL)
++          return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++    if (!s->current_file_ok)
++      return 0;
++    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
++      if (s->num_file==s->gi.number_entry)
++         return 0;
++    return s->pos_in_central_dir;
++}
++
++extern int ZEXPORT unzSetOffset (file, pos)
++        unzFile file;
++        uLong pos;
++{
++    unz_s* s;
++    int err;
++
++    if (file==NULL)
++        return UNZ_PARAMERROR;
++    s=(unz_s*)file;
++
++    s->pos_in_central_dir = pos;
++    s->num_file = s->gi.number_entry;      /* hack */
++    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
++                                              &s->cur_file_info_internal,
++                                              NULL,0,NULL,0,NULL,0);
++    s->current_file_ok = (err == UNZ_OK);
++    return err;
++}
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/unzip.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/unzip.h
+new file mode 100644
+index 0000000..b247937
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/unzip.h
+@@ -0,0 +1,354 @@
++/* unzip.h -- IO for uncompress .zip files using zlib
++   Version 1.01e, February 12th, 2005
++
++   Copyright (C) 1998-2005 Gilles Vollant
++
++   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
++     WinZip, InfoZip tools and compatible.
++
++   Multi volume ZipFile (span) are not supported.
++   Encryption compatible with pkzip 2.04g only supported
++   Old compressions used by old PKZip 1.x are not supported
++
++
++   I WAIT FEEDBACK at mail info@winimage.com
++   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
++
++   Condition of use and distribution are the same than zlib :
++
++  This software is provided 'as-is', without any express or implied
++  warranty.  In no event will the authors be held liable for any damages
++  arising from the use of this software.
++
++  Permission is granted to anyone to use this software for any purpose,
++  including commercial applications, and to alter it and redistribute it
++  freely, subject to the following restrictions:
++
++  1. The origin of this software must not be misrepresented; you must not
++     claim that you wrote the original software. If you use this software
++     in a product, an acknowledgment in the product documentation would be
++     appreciated but is not required.
++  2. Altered source versions must be plainly marked as such, and must not be
++     misrepresented as being the original software.
++  3. This notice may not be removed or altered from any source distribution.
++
++
++*/
++
++/* for more info about .ZIP format, see
++      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
++      http://www.info-zip.org/pub/infozip/doc/
++   PkWare has also a specification at :
++      ftp://ftp.pkware.com/probdesc.zip
++*/
++
++#ifndef _unz_H
++#define _unz_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifndef _ZLIB_H
++#include "zlib.h"
++#endif
++
++#ifndef _ZLIBIOAPI_H
++#include "ioapi.h"
++#endif
++
++#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
++/* like the STRICT of WIN32, we define a pointer that cannot be converted
++    from (void*) without cast */
++typedef struct TagunzFile__ { int unused; } unzFile__;
++typedef unzFile__ *unzFile;
++#else
++typedef voidp unzFile;
++#endif
++
++
++#define UNZ_OK                          (0)
++#define UNZ_END_OF_LIST_OF_FILE         (-100)
++#define UNZ_ERRNO                       (Z_ERRNO)
++#define UNZ_EOF                         (0)
++#define UNZ_PARAMERROR                  (-102)
++#define UNZ_BADZIPFILE                  (-103)
++#define UNZ_INTERNALERROR               (-104)
++#define UNZ_CRCERROR                    (-105)
++
++/* tm_unz contain date/time info */
++typedef struct tm_unz_s
++{
++    uInt tm_sec;            /* seconds after the minute - [0,59] */
++    uInt tm_min;            /* minutes after the hour - [0,59] */
++    uInt tm_hour;           /* hours since midnight - [0,23] */
++    uInt tm_mday;           /* day of the month - [1,31] */
++    uInt tm_mon;            /* months since January - [0,11] */
++    uInt tm_year;           /* years - [1980..2044] */
++} tm_unz;
++
++/* unz_global_info structure contain global data about the ZIPfile
++   These data comes from the end of central dir */
++typedef struct unz_global_info_s
++{
++    uLong number_entry;         /* total number of entries in
++                       the central dir on this disk */
++    uLong size_comment;         /* size of the global comment of the zipfile */
++} unz_global_info;
++
++
++/* unz_file_info contain information about a file in the zipfile */
++typedef struct unz_file_info_s
++{
++    uLong version;              /* version made by                 2 bytes */
++    uLong version_needed;       /* version needed to extract       2 bytes */
++    uLong flag;                 /* general purpose bit flag        2 bytes */
++    uLong compression_method;   /* compression method              2 bytes */
++    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
++    uLong crc;                  /* crc-32                          4 bytes */
++    uLong compressed_size;      /* compressed size                 4 bytes */
++    uLong uncompressed_size;    /* uncompressed size               4 bytes */
++    uLong size_filename;        /* filename length                 2 bytes */
++    uLong size_file_extra;      /* extra field length              2 bytes */
++    uLong size_file_comment;    /* file comment length             2 bytes */
++
++    uLong disk_num_start;       /* disk number start               2 bytes */
++    uLong internal_fa;          /* internal file attributes        2 bytes */
++    uLong external_fa;          /* external file attributes        4 bytes */
++
++    tm_unz tmu_date;
++} unz_file_info;
++
++extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
++                                                 const char* fileName2,
++                                                 int iCaseSensitivity));
++/*
++   Compare two filename (fileName1,fileName2).
++   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
++   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
++                                or strcasecmp)
++   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
++    (like 1 on Unix, 2 on Windows)
++*/
++
++
++extern unzFile ZEXPORT unzOpen OF((const char *path));
++/*
++  Open a Zip file. path contain the full pathname (by example,
++     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
++     "zlib/zlib113.zip".
++     If the zipfile cannot be opened (file don't exist or in not valid), the
++       return value is NULL.
++     Else, the return value is a unzFile Handle, usable with other function
++       of this unzip package.
++*/
++
++extern unzFile ZEXPORT unzOpen2 OF((const char *path,
++                                    zlib_filefunc_def* pzlib_filefunc_def));
++/*
++   Open a Zip file, like unzOpen, but provide a set of file low level API
++      for read/write the zip file (see ioapi.h)
++*/
++
++extern int ZEXPORT unzClose OF((unzFile file));
++/*
++  Close a ZipFile opened with unzipOpen.
++  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
++    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
++  return UNZ_OK if there is no problem. */
++
++extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
++                                        unz_global_info *pglobal_info));
++/*
++  Write info about the ZipFile in the *pglobal_info structure.
++  No preparation of the structure is needed
++  return UNZ_OK if there is no problem. */
++
++
++extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
++                                           char *szComment,
++                                           uLong uSizeBuf));
++/*
++  Get the global comment string of the ZipFile, in the szComment buffer.
++  uSizeBuf is the size of the szComment buffer.
++  return the number of byte copied or an error code <0
++*/
++
++
++/***************************************************************************/
++/* Unzip package allow you browse the directory of the zipfile */
++
++extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
++/*
++  Set the current file of the zipfile to the first file.
++  return UNZ_OK if there is no problem
++*/
++
++extern int ZEXPORT unzGoToNextFile OF((unzFile file));
++/*
++  Set the current file of the zipfile to the next file.
++  return UNZ_OK if there is no problem
++  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
++*/
++
++extern int ZEXPORT unzLocateFile OF((unzFile file,
++                     const char *szFileName,
++                     int iCaseSensitivity));
++/*
++  Try locate the file szFileName in the zipfile.
++  For the iCaseSensitivity signification, see unzStringFileNameCompare
++
++  return value :
++  UNZ_OK if the file is found. It becomes the current file.
++  UNZ_END_OF_LIST_OF_FILE if the file is not found
++*/
++
++
++/* ****************************************** */
++/* Ryan supplied functions */
++/* unz_file_info contain information about a file in the zipfile */
++typedef struct unz_file_pos_s
++{
++    uLong pos_in_zip_directory;   /* offset in zip file directory */
++    uLong num_of_file;            /* # of file */
++} unz_file_pos;
++
++extern int ZEXPORT unzGetFilePos(
++    unzFile file,
++    unz_file_pos* file_pos);
++
++extern int ZEXPORT unzGoToFilePos(
++    unzFile file,
++    unz_file_pos* file_pos);
++
++/* ****************************************** */
++
++extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
++                         unz_file_info *pfile_info,
++                         char *szFileName,
++                         uLong fileNameBufferSize,
++                         void *extraField,
++                         uLong extraFieldBufferSize,
++                         char *szComment,
++                         uLong commentBufferSize));
++/*
++  Get Info about the current file
++  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
++        the current file
++  if szFileName!=NULL, the filemane string will be copied in szFileName
++            (fileNameBufferSize is the size of the buffer)
++  if extraField!=NULL, the extra field information will be copied in extraField
++            (extraFieldBufferSize is the size of the buffer).
++            This is the Central-header version of the extra field
++  if szComment!=NULL, the comment string of the file will be copied in szComment
++            (commentBufferSize is the size of the buffer)
++*/
++
++/***************************************************************************/
++/* for reading the content of the current zipfile, you can open it, read data
++   from it, and close it (you can close it before reading all the file)
++   */
++
++extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
++/*
++  Open for reading data the current file in the zipfile.
++  If there is no error, the return value is UNZ_OK.
++*/
++
++extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
++                                                  const char* password));
++/*
++  Open for reading data the current file in the zipfile.
++  password is a crypting password
++  If there is no error, the return value is UNZ_OK.
++*/
++
++extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
++                                           int* method,
++                                           int* level,
++                                           int raw));
++/*
++  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
++    if raw==1
++  *method will receive method of compression, *level will receive level of
++     compression
++  note : you can set level parameter as NULL (if you did not want known level,
++         but you CANNOT set method parameter as NULL
++*/
++
++extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
++                                           int* method,
++                                           int* level,
++                                           int raw,
++                                           const char* password));
++/*
++  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
++    if raw==1
++  *method will receive method of compression, *level will receive level of
++     compression
++  note : you can set level parameter as NULL (if you did not want known level,
++         but you CANNOT set method parameter as NULL
++*/
++
++
++extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
++/*
++  Close the file in zip opened with unzOpenCurrentFile
++  Return UNZ_CRCERROR if all the file was read but the CRC is not good
++*/
++
++extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
++                      voidp buf,
++                      unsigned len));
++/*
++  Read bytes from the current file (opened by unzOpenCurrentFile)
++  buf contain buffer where data must be copied
++  len the size of buf.
++
++  return the number of byte copied if somes bytes are copied
++  return 0 if the end of file was reached
++  return <0 with error code if there is an error
++    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
++*/
++
++extern z_off_t ZEXPORT unztell OF((unzFile file));
++/*
++  Give the current position in uncompressed data
++*/
++
++extern int ZEXPORT unzeof OF((unzFile file));
++/*
++  return 1 if the end of file was reached, 0 elsewhere
++*/
++
++extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
++                                             voidp buf,
++                                             unsigned len));
++/*
++  Read extra field from the current file (opened by unzOpenCurrentFile)
++  This is the local-header version of the extra field (sometimes, there is
++    more info in the local-header version than in the central-header)
++
++  if buf==NULL, it return the size of the local extra field
++
++  if buf!=NULL, len is the size of the buffer, the extra header is copied in
++    buf.
++  the return value is the number of bytes copied in buf, or (if <0)
++    the error code
++*/
++
++/***************************************************************************/
++
++/* Get the current file offset */
++extern uLong ZEXPORT unzGetOffset (unzFile file);
++
++/* Set the current file offset */
++extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
++
++
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* _unz_H */
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/zip.c b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/zip.c
+new file mode 100644
+index 0000000..e261706
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/zip.c
+@@ -0,0 +1,1214 @@
++/* zip.c -- IO on .zip files using zlib
++   Version 1.01e, February 12th, 2005
++
++   27 Dec 2004 Rolf Kalbermatter
++   Modification to zipOpen2 to support globalComment retrieval.
++
++   Copyright (C) 1998-2005 Gilles Vollant
++
++   Read zip.h for more info
++*/
++
++#define NOCRYPT
++#define NOUNCRYPT
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <time.h>
++#include "zlib.h"
++#include "zip.h"
++
++#ifdef STDC
++#  include <stddef.h>
++#  include <string.h>
++#  include <stdlib.h>
++#endif
++#ifdef NO_ERRNO_H
++    extern int errno;
++#else
++#   include <errno.h>
++#endif
++
++
++#ifndef local
++#  define local static
++#endif
++/* compile with -Dlocal if your debugger can't find static symbols */
++
++#ifndef VERSIONMADEBY
++# define VERSIONMADEBY   (0x0) /* platform depedent */
++#endif
++
++#ifndef Z_BUFSIZE
++#define Z_BUFSIZE (16384)
++#endif
++
++#ifndef Z_MAXFILENAMEINZIP
++#define Z_MAXFILENAMEINZIP (256)
++#endif
++
++#ifndef ALLOC
++# define ALLOC(size) (malloc(size))
++#endif
++#ifndef TRYFREE
++# define TRYFREE(p) {if (p) free(p);}
++#endif
++
++/*
++#define SIZECENTRALDIRITEM (0x2e)
++#define SIZEZIPLOCALHEADER (0x1e)
++*/
++
++/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
++
++#ifndef SEEK_CUR
++#define SEEK_CUR    1
++#endif
++
++#ifndef SEEK_END
++#define SEEK_END    2
++#endif
++
++#ifndef SEEK_SET
++#define SEEK_SET    0
++#endif
++
++#ifndef DEF_MEM_LEVEL
++#if MAX_MEM_LEVEL >= 8
++#  define DEF_MEM_LEVEL 8
++#else
++#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
++#endif
++#endif
++const char zip_copyright[] =
++   " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
++
++
++#define SIZEDATA_INDATABLOCK (4096-(4*4))
++
++#define LOCALHEADERMAGIC    (0x04034b50)
++#define CENTRALHEADERMAGIC  (0x02014b50)
++#define ENDHEADERMAGIC      (0x06054b50)
++
++#define FLAG_LOCALHEADER_OFFSET (0x06)
++#define CRC_LOCALHEADER_OFFSET  (0x0e)
++
++#define SIZECENTRALHEADER (0x2e) /* 46 */
++
++typedef struct linkedlist_datablock_internal_s
++{
++  struct linkedlist_datablock_internal_s* next_datablock;
++  uLong  avail_in_this_block;
++  uLong  filled_in_this_block;
++  uLong  unused; /* for future use and alignement */
++  unsigned char data[SIZEDATA_INDATABLOCK];
++} linkedlist_datablock_internal;
++
++typedef struct linkedlist_data_s
++{
++    linkedlist_datablock_internal* first_block;
++    linkedlist_datablock_internal* last_block;
++} linkedlist_data;
++
++
++typedef struct
++{
++    z_stream stream;            /* zLib stream structure for inflate */
++    int  stream_initialised;    /* 1 is stream is initialised */
++    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
++
++    uLong pos_local_header;     /* offset of the local header of the file
++                                     currenty writing */
++    char* central_header;       /* central header data for the current file */
++    uLong size_centralheader;   /* size of the central header for cur file */
++    uLong flag;                 /* flag of the file currently writing */
++
++    int  method;                /* compression method of file currenty wr.*/
++    int  raw;                   /* 1 for directly writing raw data */
++    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
++    uLong dosDate;
++    uLong crc32;
++    int  encrypt;
++#ifndef NOCRYPT
++    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
++    const unsigned long* pcrc_32_tab;
++    int crypt_header_size;
++#endif
++} curfile_info;
++
++typedef struct
++{
++    zlib_filefunc_def z_filefunc;
++    voidpf filestream;        /* io structore of the zipfile */
++    linkedlist_data central_dir;/* datablock with central dir in construction*/
++    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
++    curfile_info ci;            /* info on the file curretly writing */
++
++    uLong begin_pos;            /* position of the beginning of the zipfile */
++    uLong add_position_when_writting_offset;
++    uLong number_entry;
++#ifndef NO_ADDFILEINEXISTINGZIP
++    char *globalcomment;
++#endif
++} zip_internal;
++
++
++
++#ifndef NOCRYPT
++#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
++#include "crypt.h"
++#endif
++
++local linkedlist_datablock_internal* allocate_new_datablock()
++{
++    linkedlist_datablock_internal* ldi;
++    ldi = (linkedlist_datablock_internal*)
++                 ALLOC(sizeof(linkedlist_datablock_internal));
++    if (ldi!=NULL)
++    {
++        ldi->next_datablock = NULL ;
++        ldi->filled_in_this_block = 0 ;
++        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
++    }
++    return ldi;
++}
++
++local void free_datablock(ldi)
++    linkedlist_datablock_internal* ldi;
++{
++    while (ldi!=NULL)
++    {
++        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
++        TRYFREE(ldi);
++        ldi = ldinext;
++    }
++}
++
++local void init_linkedlist(ll)
++    linkedlist_data* ll;
++{
++    ll->first_block = ll->last_block = NULL;
++}
++
++local int add_data_in_datablock(ll,buf,len)
++    linkedlist_data* ll;
++    const void* buf;
++    uLong len;
++{
++    linkedlist_datablock_internal* ldi;
++    const unsigned char* from_copy;
++
++    if (ll==NULL)
++        return ZIP_INTERNALERROR;
++
++    if (ll->last_block == NULL)
++    {
++        ll->first_block = ll->last_block = allocate_new_datablock();
++        if (ll->first_block == NULL)
++            return ZIP_INTERNALERROR;
++    }
++
++    ldi = ll->last_block;
++    from_copy = (unsigned char*)buf;
++
++    while (len>0)
++    {
++        uInt copy_this;
++        uInt i;
++        unsigned char* to_copy;
++
++        if (ldi->avail_in_this_block==0)
++        {
++            ldi->next_datablock = allocate_new_datablock();
++            if (ldi->next_datablock == NULL)
++                return ZIP_INTERNALERROR;
++            ldi = ldi->next_datablock ;
++            ll->last_block = ldi;
++        }
++
++        if (ldi->avail_in_this_block < len)
++            copy_this = (uInt)ldi->avail_in_this_block;
++        else
++            copy_this = (uInt)len;
++
++        to_copy = &(ldi->data[ldi->filled_in_this_block]);
++
++        for (i=0;i<copy_this;i++)
++            *(to_copy+i)=*(from_copy+i);
++
++        ldi->filled_in_this_block += copy_this;
++        ldi->avail_in_this_block -= copy_this;
++        from_copy += copy_this ;
++        len -= copy_this;
++    }
++    return ZIP_OK;
++}
++
++
++
++/****************************************************************************/
++
++#ifndef NO_ADDFILEINEXISTINGZIP
++/* ===========================================================================
++   Inputs a long in LSB order to the given file
++   nbByte == 1, 2 or 4 (byte, short or long)
++*/
++
++local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
++                                voidpf filestream, uLong x, int nbByte));
++local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++    uLong x;
++    int nbByte;
++{
++    unsigned char buf[4];
++    int n;
++    for (n = 0; n < nbByte; n++)
++    {
++        buf[n] = (unsigned char)(x & 0xff);
++        x >>= 8;
++    }
++    if (x != 0)
++      {     /* data overflow - hack for ZIP64 (X Roche) */
++      for (n = 0; n < nbByte; n++)
++        {
++          buf[n] = 0xff;
++        }
++      }
++
++    if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
++        return ZIP_ERRNO;
++    else
++        return ZIP_OK;
++}
++
++local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
++local void ziplocal_putValue_inmemory (dest, x, nbByte)
++    void* dest;
++    uLong x;
++    int nbByte;
++{
++    unsigned char* buf=(unsigned char*)dest;
++    int n;
++    for (n = 0; n < nbByte; n++) {
++        buf[n] = (unsigned char)(x & 0xff);
++        x >>= 8;
++    }
++
++    if (x != 0)
++    {     /* data overflow - hack for ZIP64 */
++       for (n = 0; n < nbByte; n++)
++       {
++          buf[n] = 0xff;
++       }
++    }
++}
++
++/****************************************************************************/
++
++
++local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
++    const tm_zip* ptm;
++    uLong dosDate;
++{
++    uLong year = (uLong)ptm->tm_year;
++    if (year>1980)
++        year-=1980;
++    else if (year>80)
++        year-=80;
++    return
++      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
++        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
++}
++
++
++/****************************************************************************/
++
++local int ziplocal_getByte OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream,
++    int *pi));
++
++local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++    int *pi;
++{
++    unsigned char c;
++    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
++    if (err==1)
++    {
++        *pi = (int)c;
++        return ZIP_OK;
++    }
++    else
++    {
++        if (ZERROR(*pzlib_filefunc_def,filestream))
++            return ZIP_ERRNO;
++        else
++            return ZIP_EOF;
++    }
++}
++
++
++/* ===========================================================================
++   Reads a long in LSB order from the given gz_stream. Sets
++*/
++local int ziplocal_getShort OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream,
++    uLong *pX));
++
++local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++    uLong *pX;
++{
++    uLong x = 0;
++    int i = 0;
++    int err = 0;
++
++    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x = (uLong)i;
++
++    if (err==ZIP_OK)
++        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<8;
++
++    if (err==ZIP_OK)
++        *pX = x;
++    else
++        *pX = 0;
++    return err;
++}
++
++local int ziplocal_getLong OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream,
++    uLong *pX));
++
++local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++    uLong *pX;
++{
++    uLong x =0;
++    int i=0;
++    int err=0;
++
++    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x = (uLong)i;
++
++    if (err==ZIP_OK)
++        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<8;
++
++    if (err==ZIP_OK)
++        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<16;
++
++    if (err==ZIP_OK)
++        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
++    x += ((uLong)i)<<24;
++
++    if (err==ZIP_OK)
++        *pX = x;
++    else
++        *pX = 0;
++    return err;
++}
++
++#ifndef BUFREADCOMMENT
++#define BUFREADCOMMENT (0x400)
++#endif
++/*
++  Locate the Central directory of a zipfile (at the end, just before
++    the global comment)
++*/
++local uLong ziplocal_SearchCentralDir OF((
++    const zlib_filefunc_def* pzlib_filefunc_def,
++    voidpf filestream));
++
++local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
++    const zlib_filefunc_def* pzlib_filefunc_def;
++    voidpf filestream;
++{
++    unsigned char* buf;
++    uLong uSizeFile;
++    uLong uBackRead;
++    uLong uMaxBack=0xffff; /* maximum size of global comment */
++    uLong uPosFound=0;
++
++    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
++        return 0;
++
++
++    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
++
++    if (uMaxBack>uSizeFile)
++        uMaxBack = uSizeFile;
++
++    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
++    if (buf==NULL)
++        return 0;
++
++    uBackRead = 4;
++    while (uBackRead<uMaxBack)
++    {
++        uLong uReadSize,uReadPos ;
++        int i;
++        if (uBackRead+BUFREADCOMMENT>uMaxBack)
++            uBackRead = uMaxBack;
++        else
++            uBackRead+=BUFREADCOMMENT;
++        uReadPos = uSizeFile-uBackRead ;
++
++        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
++                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
++        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
++            break;
++
++        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
++            break;
++
++        for (i=(int)uReadSize-3; (i--)>0;)
++            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
++                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
++            {
++                uPosFound = uReadPos+i;
++                break;
++            }
++
++        if (uPosFound!=0)
++            break;
++    }
++    TRYFREE(buf);
++    return uPosFound;
++}
++#endif /* !NO_ADDFILEINEXISTINGZIP*/
++
++/************************************************************/
++extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
++    const char *pathname;
++    int append;
++    zipcharpc* globalcomment;
++    zlib_filefunc_def* pzlib_filefunc_def;
++{
++    zip_internal ziinit;
++    zip_internal* zi;
++    int err=ZIP_OK;
++
++
++    if (pzlib_filefunc_def==NULL)
++        fill_fopen_filefunc(&ziinit.z_filefunc);
++    else
++        ziinit.z_filefunc = *pzlib_filefunc_def;
++
++    ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))
++                 (ziinit.z_filefunc.opaque,
++                  pathname,
++                  (append == APPEND_STATUS_CREATE) ?
++                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
++                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
++
++    if (ziinit.filestream == NULL)
++        return NULL;
++    ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);
++    ziinit.in_opened_file_inzip = 0;
++    ziinit.ci.stream_initialised = 0;
++    ziinit.number_entry = 0;
++    ziinit.add_position_when_writting_offset = 0;
++    init_linkedlist(&(ziinit.central_dir));
++
++
++    zi = (zip_internal*)ALLOC(sizeof(zip_internal));
++    if (zi==NULL)
++    {
++        ZCLOSE(ziinit.z_filefunc,ziinit.filestream);
++        return NULL;
++    }
++
++    /* now we add file in a zipfile */
++#    ifndef NO_ADDFILEINEXISTINGZIP
++    ziinit.globalcomment = NULL;
++    if (append == APPEND_STATUS_ADDINZIP)
++    {
++        uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
++
++        uLong size_central_dir;     /* size of the central directory  */
++        uLong offset_central_dir;   /* offset of start of central directory */
++        uLong central_pos,uL;
++
++        uLong number_disk;          /* number of the current dist, used for
++                                    spaning ZIP, unsupported, always 0*/
++        uLong number_disk_with_CD;  /* number the the disk with central dir, used
++                                    for spaning ZIP, unsupported, always 0*/
++        uLong number_entry;
++        uLong number_entry_CD;      /* total number of entries in
++                                    the central dir
++                                    (same than number_entry on nospan) */
++        uLong size_comment;
++
++        central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);
++        if (central_pos==0)
++            err=ZIP_ERRNO;
++
++        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
++                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
++            err=ZIP_ERRNO;
++
++        /* the signature, already checked */
++        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        /* number of this disk */
++        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        /* number of the disk with the start of the central directory */
++        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        /* total number of entries in the central dir on this disk */
++        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        /* total number of entries in the central dir */
++        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        if ((number_entry_CD!=number_entry) ||
++            (number_disk_with_CD!=0) ||
++            (number_disk!=0))
++            err=ZIP_BADZIPFILE;
++
++        /* size of the central directory */
++        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        /* offset of start of central directory with respect to the
++            starting disk number */
++        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        /* zipfile global comment length */
++        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)
++            err=ZIP_ERRNO;
++
++        if ((central_pos<offset_central_dir+size_central_dir) &&
++            (err==ZIP_OK))
++            err=ZIP_BADZIPFILE;
++
++        if (err!=ZIP_OK)
++        {
++            TRYFREE(zi);
++            ZCLOSE(ziinit.z_filefunc, ziinit.filestream);
++            return NULL;
++        }
++
++        if (size_comment>0)
++        {
++            ziinit.globalcomment = ALLOC(size_comment+1);
++            if (ziinit.globalcomment)
++            {
++               size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
++               ziinit.globalcomment[size_comment]=0;
++            }
++        }
++
++        byte_before_the_zipfile = central_pos -
++                                (offset_central_dir+size_central_dir);
++        ziinit.add_position_when_writting_offset = byte_before_the_zipfile;
++
++        {
++            uLong size_central_dir_to_read = size_central_dir;
++            size_t buf_size = SIZEDATA_INDATABLOCK;
++            void* buf_read = (void*)ALLOC(buf_size);
++            if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
++                  offset_central_dir + byte_before_the_zipfile,
++                  ZLIB_FILEFUNC_SEEK_SET) != 0)
++                  err=ZIP_ERRNO;
++
++            while ((size_central_dir_to_read>0) && (err==ZIP_OK))
++            {
++                uLong read_this = SIZEDATA_INDATABLOCK;
++                if (read_this > size_central_dir_to_read)
++                    read_this = size_central_dir_to_read;
++                if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)
++                    err=ZIP_ERRNO;
++
++                if (err==ZIP_OK)
++                    err = add_data_in_datablock(&ziinit.central_dir,buf_read,
++                                                (uLong)read_this);
++                size_central_dir_to_read-=read_this;
++            }
++            TRYFREE(buf_read);
++        }
++        ziinit.begin_pos = byte_before_the_zipfile;
++        ziinit.number_entry = number_entry_CD;
++
++        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
++                  offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
++            err=ZIP_ERRNO;
++    }
++
++    if (globalcomment)
++    {
++      *globalcomment = ziinit.globalcomment;
++    }
++#    endif /* !NO_ADDFILEINEXISTINGZIP*/
++
++    if (err != ZIP_OK)
++    {
++#    ifndef NO_ADDFILEINEXISTINGZIP
++        TRYFREE(ziinit.globalcomment);
++#    endif /* !NO_ADDFILEINEXISTINGZIP*/
++        TRYFREE(zi);
++        return NULL;
++    }
++    else
++    {
++        *zi = ziinit;
++        return (zipFile)zi;
++    }
++}
++
++extern zipFile ZEXPORT zipOpen (pathname, append)
++    const char *pathname;
++    int append;
++{
++    return zipOpen2(pathname,append,NULL,NULL);
++}
++
++extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
++                                         extrafield_local, size_extrafield_local,
++                                         extrafield_global, size_extrafield_global,
++                                         comment, method, level, raw,
++                                         windowBits, memLevel, strategy,
++                                         password, crcForCrypting)
++    zipFile file;
++    const char* filename;
++    const zip_fileinfo* zipfi;
++    const void* extrafield_local;
++    uInt size_extrafield_local;
++    const void* extrafield_global;
++    uInt size_extrafield_global;
++    const char* comment;
++    int method;
++    int level;
++    int raw;
++    int windowBits;
++    int memLevel;
++    int strategy;
++    const char* password;
++    uLong crcForCrypting;
++{
++    zip_internal* zi;
++    uInt size_filename;
++    uInt size_comment;
++    uInt i;
++    int err = ZIP_OK;
++
++#    ifdef NOCRYPT
++    if (password != NULL)
++        return ZIP_PARAMERROR;
++#    endif
++
++    if (file == NULL)
++        return ZIP_PARAMERROR;
++    if ((method!=0) && (method!=Z_DEFLATED))
++        return ZIP_PARAMERROR;
++
++    zi = (zip_internal*)file;
++
++    if (zi->in_opened_file_inzip == 1)
++    {
++        err = zipCloseFileInZip (file);
++        if (err != ZIP_OK)
++            return err;
++    }
++
++
++    if (filename==NULL)
++        filename="-";
++
++    if (comment==NULL)
++        size_comment = 0;
++    else
++        size_comment = (uInt)strlen(comment);
++
++    size_filename = (uInt)strlen(filename);
++
++    if (zipfi == NULL)
++        zi->ci.dosDate = 0;
++    else
++    {
++        if (zipfi->dosDate != 0)
++            zi->ci.dosDate = zipfi->dosDate;
++        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);
++    }
++
++    zi->ci.flag = 0;
++    if ((level==8) || (level==9))
++      zi->ci.flag |= 2;
++    if (level==2)
++      zi->ci.flag |= 4;
++    if (level==1)
++      zi->ci.flag |= 6;
++    if (password != NULL)
++      zi->ci.flag |= 1;
++
++    zi->ci.crc32 = 0;
++    zi->ci.method = method;
++    zi->ci.encrypt = 0;
++    zi->ci.stream_initialised = 0;
++    zi->ci.pos_in_buffered_data = 0;
++    zi->ci.raw = raw;
++    zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;
++    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +
++                                      size_extrafield_global + size_comment;
++    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);
++
++    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
++    /* version info */
++    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
++    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
++    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
++    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
++    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
++
++    if (zipfi==NULL)
++        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
++    else
++        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
++
++    if (zipfi==NULL)
++        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
++    else
++        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
++
++    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);
++
++    for (i=0;i<size_filename;i++)
++        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
++
++    for (i=0;i<size_extrafield_global;i++)
++        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
++              *(((const char*)extrafield_global)+i);
++
++    for (i=0;i<size_comment;i++)
++        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
++              size_extrafield_global+i) = *(comment+i);
++    if (zi->ci.central_header == NULL)
++        return ZIP_INTERNALERROR;
++
++    /* write the local header */
++    err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);
++
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
++
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
++
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
++
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
++
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
++
++    if (err==ZIP_OK)
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);
++
++    if ((err==ZIP_OK) && (size_filename>0))
++        if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
++                err = ZIP_ERRNO;
++
++    if ((err==ZIP_OK) && (size_extrafield_local>0))
++        if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)
++                                                                           !=size_extrafield_local)
++                err = ZIP_ERRNO;
++
++    zi->ci.stream.avail_in = (uInt)0;
++    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
++    zi->ci.stream.next_out = zi->ci.buffered_data;
++    zi->ci.stream.total_in = 0;
++    zi->ci.stream.total_out = 0;
++
++    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
++    {
++        zi->ci.stream.zalloc = (alloc_func)0;
++        zi->ci.stream.zfree = (free_func)0;
++        zi->ci.stream.opaque = (voidpf)0;
++
++        if (windowBits>0)
++            windowBits = -windowBits;
++
++        err = deflateInit2(&zi->ci.stream, level,
++               Z_DEFLATED, windowBits, memLevel, strategy);
++
++        if (err==Z_OK)
++            zi->ci.stream_initialised = 1;
++    }
++#    ifndef NOCRYPT
++    zi->ci.crypt_header_size = 0;
++    if ((err==Z_OK) && (password != NULL))
++    {
++        unsigned char bufHead[RAND_HEAD_LEN];
++        unsigned int sizeHead;
++        zi->ci.encrypt = 1;
++        zi->ci.pcrc_32_tab = get_crc_table();
++        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
++
++        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
++        zi->ci.crypt_header_size = sizeHead;
++
++        if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
++                err = ZIP_ERRNO;
++    }
++#    endif
++
++    if (err==Z_OK)
++        zi->in_opened_file_inzip = 1;
++    return err;
++}
++
++extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
++                                        extrafield_local, size_extrafield_local,
++                                        extrafield_global, size_extrafield_global,
++                                        comment, method, level, raw)
++    zipFile file;
++    const char* filename;
++    const zip_fileinfo* zipfi;
++    const void* extrafield_local;
++    uInt size_extrafield_local;
++    const void* extrafield_global;
++    uInt size_extrafield_global;
++    const char* comment;
++    int method;
++    int level;
++    int raw;
++{
++    return zipOpenNewFileInZip3 (file, filename, zipfi,
++                                 extrafield_local, size_extrafield_local,
++                                 extrafield_global, size_extrafield_global,
++                                 comment, method, level, raw,
++                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
++                                 NULL, 0);
++}
++
++extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
++                                        extrafield_local, size_extrafield_local,
++                                        extrafield_global, size_extrafield_global,
++                                        comment, method, level)
++    zipFile file;
++    const char* filename;
++    const zip_fileinfo* zipfi;
++    const void* extrafield_local;
++    uInt size_extrafield_local;
++    const void* extrafield_global;
++    uInt size_extrafield_global;
++    const char* comment;
++    int method;
++    int level;
++{
++    return zipOpenNewFileInZip2 (file, filename, zipfi,
++                                 extrafield_local, size_extrafield_local,
++                                 extrafield_global, size_extrafield_global,
++                                 comment, method, level, 0);
++}
++
++local int zipFlushWriteBuffer(zi)
++  zip_internal* zi;
++{
++    int err=ZIP_OK;
++
++    if (zi->ci.encrypt != 0)
++    {
++#ifndef NOCRYPT
++        uInt i;
++        int t;
++        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
++            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,
++                                       zi->ci.buffered_data[i],t);
++#endif
++    }
++    if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)
++                                                                    !=zi->ci.pos_in_buffered_data)
++      err = ZIP_ERRNO;
++    zi->ci.pos_in_buffered_data = 0;
++    return err;
++}
++
++extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
++    zipFile file;
++    const void* buf;
++    unsigned len;
++{
++    zip_internal* zi;
++    int err=ZIP_OK;
++
++    if (file == NULL)
++        return ZIP_PARAMERROR;
++    zi = (zip_internal*)file;
++
++    if (zi->in_opened_file_inzip == 0)
++        return ZIP_PARAMERROR;
++
++    zi->ci.stream.next_in = (void*)buf;
++    zi->ci.stream.avail_in = len;
++    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
++
++    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
++    {
++        if (zi->ci.stream.avail_out == 0)
++        {
++            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
++                err = ZIP_ERRNO;
++            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
++            zi->ci.stream.next_out = zi->ci.buffered_data;
++        }
++
++
++        if(err != ZIP_OK)
++            break;
++
++        if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
++        {
++            uLong uTotalOutBefore = zi->ci.stream.total_out;
++            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
++            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
++
++        }
++        else
++        {
++            uInt copy_this,i;
++            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
++                copy_this = zi->ci.stream.avail_in;
++            else
++                copy_this = zi->ci.stream.avail_out;
++            for (i=0;i<copy_this;i++)
++                *(((char*)zi->ci.stream.next_out)+i) =
++                    *(((const char*)zi->ci.stream.next_in)+i);
++            {
++                zi->ci.stream.avail_in -= copy_this;
++                zi->ci.stream.avail_out-= copy_this;
++                zi->ci.stream.next_in+= copy_this;
++                zi->ci.stream.next_out+= copy_this;
++                zi->ci.stream.total_in+= copy_this;
++                zi->ci.stream.total_out+= copy_this;
++                zi->ci.pos_in_buffered_data += copy_this;
++            }
++        }
++    }
++
++    return err;
++}
++
++extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
++    zipFile file;
++    uLong uncompressed_size;
++    uLong crc32;
++{
++    zip_internal* zi;
++    uLong compressed_size;
++    int err=ZIP_OK;
++
++    if (file == NULL)
++        return ZIP_PARAMERROR;
++    zi = (zip_internal*)file;
++
++    if (zi->in_opened_file_inzip == 0)
++        return ZIP_PARAMERROR;
++    zi->ci.stream.avail_in = 0;
++
++    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
++        while (err==ZIP_OK)
++    {
++        uLong uTotalOutBefore;
++        if (zi->ci.stream.avail_out == 0)
++        {
++            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
++                err = ZIP_ERRNO;
++            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
++            zi->ci.stream.next_out = zi->ci.buffered_data;
++        }
++        uTotalOutBefore = zi->ci.stream.total_out;
++        err=deflate(&zi->ci.stream,  Z_FINISH);
++        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
++    }
++
++    if (err==Z_STREAM_END)
++        err=ZIP_OK; /* this is normal */
++
++    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
++        if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)
++            err = ZIP_ERRNO;
++
++    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
++    {
++        err=deflateEnd(&zi->ci.stream);
++        zi->ci.stream_initialised = 0;
++    }
++
++    if (!zi->ci.raw)
++    {
++        crc32 = (uLong)zi->ci.crc32;
++        uncompressed_size = (uLong)zi->ci.stream.total_in;
++    }
++    compressed_size = (uLong)zi->ci.stream.total_out;
++#    ifndef NOCRYPT
++    compressed_size += zi->ci.crypt_header_size;
++#    endif
++
++    ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
++    ziplocal_putValue_inmemory(zi->ci.central_header+20,
++                                compressed_size,4); /*compr size*/
++    if (zi->ci.stream.data_type == Z_ASCII)
++        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
++    ziplocal_putValue_inmemory(zi->ci.central_header+24,
++                                uncompressed_size,4); /*uncompr size*/
++
++    if (err==ZIP_OK)
++        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,
++                                       (uLong)zi->ci.size_centralheader);
++    free(zi->ci.central_header);
++
++    if (err==ZIP_OK)
++    {
++        long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
++        if (ZSEEK(zi->z_filefunc,zi->filestream,
++                  zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
++            err = ZIP_ERRNO;
++
++        if (err==ZIP_OK)
++            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
++
++        if (err==ZIP_OK) /* compressed size, unknown */
++            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
++
++        if (err==ZIP_OK) /* uncompressed size, unknown */
++            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
++
++        if (ZSEEK(zi->z_filefunc,zi->filestream,
++                  cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
++            err = ZIP_ERRNO;
++    }
++
++    zi->number_entry ++;
++    zi->in_opened_file_inzip = 0;
++
++    return err;
++}
++
++extern int ZEXPORT zipCloseFileInZip (file)
++    zipFile file;
++{
++    return zipCloseFileInZipRaw (file,0,0);
++}
++
++extern int ZEXPORT zipClose (file, global_comment)
++    zipFile file;
++    const char* global_comment;
++{
++    zip_internal* zi;
++    int err = 0;
++    uLong size_centraldir = 0;
++    uLong centraldir_pos_inzip;
++    uInt size_global_comment;
++    if (file == NULL)
++        return ZIP_PARAMERROR;
++    zi = (zip_internal*)file;
++
++    if (zi->in_opened_file_inzip == 1)
++    {
++        err = zipCloseFileInZip (file);
++    }
++
++#ifndef NO_ADDFILEINEXISTINGZIP
++    if (global_comment==NULL)
++        global_comment = zi->globalcomment;
++#endif
++    if (global_comment==NULL)
++        size_global_comment = 0;
++    else
++        size_global_comment = (uInt)strlen(global_comment);
++
++    centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
++    if (err==ZIP_OK)
++    {
++        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;
++        while (ldi!=NULL)
++        {
++            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
++                if (ZWRITE(zi->z_filefunc,zi->filestream,
++                           ldi->data,ldi->filled_in_this_block)
++                              !=ldi->filled_in_this_block )
++                    err = ZIP_ERRNO;
++
++            size_centraldir += ldi->filled_in_this_block;
++            ldi = ldi->next_datablock;
++        }
++    }
++    free_datablock(zi->central_dir.first_block);
++
++    if (err==ZIP_OK) /* Magic End */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
++
++    if (err==ZIP_OK) /* number of this disk */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
++
++    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
++
++    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
++
++    if (err==ZIP_OK) /* total number of entries in the central dir */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
++
++    if (err==ZIP_OK) /* size of the central directory */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
++
++    if (err==ZIP_OK) /* offset of start of central directory with respect to the
++                            starting disk number */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,
++                                (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
++
++    if (err==ZIP_OK) /* zipfile comment length */
++        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
++
++    if ((err==ZIP_OK) && (size_global_comment>0))
++        if (ZWRITE(zi->z_filefunc,zi->filestream,
++                   global_comment,size_global_comment) != size_global_comment)
++                err = ZIP_ERRNO;
++
++    if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)
++        if (err == ZIP_OK)
++            err = ZIP_ERRNO;
++
++#ifndef NO_ADDFILEINEXISTINGZIP
++    TRYFREE(zi->globalcomment);
++#endif
++    TRYFREE(zi);
++
++    return err;
++}
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/zip.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/zip.h
+new file mode 100644
+index 0000000..acacce8
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/MiniZip/zip.h
+@@ -0,0 +1,235 @@
++/* zip.h -- IO for compress .zip files using zlib
++   Version 1.01e, February 12th, 2005
++
++   Copyright (C) 1998-2005 Gilles Vollant
++
++   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
++     WinZip, InfoZip tools and compatible.
++   Multi volume ZipFile (span) are not supported.
++   Encryption compatible with pkzip 2.04g only supported
++   Old compressions used by old PKZip 1.x are not supported
++
++  For uncompress .zip file, look at unzip.h
++
++
++   I WAIT FEEDBACK at mail info@winimage.com
++   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
++
++   Condition of use and distribution are the same than zlib :
++
++  This software is provided 'as-is', without any express or implied
++  warranty.  In no event will the authors be held liable for any damages
++  arising from the use of this software.
++
++  Permission is granted to anyone to use this software for any purpose,
++  including commercial applications, and to alter it and redistribute it
++  freely, subject to the following restrictions:
++
++  1. The origin of this software must not be misrepresented; you must not
++     claim that you wrote the original software. If you use this software
++     in a product, an acknowledgment in the product documentation would be
++     appreciated but is not required.
++  2. Altered source versions must be plainly marked as such, and must not be
++     misrepresented as being the original software.
++  3. This notice may not be removed or altered from any source distribution.
++
++
++*/
++
++/* for more info about .ZIP format, see
++      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
++      http://www.info-zip.org/pub/infozip/doc/
++   PkWare has also a specification at :
++      ftp://ftp.pkware.com/probdesc.zip
++*/
++
++#ifndef _zip_H
++#define _zip_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifndef _ZLIB_H
++#include "zlib.h"
++#endif
++
++#ifndef _ZLIBIOAPI_H
++#include "ioapi.h"
++#endif
++
++#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
++/* like the STRICT of WIN32, we define a pointer that cannot be converted
++    from (void*) without cast */
++typedef struct TagzipFile__ { int unused; } zipFile__;
++typedef zipFile__ *zipFile;
++#else
++typedef voidp zipFile;
++#endif
++
++#define ZIP_OK                          (0)
++#define ZIP_EOF                         (0)
++#define ZIP_ERRNO                       (Z_ERRNO)
++#define ZIP_PARAMERROR                  (-102)
++#define ZIP_BADZIPFILE                  (-103)
++#define ZIP_INTERNALERROR               (-104)
++
++#ifndef DEF_MEM_LEVEL
++#  if MAX_MEM_LEVEL >= 8
++#    define DEF_MEM_LEVEL 8
++#  else
++#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
++#  endif
++#endif
++/* default memLevel */
++
++/* tm_zip contain date/time info */
++typedef struct tm_zip_s
++{
++    uInt tm_sec;            /* seconds after the minute - [0,59] */
++    uInt tm_min;            /* minutes after the hour - [0,59] */
++    uInt tm_hour;           /* hours since midnight - [0,23] */
++    uInt tm_mday;           /* day of the month - [1,31] */
++    uInt tm_mon;            /* months since January - [0,11] */
++    uInt tm_year;           /* years - [1980..2044] */
++} tm_zip;
++
++typedef struct
++{
++    tm_zip      tmz_date;       /* date in understandable format           */
++    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
++/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
++
++    uLong       internal_fa;    /* internal file attributes        2 bytes */
++    uLong       external_fa;    /* external file attributes        4 bytes */
++} zip_fileinfo;
++
++typedef const char* zipcharpc;
++
++
++#define APPEND_STATUS_CREATE        (0)
++#define APPEND_STATUS_CREATEAFTER   (1)
++#define APPEND_STATUS_ADDINZIP      (2)
++
++extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
++/*
++  Create a zipfile.
++     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
++       an Unix computer "zlib/zlib113.zip".
++     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
++       will be created at the end of the file.
++         (useful if the file contain a self extractor code)
++     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
++       add files in existing zip (be sure you don't add file that doesn't exist)
++     If the zipfile cannot be opened, the return value is NULL.
++     Else, the return value is a zipFile Handle, usable with other function
++       of this zip package.
++*/
++
++/* Note : there is no delete function into a zipfile.
++   If you want delete file into a zipfile, you must open a zipfile, and create another
++   Of couse, you can use RAW reading and writing to copy the file you did not want delte
++*/
++
++extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
++                                   int append,
++                                   zipcharpc* globalcomment,
++                                   zlib_filefunc_def* pzlib_filefunc_def));
++
++extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
++                       const char* filename,
++                       const zip_fileinfo* zipfi,
++                       const void* extrafield_local,
++                       uInt size_extrafield_local,
++                       const void* extrafield_global,
++                       uInt size_extrafield_global,
++                       const char* comment,
++                       int method,
++                       int level));
++/*
++  Open a file in the ZIP for writing.
++  filename : the filename in zip (if NULL, '-' without quote will be used
++  *zipfi contain supplemental information
++  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
++    contains the extrafield data the the local header
++  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
++    contains the extrafield data the the local header
++  if comment != NULL, comment contain the comment string
++  method contain the compression method (0 for store, Z_DEFLATED for deflate)
++  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
++*/
++
++
++extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
++                                            const char* filename,
++                                            const zip_fileinfo* zipfi,
++                                            const void* extrafield_local,
++                                            uInt size_extrafield_local,
++                                            const void* extrafield_global,
++                                            uInt size_extrafield_global,
++                                            const char* comment,
++                                            int method,
++                                            int level,
++                                            int raw));
++
++/*
++  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
++ */
++
++extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
++                                            const char* filename,
++                                            const zip_fileinfo* zipfi,
++                                            const void* extrafield_local,
++                                            uInt size_extrafield_local,
++                                            const void* extrafield_global,
++                                            uInt size_extrafield_global,
++                                            const char* comment,
++                                            int method,
++                                            int level,
++                                            int raw,
++                                            int windowBits,
++                                            int memLevel,
++                                            int strategy,
++                                            const char* password,
++                                            uLong crcForCtypting));
++
++/*
++  Same than zipOpenNewFileInZip2, except
++    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
++    password : crypting password (NULL for no crypting)
++    crcForCtypting : crc of file to compress (needed for crypting)
++ */
++
++
++extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
++                       const void* buf,
++                       unsigned len));
++/*
++  Write data in the zipfile
++*/
++
++extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
++/*
++  Close the current file in the zipfile
++*/
++
++extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
++                                            uLong uncompressed_size,
++                                            uLong crc32));
++/*
++  Close the current file in the zipfile, for fiel opened with
++    parameter raw=1 in zipOpenNewFileInZip2
++  uncompressed_size and crc32 are value for the uncompressed size
++*/
++
++extern int ZEXPORT zipClose OF((zipFile file,
++                const char* global_comment));
++/*
++  Close the zipfile
++*/
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* _zip_H */
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/FileInZipInfo.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/FileInZipInfo.h
+new file mode 100644
+index 0000000..76d3ae5
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/FileInZipInfo.h
+@@ -0,0 +1,60 @@
++//
++//  FileInZipInfo.h
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 27/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import <Foundation/Foundation.h>
++#import "ZipFile.h"
++
++
++@interface FileInZipInfo : NSObject {
++
++@private
++	NSUInteger _length;
++	ZipCompressionLevel _level;
++	BOOL _crypted;
++	NSUInteger _size;
++	NSDate *_date;
++	NSUInteger _crc32;
++	NSString *_name;
++}
++
++- (id) initWithName:(NSString *)name length:(NSUInteger)length level:(ZipCompressionLevel)level crypted:(BOOL)crypted size:(NSUInteger)size date:(NSDate *)date crc32:(NSUInteger)crc32;
++
++@property (nonatomic, readonly) NSString *name;
++@property (nonatomic, readonly) NSUInteger length;
++@property (nonatomic, readonly) ZipCompressionLevel level;
++@property (nonatomic, readonly) BOOL crypted;
++@property (nonatomic, readonly) NSUInteger size;
++@property (nonatomic, readonly) NSDate *date;
++@property (nonatomic, readonly) NSUInteger crc32;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/FileInZipInfo.m b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/FileInZipInfo.m
+new file mode 100644
+index 0000000..1b5ab21
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/FileInZipInfo.m
+@@ -0,0 +1,61 @@
++//
++//  FileInZipInfo.m
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 27/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import "FileInZipInfo.h"
++
++
++@implementation FileInZipInfo
++
++- (id) initWithName:(NSString *)name length:(NSUInteger)length level:(ZipCompressionLevel)level crypted:(BOOL)crypted size:(NSUInteger)size date:(NSDate *)date crc32:(NSUInteger)crc32 {
++	if ((self = [super init])) {
++		_name= name;
++		_length= length;
++		_level= level;
++		_crypted= crypted;
++		_size= size;
++		_date= date;
++		_crc32= crc32;
++	}
++
++	return self;
++}
++
++@synthesize name= _name;
++@synthesize length= _length;
++@synthesize level= _level;
++@synthesize crypted= _crypted;
++@synthesize size= _size;
++@synthesize date= _date;
++@synthesize crc32= _crc32;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipException.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipException.h
+new file mode 100644
+index 0000000..0ae2728
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipException.h
+@@ -0,0 +1,48 @@
++//
++//  ZipException.h
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 25/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import <Foundation/Foundation.h>
++
++
++@interface ZipException : NSException {
++
++@private
++	NSInteger _error;
++}
++
++- (id) initWithReason:(NSString *)reason;
++- (id) initWithError:(NSInteger)error reason:(NSString *)reason;
++
++@property (nonatomic, readonly) NSInteger error;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipException.m b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipException.m
+new file mode 100644
+index 0000000..f0b26d9
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipException.m
+@@ -0,0 +1,57 @@
++//
++//  ZipException.m
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 25/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import "ZipException.h"
++
++
++@implementation ZipException
++
++- (id) initWithReason:(NSString *)reason {
++	if ((self= [super initWithName:@"ZipException" reason:reason userInfo:nil])) {
++		_error= 0;
++	}
++
++	return self;
++}
++
++- (id) initWithError:(NSInteger)error reason:(NSString *)reason {
++	if ((self= [super initWithName:@"ZipException" reason:reason userInfo:nil])) {
++		_error= error;
++	}
++
++	return self;
++}
++
++@synthesize error= _error;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipFile.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipFile.h
+new file mode 100644
+index 0000000..79642fd
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipFile.h
+@@ -0,0 +1,86 @@
++//
++//  ZipFile.h
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 25/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import <Foundation/Foundation.h>
++
++#include "zip.h"
++#include "unzip.h"
++
++
++typedef enum {
++	ZipFileModeUnzip,
++	ZipFileModeCreate,
++	ZipFileModeAppend
++} ZipFileMode;
++
++typedef enum {
++	ZipCompressionLevelDefault= -1,
++	ZipCompressionLevelNone= 0,
++	ZipCompressionLevelFastest= 1,
++	ZipCompressionLevelBest= 9
++} ZipCompressionLevel;
++
++@class ZipReadStream;
++@class ZipWriteStream;
++@class FileInZipInfo;
++
++@interface ZipFile : NSObject {
++	NSString *_fileName;
++	ZipFileMode _mode;
++
++@private
++	zipFile _zipFile;
++	unzFile _unzFile;
++}
++
++- (id) initWithFileName:(NSString *)fileName mode:(ZipFileMode)mode;
++
++- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip compressionLevel:(ZipCompressionLevel)compressionLevel;
++- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel;
++- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel password:(NSString *)password crc32:(NSUInteger)crc32;
++
++- (NSUInteger) numFilesInZip;
++- (NSArray *) listFileInZipInfos;
++
++- (void) goToFirstFileInZip;
++- (BOOL) goToNextFileInZip;
++- (BOOL) locateFileInZip:(NSString *)fileNameInZip;
++
++- (FileInZipInfo *) getCurrentFileInZipInfo;
++
++- (ZipReadStream *) readCurrentFileInZip;
++- (ZipReadStream *) readCurrentFileInZipWithPassword:(NSString *)password;
++
++- (void) close;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipFile.m b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipFile.m
+new file mode 100644
+index 0000000..ea8a115
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipFile.m
+@@ -0,0 +1,418 @@
++//
++//  ZipFile.m
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 25/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import "ZipFile.h"
++#import "ZipException.h"
++#import "ZipReadStream.h"
++#import "ZipWriteStream.h"
++#import "FIleInZipInfo.h"
++
++#define FILE_IN_ZIP_MAX_NAME_LENGTH (256)
++
++
++@implementation ZipFile
++
++
++- (id) initWithFileName:(NSString *)fileName mode:(ZipFileMode)mode {
++	if ((self= [super init])) {
++		_fileName= fileName;
++		_mode= mode;
++
++		switch (mode) {
++			case ZipFileModeUnzip:
++				_unzFile= unzOpen([_fileName cStringUsingEncoding:NSUTF8StringEncoding]);
++				if (_unzFile == NULL) {
++					NSString *reason= [NSString stringWithFormat:@"Can't open '%@'", _fileName];
++					@throw [[ZipException alloc] initWithReason:reason];
++				}
++				break;
++
++			case ZipFileModeCreate:
++				_zipFile= zipOpen([_fileName cStringUsingEncoding:NSUTF8StringEncoding], APPEND_STATUS_CREATE);
++				if (_zipFile == NULL) {
++					NSString *reason= [NSString stringWithFormat:@"Can't open '%@'", _fileName];
++					@throw [[ZipException alloc] initWithReason:reason];
++				}
++				break;
++
++			case ZipFileModeAppend:
++				_zipFile= zipOpen([_fileName cStringUsingEncoding:NSUTF8StringEncoding], APPEND_STATUS_ADDINZIP);
++				if (_zipFile == NULL) {
++					NSString *reason= [NSString stringWithFormat:@"Can't open '%@'", _fileName];
++					@throw [[ZipException alloc] initWithReason:reason];
++				}
++				break;
++
++			default: {
++				NSString *reason= [NSString stringWithFormat:@"Unknown mode %d", _mode];
++				@throw [[ZipException alloc] initWithReason:reason];
++			}
++		}
++	}
++
++	return self;
++}
++
++- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip compressionLevel:(ZipCompressionLevel)compressionLevel {
++	if (_mode == ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted with Unzip mode"];
++		@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	NSDate *now= [NSDate date];
++	NSCalendar *calendar= [NSCalendar currentCalendar];
++	NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:now];
++	zip_fileinfo zi;
++	zi.tmz_date.tm_sec= (uInt)[date second];
++	zi.tmz_date.tm_min= (uInt)[date minute];
++	zi.tmz_date.tm_hour= (uInt)[date hour];
++	zi.tmz_date.tm_mday= (uInt)[date day];
++	zi.tmz_date.tm_mon= (uInt)[date month] -1;
++	zi.tmz_date.tm_year= (uInt)[date year];
++	zi.internal_fa= 0;
++	zi.external_fa= 0;
++	zi.dosDate= 0;
++
++	int err= zipOpenNewFileInZip3(
++								  _zipFile,
++								  [fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
++								  &zi,
++								  NULL, 0, NULL, 0, NULL,
++								  (compressionLevel != ZipCompressionLevelNone) ? Z_DEFLATED : 0,
++								  compressionLevel, 0,
++								  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
++								  NULL, 0);
++	if (err != ZIP_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in opening '%@' in zipfile", fileNameInZip];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return [[ZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip];
++}
++
++- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel {
++	if (_mode == ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted with Unzip mode"];
++		@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	NSCalendar *calendar= [NSCalendar currentCalendar];
++	NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:fileDate];
++	zip_fileinfo zi;
++	zi.tmz_date.tm_sec= (uInt)[date second];
++	zi.tmz_date.tm_min= (uInt)[date minute];
++	zi.tmz_date.tm_hour= (uInt)[date hour];
++	zi.tmz_date.tm_mday= (uInt)[date day];
++	zi.tmz_date.tm_mon= (uInt)[date month] -1;
++	zi.tmz_date.tm_year= (uInt)[date year];
++	zi.internal_fa= 0;
++	zi.external_fa= 0;
++	zi.dosDate= 0;
++
++	int err= zipOpenNewFileInZip3(
++								  _zipFile,
++								  [fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
++								  &zi,
++								  NULL, 0, NULL, 0, NULL,
++								  (compressionLevel != ZipCompressionLevelNone) ? Z_DEFLATED : 0,
++								  compressionLevel, 0,
++								  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
++								  NULL, 0);
++	if (err != ZIP_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in opening '%@' in zipfile", fileNameInZip];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return [[ZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip];
++}
++
++- (ZipWriteStream *) writeFileInZipWithName:(NSString *)fileNameInZip fileDate:(NSDate *)fileDate compressionLevel:(ZipCompressionLevel)compressionLevel password:(NSString *)password crc32:(NSUInteger)crc32 {
++	if (_mode == ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted with Unzip mode"];
++		@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	NSCalendar *calendar= [NSCalendar currentCalendar];
++	NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:fileDate];
++	zip_fileinfo zi;
++	zi.tmz_date.tm_sec= (uInt)[date second];
++	zi.tmz_date.tm_min= (uInt)[date minute];
++	zi.tmz_date.tm_hour= (uInt)[date hour];
++	zi.tmz_date.tm_mday= (uInt)[date day];
++	zi.tmz_date.tm_mon= (uInt)[date month] -1;
++	zi.tmz_date.tm_year= (uInt)[date year];
++	zi.internal_fa= 0;
++	zi.external_fa= 0;
++	zi.dosDate= 0;
++
++	int err= zipOpenNewFileInZip3(
++								  _zipFile,
++								  [fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding],
++								  &zi,
++								  NULL, 0, NULL, 0, NULL,
++								  (compressionLevel != ZipCompressionLevelNone) ? Z_DEFLATED : 0,
++								  compressionLevel, 0,
++								  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
++								  [password cStringUsingEncoding:NSUTF8StringEncoding], crc32);
++	if (err != ZIP_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in opening '%@' in zipfile", fileNameInZip];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return [[ZipWriteStream alloc] initWithZipFileStruct:_zipFile fileNameInZip:fileNameInZip];
++}
++
++- (NSUInteger) numFilesInZip {
++	if (_mode != ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
++		@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	unz_global_info gi;
++	int err= unzGetGlobalInfo(_unzFile, &gi);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in getting global info in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return gi.number_entry;
++}
++
++- (NSArray *) listFileInZipInfos {
++	int num= (uInt)[self numFilesInZip];
++	if (num < 1)
++		return [[NSArray alloc] init];
++
++	NSMutableArray *files= [[NSMutableArray alloc] initWithCapacity:num];
++
++	[self goToFirstFileInZip];
++	for (int i= 0; i < num; i++) {
++		FileInZipInfo *info= [self getCurrentFileInZipInfo];
++		[files addObject:info];
++
++		if ((i +1) < num)
++			[self goToNextFileInZip];
++	}
++
++	return files;
++}
++
++- (void) goToFirstFileInZip {
++	if (_mode != ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
++		@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	int err= unzGoToFirstFile(_unzFile);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in going to first file in zip in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++}
++
++- (BOOL) goToNextFileInZip {
++	if (_mode != ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
++				@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	int err= unzGoToNextFile(_unzFile);
++	if (err == UNZ_END_OF_LIST_OF_FILE)
++		return NO;
++
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in going to next file in zip in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return YES;
++}
++
++- (BOOL) locateFileInZip:(NSString *)fileNameInZip {
++	if (_mode != ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
++				@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	int err= unzLocateFile(_unzFile, [fileNameInZip cStringUsingEncoding:NSUTF8StringEncoding], 1);
++	if (err == UNZ_END_OF_LIST_OF_FILE)
++		return NO;
++
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in going to next file in zip in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return YES;
++}
++
++- (FileInZipInfo *) getCurrentFileInZipInfo {
++	if (_mode != ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
++				@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
++	unz_file_info file_info;
++
++	int err= unzGetCurrentFileInfo(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in getting current file info in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	NSString *name= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
++
++	ZipCompressionLevel level= ZipCompressionLevelNone;
++	if (file_info.compression_method != 0) {
++		switch ((file_info.flag & 0x6) / 2) {
++			case 0:
++				level= ZipCompressionLevelDefault;
++				break;
++
++			case 1:
++				level= ZipCompressionLevelBest;
++				break;
++
++			default:
++				level= ZipCompressionLevelFastest;
++				break;
++		}
++	}
++
++	BOOL crypted= ((file_info.flag & 1) != 0);
++
++	NSDateComponents *components= [[NSDateComponents alloc] init];
++	[components setDay:file_info.tmu_date.tm_mday];
++	[components setMonth:file_info.tmu_date.tm_mon +1];
++	[components setYear:file_info.tmu_date.tm_year];
++	[components setHour:file_info.tmu_date.tm_hour];
++	[components setMinute:file_info.tmu_date.tm_min];
++	[components setSecond:file_info.tmu_date.tm_sec];
++	NSCalendar *calendar= [NSCalendar currentCalendar];
++	NSDate *date= [calendar dateFromComponents:components];
++
++	FileInZipInfo *info= [[FileInZipInfo alloc] initWithName:name length:file_info.uncompressed_size level:level crypted:crypted size:file_info.compressed_size date:date crc32:file_info.crc];
++	return info;
++}
++
++- (ZipReadStream *) readCurrentFileInZip {
++	if (_mode != ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
++		@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
++	unz_file_info file_info;
++
++	int err= unzGetCurrentFileInfo(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in getting current file info in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	NSString *fileNameInZip= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
++
++	err= unzOpenCurrentFilePassword(_unzFile, NULL);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in opening current file in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return [[ZipReadStream alloc] initWithUnzFileStruct:_unzFile fileNameInZip:fileNameInZip];
++}
++
++- (ZipReadStream *) readCurrentFileInZipWithPassword:(NSString *)password {
++	if (_mode != ZipFileModeUnzip) {
++		NSString *reason= [NSString stringWithFormat:@"Operation not permitted without Unzip mode"];
++		@throw [[ZipException alloc] initWithReason:reason];
++	}
++
++	char filename_inzip[FILE_IN_ZIP_MAX_NAME_LENGTH];
++	unz_file_info file_info;
++
++	int err= unzGetCurrentFileInfo(_unzFile, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, NULL, 0);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in getting current file info in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	NSString *fileNameInZip= [NSString stringWithCString:filename_inzip encoding:NSUTF8StringEncoding];
++
++	err= unzOpenCurrentFilePassword(_unzFile, [password cStringUsingEncoding:NSUTF8StringEncoding]);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in opening current file in '%@'", _fileName];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++
++	return [[ZipReadStream alloc] initWithUnzFileStruct:_unzFile fileNameInZip:fileNameInZip];
++}
++
++- (void) close {
++	switch (_mode) {
++		case ZipFileModeUnzip: {
++			int err= unzClose(_unzFile);
++			if (err != UNZ_OK) {
++				NSString *reason= [NSString stringWithFormat:@"Error in closing '%@'", _fileName];
++				@throw [[ZipException alloc] initWithError:err reason:reason];
++			}
++			break;
++		}
++
++		case ZipFileModeCreate: {
++			int err= zipClose(_zipFile, NULL);
++			if (err != ZIP_OK) {
++				NSString *reason= [NSString stringWithFormat:@"Error in closing '%@'", _fileName];
++				@throw [[ZipException alloc] initWithError:err reason:reason];
++			}
++			break;
++		}
++
++		case ZipFileModeAppend: {
++			int err= zipClose(_zipFile, NULL);
++			if (err != ZIP_OK) {
++				NSString *reason= [NSString stringWithFormat:@"Error in closing '%@'", _fileName];
++				@throw [[ZipException alloc] initWithError:err reason:reason];
++			}
++			break;
++		}
++
++		default: {
++			NSString *reason= [NSString stringWithFormat:@"Unknown mode %d", _mode];
++			@throw [[ZipException alloc] initWithReason:reason];
++		}
++	}
++}
++
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipReadStream.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipReadStream.h
+new file mode 100644
+index 0000000..0966611
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipReadStream.h
+@@ -0,0 +1,51 @@
++//
++//  ZipReadStream.h
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 28/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import <Foundation/Foundation.h>
++
++#include "unzip.h"
++
++
++@interface ZipReadStream : NSObject {
++	NSString *_fileNameInZip;
++
++@private
++	unzFile _unzFile;
++}
++
++- (id) initWithUnzFileStruct:(unzFile)unzFile fileNameInZip:(NSString *)fileNameInZip;
++
++- (NSData *)readDataOfLength:(NSUInteger)length;
++- (void) finishedReading;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipReadStream.m b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipReadStream.m
+new file mode 100644
+index 0000000..6144a1f
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipReadStream.m
+@@ -0,0 +1,73 @@
++//
++//  ZipReadStream.m
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 28/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import "ZipReadStream.h"
++#import "ZipException.h"
++
++#include "unzip.h"
++
++
++@implementation ZipReadStream
++
++
++- (id) initWithUnzFileStruct:(unzFile)unzFile fileNameInZip:(NSString *)fileNameInZip {
++	if ((self= [super init])) {
++		_unzFile= unzFile;
++		_fileNameInZip= fileNameInZip;
++	}
++
++	return self;
++}
++
++- (NSData *)readDataOfLength:(NSUInteger)length {
++	NSMutableData *data = [NSMutableData dataWithLength:length];
++	int bytes = unzReadCurrentFile(_unzFile, [data mutableBytes], (unsigned)length);
++	if (bytes < 0) {
++		NSString *reason= [NSString stringWithFormat:@"Error in reading '%@' in the zipfile", _fileNameInZip];
++		@throw [[ZipException alloc] initWithError:bytes reason:reason];
++	}
++
++	[data setLength:bytes];
++	return data;
++}
++
++- (void) finishedReading {
++	int err= unzCloseCurrentFile(_unzFile);
++	if (err != UNZ_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in closing '%@' in the zipfile", _fileNameInZip];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++}
++
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipWriteStream.h b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipWriteStream.h
+new file mode 100644
+index 0000000..5836172
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipWriteStream.h
+@@ -0,0 +1,51 @@
++//
++//  ZipWriteStream.h
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 25/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import <Foundation/Foundation.h>
++
++#include "zip.h"
++
++
++@interface ZipWriteStream : NSObject {
++	NSString *_fileNameInZip;
++
++@private
++	zipFile _zipFile;
++}
++
++- (id) initWithZipFileStruct:(zipFile)zipFile fileNameInZip:(NSString *)fileNameInZip;
++
++- (void) writeData:(NSData *)data;
++- (void) finishedWriting;
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipWriteStream.m b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipWriteStream.m
+new file mode 100644
+index 0000000..4eec235
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Objective-Zip/ZipWriteStream.m
+@@ -0,0 +1,69 @@
++//
++//  ZipWriteStream.m
++//  Objective-Zip v. 0.7.2
++//
++//  Created by Gianluca Bertani on 25/12/09.
++//  Copyright 2009-10 Flying Dolphin Studio. All rights reserved.
++//
++//  Redistribution and use in source and binary forms, with or without
++//  modification, are permitted provided that the following conditions
++//  are met:
++//
++//  * Redistributions of source code must retain the above copyright notice,
++//    this list of conditions and the following disclaimer.
++//  * Redistributions in binary form must reproduce the above copyright notice,
++//    this list of conditions and the following disclaimer in the documentation
++//    and/or other materials provided with the distribution.
++//  * Neither the name of Gianluca Bertani nor the names of its contributors
++//    may be used to endorse or promote products derived from this software
++//    without specific prior written permission.
++//
++//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
++//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++//  POSSIBILITY OF SUCH DAMAGE.
++//
++
++#import "ZipWriteStream.h"
++#import "ZipException.h"
++
++#include "zip.h"
++
++
++@implementation ZipWriteStream
++
++
++- (id) initWithZipFileStruct:(zipFile)zipFile fileNameInZip:(NSString *)fileNameInZip {
++	if ((self= [super init])) {
++		_zipFile= zipFile;
++		_fileNameInZip= fileNameInZip;
++	}
++
++	return self;
++}
++
++- (void) writeData:(NSData *)data {
++	int err= zipWriteInFileInZip(_zipFile, [data bytes], (unsigned)[data length]);
++	if (err < 0) {
++		NSString *reason= [NSString stringWithFormat:@"Error in writing '%@' in the zipfile", _fileNameInZip];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++}
++
++- (void) finishedWriting {
++	int err= zipCloseFileInZip(_zipFile);
++	if (err != ZIP_OK) {
++		NSString *reason= [NSString stringWithFormat:@"Error in closing '%@' in the zipfile", _fileNameInZip];
++		@throw [[ZipException alloc] initWithError:err reason:reason];
++	}
++}
++
++
++@end
+diff --git a/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Settings.bundle/Root.plist b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Settings.bundle/Root.plist
+new file mode 100644
+index 0000000..f64434e
+--- /dev/null
++++ b/node_modules/rn-fetch-blob/ios/KeyShareConsumer/Settings.bundle/Root.plist
+@@ -0,0 +1,167 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
++<plist version="1.0">
++<dict>
++	<key>StringsTable</key>
++	<string>Root</string>
++	<key>PreferenceSpecifiers</key>
++	<array>
++		<dict>
++			<key>Title</key>
++			<string>User selected keys</string>
++			<key>Type</key>
++			<string>PSGroupSpecifier</string>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All keys (com.rsa.pkcs-12)</string>
++			<key>Key</key>
++			<string>toggle_com_rsa_pkcs12</string>
++			<key>DefaultValue</key>
++			<true/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All keys (purebred.select.all)</string>
++			<key>Key</key>
++			<string>toggle_purebred_select_all</string>
++			<key>DefaultValue</key>
++			<true/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All user keys (purebred.select.all.user)</string>
++			<key>Key</key>
++			<string>toggle_purebred_select_all_user</string>
++			<key>DefaultValue</key>
++			<true/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>Signature keys (purebred.select.signature)</string>
++			<key>Key</key>
++			<string>toggle_purebred_select_signature</string>
++			<key>DefaultValue</key>
++			<true/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All encryption keys (purebred.select.encryption)</string>
++			<key>Key</key>
++			<string>toggle_purebred_select_encryption</string>
++			<key>DefaultValue</key>
++			<true/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All authentication keys (purebred.select.authentication)</string>
++			<key>Key</key>
++			<string>toggle_purebred_select_authentication</string>
++			<key>DefaultValue</key>
++			<true/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All device keys (purebred.select.device)</string>
++			<key>Key</key>
++			<string>toggle_purebred_select_device</string>
++			<key>DefaultValue</key>
++			<true/>
++		</dict>
++        <dict>
++            <key>Type</key>
++            <string>PSToggleSwitchSpecifier</string>
++            <key>Title</key>
++            <string>All device keys (purebred.zip.all)</string>
++            <key>Key</key>
++            <string>toggle_purebred_zip_all</string>
++            <key>DefaultValue</key>
++            <false/>
++        </dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All user keys (purebred.zip.all.user)</string>
++			<key>Key</key>
++			<string>toggle_purebred_zip_all_user</string>
++			<key>DefaultValue</key>
++			<false/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>Signature keys (purebred.zip.signature)</string>
++			<key>Key</key>
++			<string>toggle_purebred_zip_signature</string>
++			<key>DefaultValue</key>
++			<false/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All encryption keys (purebred.zip.encryption)</string>
++			<key>Key</key>
++			<string>toggle_purebred_zip_encryption</string>
++			<key>DefaultValue</key>
++			<false/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All authentication keys (purebred.zip.authentication)</string>
++			<key>Key</key>
++			<string>toggle_purebred_zip_authentication</string>
++			<key>DefaultValue</key>
++			<false/>
++		</dict>
++		<dict>
++			<key>Type</key>
++			<string>PSToggleSwitchSpecifier</string>
++			<key>Title</key>
++			<string>All device keys (purebred.zip.device)</string>
++			<key>Key</key>
++			<string>toggle_purebred_zip_device</string>
++			<key>DefaultValue</key>
++			<false/>
++		</dict>
++        <dict>
++            <key>Type</key>
++            <string>PSToggleSwitchSpecifier</string>
++            <key>Title</key>
++            <string>Do not filter on notBefore for zip files (purebred.zip.no_filter)</string>
++            <key>Key</key>
++            <string>toggle_purebred_zip_no_filter</string>
++            <key>DefaultValue</key>
++            <false/>
++        </dict>
++        <dict>
++            <key>Type</key>
++            <string>PSToggleSwitchSpecifier</string>
++            <key>Title</key>
++            <string>Do not filter on notBefore (purebred.select.no_filter)</string>
++            <key>Key</key>
++            <string>toggle_purebred_select_no_filter</string>
++            <key>DefaultValue</key>
++            <false/>
++        </dict>
++	</array>
++</dict>
++</plist>
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlob.xcodeproj/project.pbxproj b/node_modules/rn-fetch-blob/ios/RNFetchBlob.xcodeproj/project.pbxproj
+index 4fbdc00..dfc9cba 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlob.xcodeproj/project.pbxproj
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlob.xcodeproj/project.pbxproj
+@@ -7,6 +7,17 @@
+ 	objects = {
+
+ /* Begin PBXBuildFile section */
++		7FF31BB72132F76F00680B75 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BA22132F76F00680B75 /* unzip.c */; };
++		7FF31BB82132F76F00680B75 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BA32132F76F00680B75 /* zip.c */; };
++		7FF31BB92132F76F00680B75 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BA42132F76F00680B75 /* ioapi.c */; };
++		7FF31BBA2132F76F00680B75 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BA52132F76F00680B75 /* mztools.c */; };
++		7FF31BBB2132F76F00680B75 /* KeyChainDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BAA2132F76F00680B75 /* KeyChainDataSource.mm */; };
++		7FF31BBC2132F76F00680B75 /* CBAViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BAB2132F76F00680B75 /* CBAViewController.m */; };
++		7FF31BBD2132F76F00680B75 /* ZipWriteStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BB02132F76F00680B75 /* ZipWriteStream.m */; };
++		7FF31BBE2132F76F00680B75 /* ZipFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BB12132F76F00680B75 /* ZipFile.m */; };
++		7FF31BBF2132F76F00680B75 /* ZipReadStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BB22132F76F00680B75 /* ZipReadStream.m */; };
++		7FF31BC02132F76F00680B75 /* ZipException.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BB32132F76F00680B75 /* ZipException.m */; };
++		7FF31BC12132F76F00680B75 /* FileInZipInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FF31BB42132F76F00680B75 /* FileInZipInfo.m */; };
+ 		8C4801A6200CF71700FED7ED /* RNFetchBlobRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C4801A5200CF71700FED7ED /* RNFetchBlobRequest.m */; };
+ 		A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F4261D052E49006FFD38 /* RNFetchBlobFS.m */; };
+ 		A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */; };
+@@ -30,6 +41,29 @@
+ /* End PBXCopyFilesBuildPhase section */
+
+ /* Begin PBXFileReference section */
++		7FF31B9E2132F76F00680B75 /* CBAViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBAViewController.h; sourceTree = "<group>"; };
++		7FF31B9F2132F76F00680B75 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
++		7FF31BA02132F76F00680B75 /* KeyChainDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyChainDataSource.h; sourceTree = "<group>"; };
++		7FF31BA22132F76F00680B75 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
++		7FF31BA32132F76F00680B75 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
++		7FF31BA42132F76F00680B75 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
++		7FF31BA52132F76F00680B75 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; };
++		7FF31BA62132F76F00680B75 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
++		7FF31BA72132F76F00680B75 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
++		7FF31BA82132F76F00680B75 /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = "<group>"; };
++		7FF31BA92132F76F00680B75 /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
++		7FF31BAA2132F76F00680B75 /* KeyChainDataSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyChainDataSource.mm; sourceTree = "<group>"; };
++		7FF31BAB2132F76F00680B75 /* CBAViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBAViewController.m; sourceTree = "<group>"; };
++		7FF31BAD2132F76F00680B75 /* ZipReadStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipReadStream.h; sourceTree = "<group>"; };
++		7FF31BAE2132F76F00680B75 /* FileInZipInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInZipInfo.h; sourceTree = "<group>"; };
++		7FF31BAF2132F76F00680B75 /* ZipException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipException.h; sourceTree = "<group>"; };
++		7FF31BB02132F76F00680B75 /* ZipWriteStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZipWriteStream.m; sourceTree = "<group>"; };
++		7FF31BB12132F76F00680B75 /* ZipFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZipFile.m; sourceTree = "<group>"; };
++		7FF31BB22132F76F00680B75 /* ZipReadStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZipReadStream.m; sourceTree = "<group>"; };
++		7FF31BB32132F76F00680B75 /* ZipException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZipException.m; sourceTree = "<group>"; };
++		7FF31BB42132F76F00680B75 /* FileInZipInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileInZipInfo.m; sourceTree = "<group>"; };
++		7FF31BB52132F76F00680B75 /* ZipWriteStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipWriteStream.h; sourceTree = "<group>"; };
++		7FF31BB62132F76F00680B75 /* ZipFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipFile.h; sourceTree = "<group>"; };
+ 		8C4801A4200CF71700FED7ED /* RNFetchBlobRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobRequest.h; sourceTree = "<group>"; };
+ 		8C4801A5200CF71700FED7ED /* RNFetchBlobRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobRequest.m; sourceTree = "<group>"; };
+ 		A158F4261D052E49006FFD38 /* RNFetchBlobFS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobFS.m; sourceTree = "<group>"; };
+@@ -59,6 +93,52 @@
+ /* End PBXFrameworksBuildPhase section */
+
+ /* Begin PBXGroup section */
++		7FF31B9D2132F76F00680B75 /* KeyShareConsumer */ = {
++			isa = PBXGroup;
++			children = (
++				7FF31BAC2132F76F00680B75 /* Objective-Zip */,
++				7FF31BA12132F76F00680B75 /* MiniZip */,
++				7FF31B9E2132F76F00680B75 /* CBAViewController.h */,
++				7FF31BAB2132F76F00680B75 /* CBAViewController.m */,
++				7FF31BA02132F76F00680B75 /* KeyChainDataSource.h */,
++				7FF31BAA2132F76F00680B75 /* KeyChainDataSource.mm */,
++				7FF31B9F2132F76F00680B75 /* Settings.bundle */,
++			);
++			path = KeyShareConsumer;
++			sourceTree = "<group>";
++		};
++		7FF31BA12132F76F00680B75 /* MiniZip */ = {
++			isa = PBXGroup;
++			children = (
++				7FF31BA22132F76F00680B75 /* unzip.c */,
++				7FF31BA32132F76F00680B75 /* zip.c */,
++				7FF31BA42132F76F00680B75 /* ioapi.c */,
++				7FF31BA52132F76F00680B75 /* mztools.c */,
++				7FF31BA62132F76F00680B75 /* zip.h */,
++				7FF31BA72132F76F00680B75 /* unzip.h */,
++				7FF31BA82132F76F00680B75 /* mztools.h */,
++				7FF31BA92132F76F00680B75 /* ioapi.h */,
++			);
++			path = MiniZip;
++			sourceTree = "<group>";
++		};
++		7FF31BAC2132F76F00680B75 /* Objective-Zip */ = {
++			isa = PBXGroup;
++			children = (
++				7FF31BAD2132F76F00680B75 /* ZipReadStream.h */,
++				7FF31BAE2132F76F00680B75 /* FileInZipInfo.h */,
++				7FF31BAF2132F76F00680B75 /* ZipException.h */,
++				7FF31BB02132F76F00680B75 /* ZipWriteStream.m */,
++				7FF31BB12132F76F00680B75 /* ZipFile.m */,
++				7FF31BB22132F76F00680B75 /* ZipReadStream.m */,
++				7FF31BB32132F76F00680B75 /* ZipException.m */,
++				7FF31BB42132F76F00680B75 /* FileInZipInfo.m */,
++				7FF31BB52132F76F00680B75 /* ZipWriteStream.h */,
++				7FF31BB62132F76F00680B75 /* ZipFile.h */,
++			);
++			path = "Objective-Zip";
++			sourceTree = "<group>";
++		};
+ 		8BD9ABDFAF76406291A798F2 /* Libraries */ = {
+ 			isa = PBXGroup;
+ 			children = (
+@@ -69,6 +149,7 @@
+ 		A15C30051CD25C330074CB35 = {
+ 			isa = PBXGroup;
+ 			children = (
++				7FF31B9D2132F76F00680B75 /* KeyShareConsumer */,
+ 				A19B48241D98102400E6868A /* RNFetchBlobProgress.m */,
+ 				A19B48231D98100800E6868A /* RNFetchBlobProgress.h */,
+ 				A1F950181D7E9134002A95A6 /* IOS7Polyfill.h */,
+@@ -153,12 +234,23 @@
+ 			isa = PBXSourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
++				7FF31BC12132F76F00680B75 /* FileInZipInfo.m in Sources */,
++				7FF31BB72132F76F00680B75 /* unzip.c in Sources */,
++				7FF31BBB2132F76F00680B75 /* KeyChainDataSource.mm in Sources */,
+ 				A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */,
++				7FF31BBA2132F76F00680B75 /* mztools.c in Sources */,
+ 				8C4801A6200CF71700FED7ED /* RNFetchBlobRequest.m in Sources */,
++				7FF31BB82132F76F00680B75 /* zip.c in Sources */,
++				7FF31BBD2132F76F00680B75 /* ZipWriteStream.m in Sources */,
++				7FF31BBE2132F76F00680B75 /* ZipFile.m in Sources */,
+ 				A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */,
+ 				A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */,
++				7FF31BBF2132F76F00680B75 /* ZipReadStream.m in Sources */,
++				7FF31BC02132F76F00680B75 /* ZipException.m in Sources */,
+ 				A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */,
++				7FF31BBC2132F76F00680B75 /* CBAViewController.m in Sources */,
+ 				A19B48251D98102400E6868A /* RNFetchBlobProgress.m in Sources */,
++				7FF31BB92132F76F00680B75 /* ioapi.c in Sources */,
+ 				A1AAE2991D300E4D0051D11C /* RNFetchBlobReqBuilder.m in Sources */,
+ 				A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */,
+ 			);
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlob/RNFetchBlob.m b/node_modules/rn-fetch-blob/ios/RNFetchBlob/RNFetchBlob.m
+index 671aa69..0522ffc 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlob/RNFetchBlob.m
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlob/RNFetchBlob.m
+@@ -10,6 +10,7 @@
+ #import "RNFetchBlobConst.h"
+ #import "RNFetchBlobReqBuilder.h"
+ #import "RNFetchBlobProgress.h"
++#import "CBAViewController.h"
+
+
+ __strong RCTBridge * bridgeRef;
+@@ -250,6 +251,11 @@ - (NSDictionary *)constantsToExport
+     [RNFetchBlobFS exists:path callback:callback];
+ }
+
++#pragma mark - fs.existsWithDiffExt
++RCT_EXPORT_METHOD(existsWithDiffExt:(NSString *)path callback:(RCTResponseSenderBlock)callback) {
++    [RNFetchBlobFS existsWithDiffExt:path callback:callback];
++}
++
+ #pragma mark - fs.writeFile
+ RCT_EXPORT_METHOD(writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+ {
+@@ -649,7 +655,16 @@ - (UIViewController *) documentInteractionControllerViewControllerForPreview: (U
+     [RNFetchBlobNetwork emitExpiredTasks];
+ }
+
+-
++# pragma mark - Select certificate to use in Mutual TLS
++RCT_EXPORT_METHOD(selectCertificate:(RCTResponseSenderBlock)callback) {
++    dispatch_async(dispatch_get_main_queue(), ^{
++        UIStoryboard *sb = [UIStoryboard storyboardWithName:@"KeyShareConsumer" bundle: nil];
++        CBAViewController *vc = [sb instantiateInitialViewController];
++        [vc setCallback:callback];
++        UIViewController *rootViewController = [[[[UIApplication sharedApplication]delegate] window] rootViewController];
++        [rootViewController presentViewController:vc animated:YES completion:nil];
++    });
++}
+
+
+ @end
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.h b/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.h
+index 7d09c3a..60a87f8 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.h
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.h
+@@ -22,6 +22,8 @@ extern NSString *const EVENT_PROGRESS;
+ extern NSString *const EVENT_SERVER_PUSH;
+ extern NSString *const EVENT_PROGRESS_UPLOAD;
+ extern NSString *const EVENT_STATE_CHANGE;
++extern NSString *const EVENT_CERTIFICATE_NEEDED;
++extern NSString *const EVENT_SSL_HANDSHAKE_PROBLEM;
+
+ extern NSString *const FILE_PREFIX;
+ extern NSString *const ASSET_PREFIX;
+@@ -51,6 +53,4 @@ extern NSString *const RESP_TYPE_BASE64;
+ extern NSString *const RESP_TYPE_UTF8;
+ extern NSString *const RESP_TYPE_PATH;
+
+-
+-
+ #endif /* RNFetchBlobConst_h */
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.m b/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.m
+index 1376d69..cd0832e 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.m
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobConst.m
+@@ -26,6 +26,8 @@
+ NSString *const EVENT_PROGRESS = @"RNFetchBlobProgress";
+ NSString *const EVENT_PROGRESS_UPLOAD = @"RNFetchBlobProgress-upload";
+ NSString *const EVENT_EXPIRE = @"RNFetchBlobExpire";
++NSString *const EVENT_CERTIFICATE_NEEDED = @"RNFetchBlobCertificate";
++NSString *const EVENT_SSL_HANDSHAKE_PROBLEM = @"RNFetchBlobSslProblem";
+
+ NSString *const MSG_EVENT = @"RNFetchBlobMessage";
+ NSString *const MSG_EVENT_LOG = @"log";
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.h b/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.h
+index 5141201..21ee470 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.h
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.h
+@@ -70,6 +70,7 @@
+      rejecter:(RCTPromiseRejectBlock)reject;
+ + (NSDictionary *) stat:(NSString *) path error:(NSError **) error;
+ + (void) exists:(NSString *) path callback:(RCTResponseSenderBlock)callback;
+++ (void) existsWithDiffExt:(NSString *) path callback:(RCTResponseSenderBlock)callback;
+ + (void) writeFileArray:(NSString *)path data:(NSArray *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
+ + (void) writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
+ + (void) readFile:(NSString *)path encoding:(NSString *)encoding onComplete:(void (^)(NSData * content, NSString* code, NSString * errMsg))onComplete;
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.m b/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.m
+index e597ee5..fa19a7b 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.m
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobFS.m
+@@ -689,6 +689,33 @@ + (void) exists:(NSString *) path callback:(RCTResponseSenderBlock)callback
+     }];
+ }
+
++# pragma mark - existsWithDiffExt
++
+++ (void) existsWithDiffExt:(NSString *)path  callback:(RCTResponseSenderBlock)callback
++{
++    NSFileManager *manager = [NSFileManager defaultManager];
++    NSString *directory = [path stringByDeletingLastPathComponent];
++    BOOL isDir = NO;
++    BOOL exists = NO;
++    exists = [manager fileExistsAtPath:directory isDirectory: &isDir];
++
++    if (exists && isDir) {
++        NSArray *contents = [manager contentsOfDirectoryAtPath:directory error:nil];
++        NSString *fileName = [[path lastPathComponent] stringByDeletingPathExtension];
++        NSString *item;
++        for (item in contents)
++        {
++            NSString *itemName = [[item lastPathComponent] stringByDeletingPathExtension];
++            if ([itemName isEqualToString:fileName]) {
++                callback(@[[directory stringByAppendingPathComponent:item]]);
++                return;
++            }
++        }
++    }
++
++    callback(@[@""]);
++}
++
+ # pragma mark - open file stream
+
+ // Create file stream for write data
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobReqBuilder.m b/node_modules/rn-fetch-blob/ios/RNFetchBlobReqBuilder.m
+index 16963bb..db278db 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobReqBuilder.m
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobReqBuilder.m
+@@ -205,10 +205,8 @@ void __block (^getFieldData)(id field) = ^(id field)
+             // field is a text field
+             if([field valueForKey:@"filename"] == nil || content == nil) {
+                 contentType = contentType == nil ? @"text/plain" : contentType;
+-                [formData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+-                [formData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n", name] dataUsingEncoding:NSUTF8StringEncoding]];
+-                [formData appendData:[[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", contentType] dataUsingEncoding:NSUTF8StringEncoding]];
+-                [formData appendData:[[NSString stringWithFormat:@"%@\r\n", content] dataUsingEncoding:NSUTF8StringEncoding]];
++                [formData appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
++                [formData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\";\r\n\r\n%@", name, content] dataUsingEncoding:NSUTF8StringEncoding]];
+             }
+             // field contains a file
+             else {
+@@ -229,7 +227,7 @@ void __block (^getFieldData)(id field) = ^(id field)
+                                 return;
+                             }
+                             NSString * filename = [field valueForKey:@"filename"];
+-                            [formData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
++                            [formData appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+                             [formData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", name, filename] dataUsingEncoding:NSUTF8StringEncoding]];
+                             [formData appendData:[[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", contentType] dataUsingEncoding:NSUTF8StringEncoding]];
+                             [formData appendData:content];
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.h b/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.h
+index b550ac2..b603f44 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.h
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.h
+@@ -12,6 +12,7 @@
+ #import <Foundation/Foundation.h>
+
+ #import "RNFetchBlobProgress.h"
++#import "KeyChainDataSource.h"
+
+ #if __has_include(<React/RCTAssert.h>)
+ #import <React/RCTBridgeModule.h>
+@@ -33,6 +34,7 @@
+ @property (nullable, nonatomic) RNFetchBlobProgress *progressConfig;
+ @property (nullable, nonatomic) RNFetchBlobProgress *uploadProgressConfig;
+ @property (nullable, nonatomic, weak) NSURLSessionDataTask *task;
++@property (nonatomic, retain) KeyChainDataSource *keyChain;
+
+ - (void) sendRequest:(NSDictionary  * _Nullable )options
+        contentLength:(long)contentLength
+diff --git a/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m b/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m
+index cdbe6b1..6ad5846 100644
+--- a/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m
++++ b/node_modules/rn-fetch-blob/ios/RNFetchBlobRequest.m
+@@ -51,7 +51,6 @@ @implementation RNFetchBlobRequest
+ @synthesize options;
+ @synthesize error;
+
+-
+ - (NSString *)md5:(NSString *)input {
+     const char* str = [input UTF8String];
+     unsigned char result[CC_MD5_DIGEST_LENGTH];
+@@ -81,6 +80,10 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
+     self.receivedBytes = 0;
+     self.options = options;
+
++    if (!self.keyChain) {
++        self.keyChain = [[KeyChainDataSource alloc] initWithMode:KSM_Identities];
++    }
++
+     backgroundTask = [[options valueForKey:@"IOSBackgroundTask"] boolValue];
+     // when followRedirect not set in options, defaults to TRUE
+     followRedirect = [options valueForKey:@"followRedirect"] == nil ? YES : [[options valueForKey:@"followRedirect"] boolValue];
+@@ -129,6 +132,14 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
+     }
+
+     defaultConfigObject.HTTPMaximumConnectionsPerHost = 10;
++    BOOL waitsForConnectivity = [[options valueForKey:@"waitsForConnectivity"] boolValue] ?: NO;
++    float timeoutIntervalForResource = [options valueForKey:@"timeoutIntervalForResource"] == nil ? -1 : [[options valueForKey:@"timeoutIntervalForResource"] floatValue];
++    if (waitsForConnectivity) {
++        if (@available(iOS 11.0, *)) {
++            defaultConfigObject.waitsForConnectivity = YES;
++            defaultConfigObject.timeoutIntervalForResource = timeoutIntervalForResource;
++        }
++    }
+     session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:operationQueue];
+
+     if (path || [self.options valueForKey:CONFIG_USE_TEMP]) {
+@@ -189,6 +200,13 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
+     expectedBytes = [response expectedContentLength];
+
+     NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*)response;
++
++    NSDictionary *headers = [httpResponse allHeaderFields];
++    NSString *uncompressedLength = headers[@"X-Uncompressed-Content-Length"];
++    if (uncompressedLength != (id)[NSNull null] && uncompressedLength.length > 0) {
++        expectedBytes = [uncompressedLength intValue];
++    }
++
+     NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode];
+     NSString * respType = @"";
+     respStatus = statusCode;
+@@ -381,6 +399,14 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
+     }
+
+     if (error) {
++        if ([error.domain isEqualToString:NSURLErrorDomain] && (error.code == NSURLErrorServerCertificateUntrusted) ) {
++            [self.bridge.eventDispatcher
++             sendDeviceEventWithName:EVENT_SSL_HANDSHAKE_PROBLEM
++             body: nil
++            ];
++            return;
++        }
++
+         if (error.domain == NSURLErrorDomain && error.code == NSURLErrorCancelled) {
+             errMsg = @"task cancelled";
+         } else {
+@@ -453,6 +479,30 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSen
+
+ - (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credantial))completionHandler
+ {
++    if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodClientCertificate]) {
++        NSString *certificateName = [options valueForKey:@"certificate"];
++        if (![certificateName isKindOfClass:[NSNull class]] && certificateName) {
++            SecIdentityRef identity = [self.keyChain GetIdentityByName:certificateName];
++            if (identity != nil) {
++                SecCertificateRef certificate = NULL;
++                OSStatus status = SecIdentityCopyCertificate(identity, &certificate);
++                if (!status) {
++                    const void *certs[] = {certificate};
++                    CFArrayRef certArray = CFArrayCreate(kCFAllocatorDefault, certs, 1, NULL);
++                    NSURLCredential *credential = [NSURLCredential credentialWithIdentity:identity certificates:(__bridge NSArray*)certArray persistence:NSURLCredentialPersistencePermanent];
++                    [challenge.sender useCredential:credential forAuthenticationChallenge:challenge];
++                    completionHandler(NSURLSessionAuthChallengeUseCredential,credential);
++                    return;
++                }
++            }
++        } else {
++            [self.bridge.eventDispatcher
++             sendDeviceEventWithName:EVENT_CERTIFICATE_NEEDED
++             body: nil
++             ];
++        }
++    }
++
+     if ([[options valueForKey:CONFIG_TRUSTY] boolValue]) {
+         completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
+     } else {
+@@ -480,5 +530,4 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPe
+     }
+ }
+
+-
+ @end
+diff --git a/node_modules/rn-fetch-blob/polyfill/Fetch.js b/node_modules/rn-fetch-blob/polyfill/Fetch.js
+index 3ecb591..2cfb8a5 100644
+--- a/node_modules/rn-fetch-blob/polyfill/Fetch.js
++++ b/node_modules/rn-fetch-blob/polyfill/Fetch.js
+@@ -29,7 +29,7 @@ class RNFetchBlobFetchPolyfill {
+       options.headers = options.headers || {}
+       let ctype = options['Content-Type'] || options['content-type']
+       let ctypeH = options.headers['Content-Type'] || options.headers['content-type']
+-      options.headers['Content-Type'] = ctype || ctypeH
++      options.headers['Content-Type'] = ctype || ctypeH || 'application/json'
+       options.headers['content-type'] = ctype || ctypeH
+       options.method = options.method || 'GET'
+       if(body) {
+@@ -46,8 +46,6 @@ class RNFetchBlobFetchPolyfill {
+         // When request body is a Blob, use file URI of the Blob as request body.
+         else if (body.isRNFetchBlobPolyfill)
+           promise = Promise.resolve(RNFetchBlob.wrap(body.blobPath))
+-        else if (typeof body !== 'object' && options.headers['Content-Type'] !== 'application/json')
+-          promise = Promise.resolve(JSON.stringify(body))
+         else if (typeof body !== 'string')
+           promise = Promise.resolve(body.toString())
+         // send it as-is, leave the native module decide how to send the body.
+@@ -60,7 +58,9 @@ class RNFetchBlobFetchPolyfill {
+       let progressHandler, uploadHandler, cancelHandler
+       let statefulPromise = promise
+           .then((body) => {
+-            let task = RNFetchBlob.config(config)
++            let waitsForConnectivity = options.waitsForConnectivity || false;
++            let timeoutIntervalForResource = options.timeoutIntervalForResource || 30;
++            let task = RNFetchBlob.config({...config, waitsForConnectivity, timeoutIntervalForResource})
+               .fetch(options.method, url, options.headers, body)
+             if(progressHandler)
+               task.progress(progressHandler)
+diff --git a/node_modules/rn-fetch-blob/rn-fetch-blob.podspec b/node_modules/rn-fetch-blob/rn-fetch-blob.podspec
+index 4edbd5c..e3ef80c 100644
+--- a/node_modules/rn-fetch-blob/rn-fetch-blob.podspec
++++ b/node_modules/rn-fetch-blob/rn-fetch-blob.podspec
+@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
+   s.homepage     = 'n/a'
+   s.source       = { :git => "https://github.com/joltup/rn-fetch-blob" }
+   s.author       = 'Joltup'
+-  s.source_files = 'ios/**/*.{h,m}'
++  s.source_files = 'ios/**/*.{h,m,mm,c}'
+   s.platform     = :ios, "8.0"
+   s.dependency 'React-Core'
+ end
+diff --git a/node_modules/rn-fetch-blob/types.js b/node_modules/rn-fetch-blob/types.js
+index da256af..3eeb51f 100644
+--- a/node_modules/rn-fetch-blob/types.js
++++ b/node_modules/rn-fetch-blob/types.js
+@@ -6,6 +6,8 @@ type RNFetchBlobConfig = {
+   session : string,
+   addAndroidDownloads : any,
+   indicator : bool,
++  certificate?: string,
++  waitsForConnectivity: bool,
+   followRedirect : bool,
+   trusty : bool,
+   wifiOnly : bool
diff --git a/test/intl-test-helper.tsx b/test/intl-test-helper.tsx
new file mode 100644
index 000000000..0b1c94193
--- /dev/null
+++ b/test/intl-test-helper.tsx
@@ -0,0 +1,25 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {getTranslations} from '@i18n';
+import {render} from '@testing-library/react-native';
+import React, {ReactElement} from 'react';
+import {IntlProvider} from 'react-intl';
+
+export function renderWithIntl(ui: ReactElement, {locale = 'en', ...renderOptions} = {}) {
+    function Wrapper({children}: {children: ReactElement}) {
+        return (
+            <IntlProvider
+                locale={locale}
+                messages={getTranslations(locale)}
+            >
+                {children}
+            </IntlProvider>
+        );
+    }
+
+    return render(ui, {wrapper: Wrapper, ...renderOptions});
+}
+
+// eslint-disable-next-line no-duplicate-imports
+export * from '@testing-library/react-native';
diff --git a/test/setup.ts b/test/setup.ts
index 762b16be9..f73d1fdca 100644
--- a/test/setup.ts
+++ b/test/setup.ts
@@ -1,5 +1,277 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-// TODO : for the time being this file is empty.
-export default {};
+/* eslint-disable react/no-multi-comp */
+
+import * as ReactNative from 'react-native';
+
+import MockAsyncStorage from 'mock-async-storage';
+import 'react-native-gesture-handler/jestSetup';
+require('react-native-reanimated/lib/reanimated2/jestUtils').setUpTests();
+
+require('isomorphic-fetch');
+
+const mockImpl = new MockAsyncStorage();
+jest.mock('@react-native-community/async-storage', () => mockImpl);
+
+// @ts-expect-error no window exist in global
+global.window = {};
+
+/* eslint-disable no-console */
+
+jest.doMock('react-native', () => {
+    const {
+        Platform,
+        StyleSheet,
+        ViewPropTypes,
+        PermissionsAndroid,
+        requireNativeComponent,
+        Alert: RNAlert,
+        InteractionManager: RNInteractionManager,
+        NativeModules: RNNativeModules,
+        Linking: RNLinking,
+    } = ReactNative;
+
+    const Alert = {
+        ...RNAlert,
+        alert: jest.fn(),
+    };
+
+    const InteractionManager = {
+        ...RNInteractionManager,
+        runAfterInteractions: jest.fn((cb) => cb()),
+    };
+
+    const NativeModules = {
+        ...RNNativeModules,
+        UIManager: {
+            RCTView: {
+                directEventTypes: {},
+            },
+        },
+        PlatformConstants: {
+            forceTouchAvailable: false,
+        },
+        RNGestureHandlerModule: {
+            State: {
+                BEGAN: 'BEGAN',
+                FAILED: 'FAILED',
+                ACTIVE: 'ACTIVE',
+                END: 'END',
+            },
+        },
+        KeyboardObserver: {},
+        JailMonkey: {
+            trustFall: jest.fn().mockReturnValue(true),
+        },
+        RNCNetInfo: {
+            getCurrentState: jest.fn().mockResolvedValue({isConnected: true}),
+            addListener: jest.fn(),
+            removeListeners: jest.fn(),
+            addEventListener: jest.fn(),
+        },
+        RNKeychainManager: {
+            SECURITY_LEVEL_ANY: 'ANY',
+            SECURITY_LEVEL_SECURE_SOFTWARE: 'SOFTWARE',
+            SECURITY_LEVEL_SECURE_HARDWARE: 'HARDWARE',
+        },
+        RNReactNativeHapticFeedback: {
+            trigger: jest.fn(),
+        },
+        RNDocumentPicker: {
+            pick: jest.fn(),
+        },
+        RNPermissions: {},
+        RNFastStorage: {
+            setupLibrary: jest.fn(),
+            setStringAsync: jest.fn(),
+        },
+        Appearance: {
+            getColorScheme: jest.fn().mockReturnValue('light'),
+        },
+    };
+
+    const Linking = {
+        ...RNLinking,
+        openURL: jest.fn(),
+    };
+
+    return Object.setPrototypeOf({
+        Platform: {
+            ...Platform,
+            OS: 'ios',
+            Version: 12,
+            constants: {
+                reactNativeVersion: {
+                    major: 0,
+                    minor: 64,
+                },
+            },
+        },
+        StyleSheet,
+        ViewPropTypes,
+        PermissionsAndroid,
+        requireNativeComponent,
+        Alert,
+        InteractionManager,
+        NativeModules,
+        Linking,
+    }, ReactNative);
+});
+
+jest.mock('react-native-vector-icons', () => {
+    const React = jest.requireActual('react');
+    const PropTypes = jest.requireActual('prop-types');
+    class CompassIcon extends React.PureComponent {
+        render() {
+            return React.createElement('Icon', this.props);
+        }
+    }
+    CompassIcon.propTypes = {
+        name: PropTypes.string,
+        size: PropTypes.number,
+        style: PropTypes.oneOfType([PropTypes.array, PropTypes.number, PropTypes.object]),
+    };
+    CompassIcon.getImageSource = jest.fn().mockResolvedValue({});
+    return {
+        createIconSet: () => CompassIcon,
+
+        createIconSetFromFontello: () => CompassIcon,
+    };
+});
+
+jest.mock('react-native-unimodules', () => ({
+    FileSystem: {
+        cacheDirectory: 'root/cache',
+        documentDirectory: 'root/documents',
+        deleteAsync: jest.fn().mockResolvedValue(true),
+        getInfoAsync: jest.fn().mockResolvedValue({exists: false}),
+        makeDirectoryAsync: jest.fn().mockResolvedValue(true),
+        readDirectoryAsync: jest.fn().mockResolvedValue([]),
+    },
+}));
+
+jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
+jest.mock('../node_modules/react-native/Libraries/EventEmitter/NativeEventEmitter');
+
+jest.mock('react-native-device-info', () => {
+    return {
+        getVersion: () => '0.0.0',
+        getBuildNumber: () => '0',
+        getModel: () => 'iPhone X',
+        hasNotch: () => true,
+        isTablet: () => false,
+        getApplicationName: () => 'Mattermost',
+    };
+});
+
+jest.mock('react-native-localize', () => ({
+    getTimeZone: () => 'World/Somewhere',
+    getLocales: () => ([
+        {countryCode: 'GB', languageTag: 'en-GB', languageCode: 'en', isRTL: false},
+        {countryCode: 'US', languageTag: 'en-US', languageCode: 'en', isRTL: false},
+        {countryCode: 'FR', languageTag: 'fr-FR', languageCode: 'fr', isRTL: false},
+    ]),
+}));
+
+jest.mock('@react-native-community/cookies', () => ({
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    openURL: jest.fn(),
+    getInitialURL: jest.fn(),
+    clearAll: jest.fn(),
+    get: () => Promise.resolve(({
+        res: {
+            MMCSRF: {
+                value: 'the cookie',
+            },
+        },
+    })),
+}));
+
+jest.mock('react-native-navigation', () => {
+    const RNN = jest.requireActual('react-native-navigation');
+    RNN.Navigation.setLazyComponentRegistrator = jest.fn();
+    RNN.Navigation.setDefaultOptions = jest.fn();
+    return {
+        ...RNN,
+        Navigation: {
+            ...RNN.Navigation,
+            events: () => ({
+                registerAppLaunchedListener: jest.fn(),
+                bindComponent: jest.fn(() => {
+                    return {remove: jest.fn()};
+                }),
+            }),
+            setRoot: jest.fn(),
+            pop: jest.fn(),
+            push: jest.fn(),
+            showModal: jest.fn(),
+            dismissModal: jest.fn(),
+            dismissAllModals: jest.fn(),
+            popToRoot: jest.fn(),
+            mergeOptions: jest.fn(),
+            showOverlay: jest.fn(),
+            dismissOverlay: jest.fn(),
+        },
+    };
+});
+
+jest.mock('react-native-notifications', () => {
+    let deliveredNotifications: ReactNative.PushNotification[] = [];
+
+    return {
+        Notifications: {
+            registerRemoteNotifications: jest.fn(),
+            addEventListener: jest.fn(),
+            setDeliveredNotifications: jest.fn((notifications) => {
+                deliveredNotifications = notifications;
+            }),
+            cancelAllLocalNotifications: jest.fn(),
+            NotificationAction: jest.fn(),
+            NotificationCategory: jest.fn(),
+            events: () => ({
+                registerNotificationOpened: jest.fn(),
+                registerRemoteNotificationsRegistered: jest.fn(),
+                registerNotificationReceivedBackground: jest.fn(),
+                registerNotificationReceivedForeground: jest.fn(),
+            }),
+            ios: {
+                getDeliveredNotifications: jest.fn().mockImplementation(() => Promise.resolve(deliveredNotifications)),
+                removeDeliveredNotifications: jest.fn((ids) => {
+                    // eslint-disable-next-line
+                    // @ts-ignore
+                    deliveredNotifications = deliveredNotifications.filter((n) => !ids.includes(n.identifier));
+                }),
+                setBadgeCount: jest.fn(),
+            },
+        },
+    };
+});
+
+jest.mock('react-native-share', () => ({
+    default: jest.fn(),
+}));
+
+jest.mock('@screens/navigation', () => ({
+    resetToChannel: jest.fn(),
+    resetToSelectServer: jest.fn(),
+    resetToTeams: jest.fn(),
+    goToScreen: jest.fn(),
+    popTopScreen: jest.fn(),
+    showModal: jest.fn(),
+    showModalOverCurrentContext: jest.fn(),
+    showSearchModal: jest.fn(),
+    setButtons: jest.fn(),
+    showOverlay: jest.fn(),
+    mergeNavigationOptions: jest.fn(),
+    popToRoot: jest.fn(() => Promise.resolve()),
+    dismissModal: jest.fn(() => Promise.resolve()),
+    dismissAllModals: jest.fn(() => Promise.resolve()),
+    dismissOverlay: jest.fn(() => Promise.resolve()),
+}));
+
+declare const global: {requestAnimationFrame: (callback: any) => void};
+global.requestAnimationFrame = (callback) => {
+    setTimeout(callback, 0);
+};
diff --git a/test/test_helper.js b/test/test_helper.js
new file mode 100644
index 000000000..b51c8d78b
--- /dev/null
+++ b/test/test_helper.js
@@ -0,0 +1,477 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import assert from 'assert';
+import nock from 'nock';
+
+import Config from '@assets/config.json';
+import {Client} from '@client/rest';
+import GENERAL_CONSTANTS from '@constants/general';
+import {generateId} from '@utils/general';
+
+const PASSWORD = 'password1';
+const DEFAULT_LOCALE = GENERAL_CONSTANTS.DEFAULT_LOCALE;
+
+class TestHelper {
+    constructor() {
+        this.basicClient = null;
+        this.basicClient4 = null;
+
+        this.basicUser = null;
+        this.basicTeam = null;
+        this.basicTeamMember = null;
+        this.basicChannel = null;
+        this.basicChannelMember = null;
+        this.basicPost = null;
+        this.basicRoles = null;
+        this.basicScheme = null;
+    }
+
+    activateMocking() {
+        if (!nock.isActive()) {
+            nock.activate();
+        }
+    }
+
+    assertStatusOkay = (data) => {
+        assert(data);
+        assert(data.status === 'OK');
+    };
+
+    generateId = () => {
+        return generateId();
+    };
+
+    createClient = () => {
+        const client = new Client();
+
+        client.setUrl(Config.DefaultServerUrl || Config.TestServerUrl);
+
+        return client;
+    };
+
+    fakeChannel = (teamId) => {
+        const name = this.generateId();
+
+        return {
+            name,
+            team_id: teamId,
+            display_name: `Unit Test ${name}`,
+            type: 'O',
+            delete_at: 0,
+            total_msg_count: 0,
+            scheme_id: this.generateId(),
+        };
+    };
+
+    fakeChannelWithId = (teamId) => {
+        return {
+            ...this.fakeChannel(teamId),
+            id: this.generateId(),
+            create_at: 1507840900004,
+            update_at: 1507840900004,
+            delete_at: 0,
+        };
+    };
+
+    fakeDmChannel = (userId, otherUserId) => {
+        return {
+            name: userId > otherUserId ? otherUserId + '__' + userId : userId + '__' + otherUserId,
+            team_id: '',
+            display_name: `${otherUserId}`,
+            type: 'D',
+            status: 'offline',
+            teammate_id: `${otherUserId}`,
+            id: this.generateId(),
+            delete_at: 0,
+        };
+    }
+
+    fakeChannelMember = (userId, channelId) => {
+        return {
+            user_id: userId,
+            channel_id: channelId,
+            notify_props: {},
+            roles: 'system_user',
+            msg_count: 0,
+            mention_count: 0,
+            scheme_user: false,
+            scheme_admin: false,
+        };
+    };
+
+    fakeEmail = () => {
+        return 'success' + this.generateId() + '@simulator.amazonses.com';
+    };
+
+    fakePost = (channelId) => {
+        const time = Date.now();
+
+        return {
+            id: this.generateId(),
+            channel_id: channelId,
+            create_at: time,
+            update_at: time,
+            message: `Unit Test ${this.generateId()}`,
+            type: '',
+        };
+    };
+
+    fakePostWithId = (channelId) => {
+        return {
+            ...this.fakePost(channelId),
+            id: this.generateId(),
+            create_at: 1507840900004,
+            update_at: 1507840900004,
+            delete_at: 0,
+        };
+    };
+
+    fakeTeam = () => {
+        const name = this.generateId();
+        let inviteId = this.generateId();
+        if (inviteId.length > 32) {
+            inviteId = inviteId.substring(0, 32);
+        }
+
+        return {
+            name,
+            display_name: `Unit Test ${name}`,
+            type: 'O',
+            email: this.fakeEmail(),
+            allowed_domains: '',
+            invite_id: inviteId,
+            scheme_id: this.generateId(),
+        };
+    };
+
+    fakeTeamWithId = () => {
+        return {
+            ...this.fakeTeam(),
+            id: this.generateId(),
+            create_at: 1507840900004,
+            update_at: 1507840900004,
+            delete_at: 0,
+        };
+    };
+
+    fakeTeamMember = (userId, teamId) => {
+        return {
+            user_id: userId,
+            team_id: teamId,
+            roles: 'team_user',
+            delete_at: 0,
+            scheme_user: false,
+            scheme_admin: false,
+        };
+    };
+
+    fakeUser = () => {
+        return {
+            email: this.fakeEmail(),
+            allow_marketing: true,
+            password: PASSWORD,
+            locale: DEFAULT_LOCALE,
+            username: this.generateId(),
+            first_name: this.generateId(),
+            last_name: this.generateId(),
+            create_at: Date.now(),
+            delete_at: 0,
+            roles: 'system_user',
+        };
+    };
+
+    fakeUserWithId = (id = this.generateId()) => {
+        return {
+            ...this.fakeUser(),
+            id,
+            create_at: 1507840900004,
+            update_at: 1507840900004,
+            delete_at: 0,
+        };
+    };
+
+    fakeOutgoingHook = (teamId) => {
+        return {
+            team_id: teamId,
+        };
+    };
+
+    fakeOutgoingHookWithId = (teamId) => {
+        return {
+            ...this.fakeOutgoingHook(teamId),
+            id: this.generateId(),
+        };
+    };
+
+    fakeFiles = (count) => {
+        const files = [];
+        while (files.length < count) {
+            files.push({
+                id: this.generateId(),
+            });
+        }
+
+        return files;
+    };
+
+    fakeOAuthApp = () => {
+        return {
+            name: this.generateId(),
+            callback_urls: ['http://localhost/notrealurl'],
+            homepage: 'http://localhost/notrealurl',
+            description: 'fake app',
+            is_trusted: false,
+            icon_url: 'http://localhost/notrealurl',
+            update_at: 1507841118796,
+        };
+    };
+
+    fakeOAuthAppWithId = () => {
+        return {
+            ...this.fakeOAuthApp(),
+            id: this.generateId(),
+        };
+    };
+
+    fakeBot = () => {
+        return {
+            user_id: this.generateId(),
+            username: this.generateId(),
+            display_name: 'Fake bot',
+            owner_id: this.generateId(),
+            create_at: 1507840900004,
+            update_at: 1507840900004,
+            delete_at: 0,
+        };
+    }
+
+    generateId = () => {
+        // Implementation taken from http://stackoverflow.com/a/2117523
+        let id = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
+
+        id = id.replace(/[xy]/g, (c) => {
+            const r = Math.floor(Math.random() * 16);
+
+            let v;
+            if (c === 'x') {
+                v = r;
+            } else {
+                v = (r & 0x3) | 0x8;
+            }
+
+            return v.toString(16);
+        });
+
+        return 'uid' + id;
+    };
+
+    mockLogin = () => {
+        nock(this.basicClient4.getBaseRoute()).
+            post('/users/login').
+            reply(200, this.basicUser, {'X-Version-Id': 'Server Version'});
+
+        nock(this.basicClient4.getBaseRoute()).
+            get('/users/me/teams/members').
+            reply(200, [this.basicTeamMember]);
+
+        nock(this.basicClient4.getBaseRoute()).
+            get('/users/me/teams/unread').
+            reply(200, [{team_id: this.basicTeam.id, msg_count: 0, mention_count: 0}]);
+
+        nock(this.basicClient4.getBaseRoute()).
+            get('/users/me/teams').
+            reply(200, [this.basicTeam]);
+
+        nock(this.basicClient4.getBaseRoute()).
+            get('/users/me/preferences').
+            reply(200, [{user_id: this.basicUser.id, category: 'tutorial_step', name: this.basicUser.id, value: '999'}]);
+    }
+
+    initMockEntities = () => {
+        this.basicUser = this.fakeUserWithId();
+        this.basicUser.roles = 'system_user system_admin';
+        this.basicTeam = this.fakeTeamWithId();
+        this.basicTeamMember = this.fakeTeamMember(this.basicUser.id, this.basicTeam.id);
+        this.basicChannel = this.fakeChannelWithId(this.basicTeam.id);
+        this.basicChannelMember = this.fakeChannelMember(this.basicUser.id, this.basicChannel.id);
+        this.basicPost = {...this.fakePostWithId(this.basicChannel.id), create_at: 1507841118796};
+        this.basicRoles = {
+            system_admin: {
+                id: this.generateId(),
+                name: 'system_admin',
+                display_name: 'authentication.roles.global_admin.name',
+                description: 'authentication.roles.global_admin.description',
+                permissions: [
+                    'system_admin_permission',
+                ],
+                scheme_managed: true,
+                built_in: true,
+            },
+            system_user: {
+                id: this.generateId(),
+                name: 'system_user',
+                display_name: 'authentication.roles.global_user.name',
+                description: 'authentication.roles.global_user.description',
+                permissions: [
+                    'system_user_permission',
+                ],
+                scheme_managed: true,
+                built_in: true,
+            },
+            team_admin: {
+                id: this.generateId(),
+                name: 'team_admin',
+                display_name: 'authentication.roles.team_admin.name',
+                description: 'authentication.roles.team_admin.description',
+                permissions: [
+                    'team_admin_permission',
+                ],
+                scheme_managed: true,
+                built_in: true,
+            },
+            team_user: {
+                id: this.generateId(),
+                name: 'team_user',
+                display_name: 'authentication.roles.team_user.name',
+                description: 'authentication.roles.team_user.description',
+                permissions: [
+                    'team_user_permission',
+                ],
+                scheme_managed: true,
+                built_in: true,
+            },
+            channel_admin: {
+                id: this.generateId(),
+                name: 'channel_admin',
+                display_name: 'authentication.roles.channel_admin.name',
+                description: 'authentication.roles.channel_admin.description',
+                permissions: [
+                    'channel_admin_permission',
+                ],
+                scheme_managed: true,
+                built_in: true,
+            },
+            channel_user: {
+                id: this.generateId(),
+                name: 'channel_user',
+                display_name: 'authentication.roles.channel_user.name',
+                description: 'authentication.roles.channel_user.description',
+                permissions: [
+                    'channel_user_permission',
+                ],
+                scheme_managed: true,
+                built_in: true,
+            },
+        };
+        this.basicScheme = this.mockSchemeWithId();
+    }
+
+    initBasic = async (client = this.createClient()) => {
+        client.setUrl(Config.TestServerUrl || Config.DefaultServerUrl);
+        this.basicClient = client;
+        this.basicClient4 = client;
+
+        this.initMockEntities();
+        this.activateMocking();
+
+        return {
+            client: this.basicClient,
+            client4: this.basicClient4,
+            user: this.basicUser,
+            team: this.basicTeam,
+            channel: this.basicChannel,
+            post: this.basicPost,
+        };
+    };
+
+    mockScheme = () => {
+        return {
+            name: this.generateId(),
+            description: this.generateId(),
+            scope: 'channel',
+            defaultchanneladminrole: false,
+            defaultchanneluserrole: false,
+        };
+    };
+
+    mockSchemeWithId = () => {
+        return {
+            ...this.mockScheme(),
+            id: this.generateId(),
+            create_at: 1507840900004,
+            update_at: 1507840900004,
+            delete_at: 0,
+        };
+    };
+
+    testIncomingHook = () => {
+        return {
+            id: this.generateId(),
+            create_at: 1507840900004,
+            update_at: 1507840900004,
+            delete_at: 0,
+            user_id: this.basicUser.id,
+            channel_id: this.basicChannel.id,
+            team_id: this.basicTeam.id,
+            display_name: 'test',
+            description: 'test',
+        };
+    };
+
+    testOutgoingHook = () => {
+        return {
+            id: this.generateId(),
+            token: this.generateId(),
+            create_at: 1507841118796,
+            update_at: 1507841118796,
+            delete_at: 0,
+            creator_id: this.basicUser.id,
+            channel_id: this.basicChannel.id,
+            team_id: this.basicTeam.id,
+            trigger_words: ['testword'],
+            trigger_when: 0,
+            callback_urls: ['http://localhost/notarealendpoint'],
+            display_name: 'test',
+            description: '',
+            content_type: 'application/x-www-form-urlencoded',
+        };
+    }
+
+    testCommand = (teamId) => {
+        return {
+            trigger: this.generateId(),
+            method: 'P',
+            create_at: 1507841118796,
+            update_at: 1507841118796,
+            delete_at: 0,
+            creator_id: this.basicUser.id,
+            team_id: teamId,
+            username: 'test',
+            icon_url: 'http://localhost/notarealendpoint',
+            auto_complete: true,
+            auto_complete_desc: 'test',
+            auto_complete_hint: 'test',
+            display_name: 'test',
+            description: 'test',
+            url: 'http://localhost/notarealendpoint',
+        };
+    };
+
+    tearDown = async () => {
+        nock.restore();
+
+        this.basicClient = null;
+        this.basicClient4 = null;
+        this.basicUser = null;
+        this.basicTeam = null;
+        this.basicTeamMember = null;
+        this.basicChannel = null;
+        this.basicChannelMember = null;
+        this.basicPost = null;
+    }
+
+    wait = (time) => new Promise((resolve) => setTimeout(resolve, time))
+}
+
+export default new TestHelper();
diff --git a/tsconfig.json b/tsconfig.json
index d8baf695d..f98adc014 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,7 @@
         "experimentalDecorators": true,
         "target": "esnext",
         "lib": [
-            "es6"
+            "es6", "ES2019"
         ],
         "allowJs": true,
         "skipLibCheck": true,
@@ -33,7 +33,9 @@
         "resolveJsonModule": true,
         "baseUrl": ".",
         "paths": {
+            "@app/*": ["app/*"],
             "@assets/*": ["dist/assets/*"],
+            "@client/*": ["app/client/*"],
             "@components/*": ["app/components/*"],
             "@constants": ["app/constants/index"],
             "@constants/*": ["app/constants/*"],
@@ -41,13 +43,16 @@
             "@i18n": ["app/i18n/index"],
             "@init/*": ["app/init/*"],
             "@notifications": ["app/notifications/index"],
+            "@queries/*": ["app/queries/*"],
+            "@requests/*": ["app/requests/*"],
             "@screens/*": ["app/screens/*"],
             "@selectors/*": ["app/selectors/*"],
             "@share/*": ["share_extension/*"],
             "@store": ["app/store/index"],
             "@store/*": ["app/store/*"],
-            "@typings/*": ["types/*"],
             "@telemetry/*": ["/app/telemetry/*"],
+            "@typings/*": ["types/*"],
+            "@test/*": ["test/*"],
             "@utils/*": ["app/utils/*"],
             "@websocket": ["app/client/websocket"],
             "*": ["./*", "node_modules/*"],
diff --git a/types/api/apps.d.ts b/types/api/apps.d.ts
new file mode 100644
index 000000000..f46ff82cd
--- /dev/null
+++ b/types/api/apps.d.ts
@@ -0,0 +1,211 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type AppManifest = {
+    app_id: string;
+    display_name: string;
+    description?: string;
+    homepage_url?: string;
+    root_url: string;
+};
+
+type AppModalState = {
+    form: AppForm;
+    call: AppCallRequest;
+};
+
+type AppsState = {
+    bindings: AppBinding[];
+};
+
+type AppBinding = {
+    app_id: string;
+    location?: string;
+    icon?: string;
+
+    // Label is the (usually short) primary text to display at the location.
+    // - For LocationPostMenu is the menu item text.
+    // - For LocationChannelHeader is the dropdown text.
+    // - For LocationCommand is the name of the command
+    label: string;
+
+    // Hint is the secondary text to display
+    // - LocationPostMenu: not used
+    // - LocationChannelHeader: tooltip
+    // - LocationCommand: the "Hint" line
+    hint?: string;
+
+    // Description is the (optional) extended help text, used in modals and autocomplete
+    description?: string;
+
+    role_id?: string;
+    depends_on_team?: boolean;
+    depends_on_channel?: boolean;
+    depends_on_user?: boolean;
+    depends_on_post?: boolean;
+
+    // A Binding is either to a Call, or is a "container" for other locations -
+    // i.e. menu sub-items or subcommands.
+    call?: AppCall;
+    bindings?: AppBinding[];
+    form?: AppForm;
+};
+
+type AppCallValues = {
+    [name: string]: any;
+};
+
+type AppCallType = string;
+
+type AppCall = {
+    path: string;
+    expand?: AppExpand;
+    state?: any;
+};
+
+type AppCallRequest = AppCall & {
+    context: AppContext;
+    values?: AppCallValues;
+    raw_command?: string;
+    selected_field?: string;
+    query?: string;
+};
+
+type AppCallResponseType = string;
+
+type AppCallResponse<Res = unknown> = {
+    type: AppCallResponseType;
+    markdown?: string;
+    data?: Res;
+    error?: string;
+    navigate_to_url?: string;
+    use_external_browser?: boolean;
+    call?: AppCall;
+    form?: AppForm;
+    app_metadata?: AppMetadataForClient;
+};
+
+type AppMetadataForClient = {
+    bot_user_id: string;
+    bot_username: string;
+};
+
+type AppContext = {
+    app_id: string;
+    location?: string;
+    acting_user_id?: string;
+    user_id?: string;
+    channel_id?: string;
+    team_id?: string;
+    post_id?: string;
+    root_id?: string;
+    props?: AppContextProps;
+    user_agent?: string;
+};
+
+type AppContextProps = {
+    [name: string]: string;
+};
+
+type AppExpandLevel = string;
+
+type AppExpand = {
+    app?: AppExpandLevel;
+    acting_user?: AppExpandLevel;
+    channel?: AppExpandLevel;
+    config?: AppExpandLevel;
+    mentioned?: AppExpandLevel;
+    parent_post?: AppExpandLevel;
+    post?: AppExpandLevel;
+    root_post?: AppExpandLevel;
+    team?: AppExpandLevel;
+    user?: AppExpandLevel;
+};
+
+type AppForm = {
+    title?: string;
+    header?: string;
+    footer?: string;
+    icon?: string;
+    submit_buttons?: string;
+    cancel_button?: boolean;
+    submit_on_cancel?: boolean;
+    fields: AppField[];
+    call?: AppCall;
+    depends_on?: string[];
+};
+
+type AppFormValue = string | AppSelectOption | boolean | null;
+type AppFormValues = {[name: string]: AppFormValue};
+
+type AppSelectOption = {
+    label: string;
+    value: string;
+    icon_data?: string;
+};
+
+type AppFieldType = string;
+
+// This should go in mattermost-redux
+type AppField = {
+
+    // Name is the name of the JSON field to use.
+    name: string;
+    type: AppFieldType;
+    is_required?: boolean;
+    readonly?: boolean;
+
+    // Present (default) value of the field
+    value?: AppFormValue;
+
+    description?: string;
+
+    label?: string;
+    hint?: string;
+    position?: number;
+
+    modal_label?: string;
+
+    // Select props
+    refresh?: boolean;
+    options?: AppSelectOption[];
+    multiselect?: boolean;
+
+    // Text props
+    subtype?: string;
+    min_length?: number;
+    max_length?: number;
+};
+
+type AutocompleteSuggestion = {
+    suggestion: string;
+    complete?: string;
+    description?: string;
+    hint?: string;
+    iconData?: string;
+};
+
+type AutocompleteSuggestionWithComplete = AutocompleteSuggestion & {
+    complete: string;
+};
+
+type AutocompleteElement = AppField;
+type AutocompleteStaticSelect = AutocompleteElement & {
+    options: AppSelectOption[];
+};
+
+type AutocompleteDynamicSelect = AutocompleteElement;
+
+type AutocompleteUserSelect = AutocompleteElement;
+
+type AutocompleteChannelSelect = AutocompleteElement;
+
+type FormResponseData = {
+    errors?: {
+        [field: string]: string;
+    };
+};
+
+type AppLookupResponse = {
+    items: AppSelectOption[];
+};
diff --git a/types/api/bots.d.ts b/types/api/bots.d.ts
new file mode 100644
index 000000000..e96cc2647
--- /dev/null
+++ b/types/api/bots.d.ts
@@ -0,0 +1,20 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type Bot = {
+	user_id: string ;
+	username: string ;
+	display_name?: string ;
+	description?: string ;
+	owner_id: string ;
+	create_at: number ;
+	update_at: number ;
+	delete_at: number ;
+}
+
+// BotPatch is a description of what fields to update on an existing bot.
+type BotPatch = {
+	username: string;
+	display_name: string;
+    description: string;
+}
diff --git a/types/api/channels.d.ts b/types/api/channels.d.ts
new file mode 100644
index 000000000..7909d3d97
--- /dev/null
+++ b/types/api/channels.d.ts
@@ -0,0 +1,106 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+type ChannelType = 'O' | 'P' | 'D' | 'G';
+type ChannelStats = {
+    channel_id: string;
+    member_count: number;
+    pinnedpost_count: number;
+};
+type ChannelNotifyProps = {
+    desktop: 'default' | 'all' | 'mention' | 'none';
+    email: 'default' | 'all' | 'mention' | 'none';
+    mark_unread: 'all' | 'mention';
+    push: 'default' | 'all' | 'mention' | 'none';
+    ignore_channel_mentions: 'default' | 'off' | 'on';
+};
+type Channel = {
+    id: string;
+    create_at: number;
+    update_at: number;
+    delete_at: number;
+    team_id: string;
+    type: ChannelType;
+    display_name: string;
+    name: string;
+    header: string;
+    purpose: string;
+    last_post_at: number;
+    total_msg_count: number;
+    extra_update_at: number;
+    creator_id: string;
+    scheme_id: string;
+    isCurrent?: boolean;
+    teammate_id?: string;
+    status?: string;
+    fake?: boolean;
+    group_constrained: boolean;
+};
+type ChannelWithTeamData = Channel & {
+    team_display_name: string;
+    team_name: string;
+    team_update_at: number;
+}
+type ChannelMembership = {
+    channel_id: string;
+    user_id: string;
+    roles: string;
+    last_viewed_at: number;
+    msg_count: number;
+    mention_count: number;
+    notify_props: Partial<ChannelNotifyProps>;
+    last_update_at: number;
+    scheme_user: boolean;
+    scheme_admin: boolean;
+    post_root_id?: string;
+};
+type ChannelUnread = {
+    channel_id: string;
+    user_id: string;
+    team_id: string;
+    msg_count: number;
+    mention_count: number;
+    last_viewed_at: number;
+    deltaMsgs: number;
+};
+type ChannelsState = {
+    currentChannelId: string;
+    channels: IDMappedObjects<Channel>;
+    channelsInTeam: RelationOneToMany<Team, Channel>;
+    myMembers: RelationOneToOne<Channel, ChannelMembership>;
+    membersInChannel: RelationOneToOne<Channel, UserIDMappedObjects<ChannelMembership>>;
+    stats: RelationOneToOne<Channel, ChannelStats>;
+    groupsAssociatedToChannel: any;
+    totalCount: number;
+    manuallyUnread: RelationOneToOne<Channel, boolean>;
+    channelMemberCountsByGroup: RelationOneToOne<Channel, ChannelMemberCountsByGroup>;
+};
+
+type ChannelModeration = {
+    name: string;
+    roles: {
+        guests?: {
+            value: boolean;
+            enabled: boolean;
+        };
+        members: {
+            value: boolean;
+            enabled: boolean;
+        };
+    };
+};
+
+type ChannelModerationPatch = {
+    name: string;
+    roles: {
+        guests?: boolean;
+        members?: boolean;
+    };
+};
+
+type ChannelMemberCountByGroup = {
+    group_id: string;
+    channel_member_count: number;
+    channel_member_timezones_count: number;
+};
+
+type ChannelMemberCountsByGroup = Record<string, ChannelMemberCountByGroup>;
diff --git a/types/api/client4.d.ts b/types/api/client4.d.ts
new file mode 100644
index 000000000..16b4ca89d
--- /dev/null
+++ b/types/api/client4.d.ts
@@ -0,0 +1,35 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export type logLevel = 'ERROR' | 'WARNING' | 'INFO';
+export type GenericClientResponse = {
+    response: any;
+    headers: Map<string, string>;
+    data: any;
+};
+export type ErrorOffline = {
+    message: string;
+    url: string;
+};
+export type ErrorInvalidResponse = {
+    intl: {
+        id: string;
+        defaultMessage: string;
+    };
+};
+export type ErrorApi = {
+    message: string;
+    server_error_id: string;
+    status_code: number;
+    url: string;
+};
+export type Client4Error = ErrorOffline | ErrorInvalidResponse | ErrorApi;
+export type ClientOptions = {
+    headers?: {
+        [x: string]: string;
+    };
+    method?: string;
+    url?: string;
+    credentials?: 'omit' | 'same-origin' | 'include';
+    body?: any;
+};
diff --git a/types/api/config.d.ts b/types/api/config.d.ts
index 4ef645d0a..1b17cf93b 100644
--- a/types/api/config.d.ts
+++ b/types/api/config.d.ts
@@ -82,6 +82,7 @@ interface ClientConfig {
     EnableSignUpWithGitLab: string;
     EnableSignUpWithGoogle: string;
     EnableSignUpWithOffice365: string;
+    EnableSignUpWithOpenId: string;
     EnableSVGs: string;
     EnableTesting: string;
     EnableThemeSelection: string;
@@ -129,6 +130,8 @@ interface ClientConfig {
     MaxFileSize: string;
     MaxNotificationsPerChannel: string;
     MinimumHashtagLength: string;
+    OpenIdButtonColor: string;
+    OpenIdButtonText: string;
     PasswordMinimumLength: string;
     PasswordRequireLowercase: string;
     PasswordRequireNumber: string;
diff --git a/types/api/emojis.d.ts b/types/api/emojis.d.ts
new file mode 100644
index 000000000..7947d3ac4
--- /dev/null
+++ b/types/api/emojis.d.ts
@@ -0,0 +1,41 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type EmojiCategory = (
+    | 'recent'
+    | 'people'
+    | 'nature'
+    | 'foods'
+    | 'activity'
+    | 'places'
+    | 'objects'
+    | 'symbols'
+    | 'flags'
+    | 'custom'
+);
+
+type CustomEmoji = {
+    id: string;
+    create_at: number;
+    update_at: number;
+    delete_at: number;
+    creator_id: string;
+    name: string;
+    category: 'custom';
+};
+
+type SystemEmoji = {
+    filename: string;
+    aliases: Array<string>;
+    category: EmojiCategory;
+    batch: number;
+};
+
+type Emoji = SystemEmoji | CustomEmoji;
+
+type EmojisState = {
+    customEmoji: {
+        [x: string]: CustomEmoji;
+    };
+    nonExistentEmoji: Set<string>;
+};
diff --git a/types/api/error.d.ts b/types/api/error.d.ts
new file mode 100644
index 000000000..e8adf47e2
--- /dev/null
+++ b/types/api/error.d.ts
@@ -0,0 +1,9 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type ApiError = {
+    server_error_id?: string;
+    stack?: string;
+    message: string;
+    status_code?: number;
+};
diff --git a/types/api/files.d.ts b/types/api/files.d.ts
new file mode 100644
index 000000000..ff094856b
--- /dev/null
+++ b/types/api/files.d.ts
@@ -0,0 +1,33 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type FileInfo = {
+    id: string;
+    user_id: string;
+    post_id: string;
+    create_at: number;
+    update_at: number;
+    delete_at: number;
+    name: string;
+    extension: string;
+    size: number;
+    mime_type: string;
+    width: number;
+    height: number;
+    has_preview_image: boolean;
+    clientId: string;
+    localPath?: string;
+    uri?: string;
+    loading?: boolean;
+};
+
+type FilesState = {
+    files: Dictionary<FileInfo>;
+    fileIdsByPostId: Dictionary<Array<string>>;
+    filePublicLink?: string;
+};
+
+type FileUploadResponse = {
+    file_infos: FileInfo[];
+    client_ids: string[];
+};
diff --git a/types/api/groups.d.ts b/types/api/groups.d.ts
new file mode 100644
index 000000000..c0fbecbc3
--- /dev/null
+++ b/types/api/groups.d.ts
@@ -0,0 +1,69 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type SyncableType = 'team' | 'channel';
+type SyncablePatch = {
+    scheme_admin: boolean;
+    auto_add: boolean;
+};
+type Group = {
+    id: string;
+    name: string;
+    display_name: string;
+    description: string;
+    type: string;
+    remote_id: string;
+    create_at: number;
+    update_at: number;
+    delete_at: number;
+    has_syncables: boolean;
+    member_count: number;
+    scheme_admin: boolean;
+    allow_reference: boolean;
+};
+type GroupTeam = {
+    team_id: string;
+    team_display_name: string;
+    team_type: string;
+    group_id: string;
+    auto_add: boolean;
+    scheme_admin: boolean;
+    create_at: number;
+    delete_at: number;
+    update_at: number;
+};
+type GroupChannel = {
+    channel_id: string;
+    channel_display_name: string;
+    channel_type: string;
+    team_id: string;
+    team_display_name: string;
+    team_type: string;
+    group_id: string;
+    auto_add: boolean;
+    scheme_admin: boolean;
+    create_at: number;
+    delete_at: number;
+    update_at: number;
+};
+type GroupSyncables = {
+    teams: Array<GroupTeam>;
+    channels: Array<GroupChannel>;
+};
+type GroupsState = {
+    syncables: {
+        [x: string]: GroupSyncables;
+    };
+    members: any;
+    groups: {
+        [x: string]: Group;
+    };
+    myGroups: {
+        [x: string]: Group;
+    };
+};
+type GroupSearchOpts = {
+    q: string;
+    is_linked?: boolean;
+    is_configured?: boolean;
+};
diff --git a/types/api/integrations.d.ts b/types/api/integrations.d.ts
new file mode 100644
index 000000000..a15e3b0cf
--- /dev/null
+++ b/types/api/integrations.d.ts
@@ -0,0 +1,87 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type Command = {
+    'id': string;
+    'token': string;
+    'create_at': number;
+    'update_at': number;
+    'delete_at': number;
+    'creator_id': string;
+    'team_id': string;
+    'trigger': string;
+    'method': 'P' | 'G' | '';
+    'username': string;
+    'icon_url': string;
+    'auto_complete': boolean;
+    'auto_complete_desc': string;
+    'auto_complete_hint': string;
+    'display_name': string;
+    'description': string;
+    'url': string;
+};
+
+type CommandArgs = {
+    channel_id: string;
+    team_id: string;
+    root_id?: string;
+    parent_id?: string;
+};
+
+// AutocompleteSuggestion represents a single suggestion downloaded from the server.
+type AutocompleteSuggestion = {
+    Complete: string;
+    Suggestion: string;
+    Hint: string;
+    Description: string;
+    IconData: string;
+};
+
+type DialogSubmission = {
+    url: string;
+    callback_id: string;
+    state: string;
+    user_id: string;
+    channel_id: string;
+    team_id: string;
+    submission: {
+        [x: string]: string;
+    };
+    cancelled: boolean;
+};
+
+type DialogOption = {
+    text: string;
+    value: string;
+};
+
+type DialogElement = {
+    display_name: string;
+    name: string;
+    type: string;
+    subtype: string;
+    default: string;
+    placeholder: string;
+    help_text: string;
+    optional: boolean;
+    min_length: number;
+    max_length: number;
+    data_source: string;
+    options: Array<DialogOption>;
+};
+
+type InteractiveDialogConfig = {
+    app_id: string;
+    trigger_id: string;
+    url: string;
+    dialog: {
+        callback_id: string;
+        title: string;
+        introduction_text: string;
+        icon_url?: string;
+        elements: DialogElement[];
+        submit_label: string;
+        notify_on_cancel: boolean;
+        state: string;
+    };
+};
diff --git a/types/api/license.d.ts b/types/api/license.d.ts
new file mode 100644
index 000000000..72ad20f0c
--- /dev/null
+++ b/types/api/license.d.ts
@@ -0,0 +1,33 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+interface ClientLicense {
+    Announcement: string;
+    Cloud: string;
+    Cluster: string;
+    Company: string;
+    Compliance: string;
+    CustomPermissionsSchemes: string;
+    CustomTermsOfService: string;
+    DataRetention: string;
+    Elasticsearch: string;
+    EmailNotificationContents: string;
+    GoogleOAuth: string;
+    GuestAccounts: string;
+    GuestAccountsPermissions: string;
+    IDLoadedPushNotifications: string;
+    IsLicensed: string;
+    LDAP: string;
+    LDAPGroups: string;
+    LockTeammateNameDisplay: string;
+    MFA: string;
+    MHPNS: string;
+    MessageExport: string;
+    Metrics: string;
+    Office365OAuth: string;
+    OpenId: string;
+    RemoteClusterService: string;
+    SAML: string;
+    SharedChannels: string;
+    Users: string;
+ }
diff --git a/types/api/posts.d.ts b/types/api/posts.d.ts
new file mode 100644
index 000000000..31a6ae2fe
--- /dev/null
+++ b/types/api/posts.d.ts
@@ -0,0 +1,113 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type PostType = 'system_add_remove' |
+                       'system_add_to_channel' |
+                       'system_add_to_team' |
+                       'system_channel_deleted' |
+                       'system_channel_restored' |
+                       'system_displayname_change' |
+                       'system_convert_channel' |
+                       'system_ephemeral' |
+                       'system_header_change' |
+                       'system_join_channel' |
+                       'system_join_leave' |
+                       'system_leave_channel' |
+                       'system_purpose_change' |
+                       'system_remove_from_channel';
+
+type PostEmbedType = 'image' | 'message_attachment' | 'opengraph';
+
+type PostEmbed = {
+    type: PostEmbedType;
+    url: string;
+    data: Record<string, any>;
+};
+
+type PostImage = {
+    height: number;
+    width: number;
+    format?: string;
+    frame_count?: number;
+};
+
+type PostMetadata = {
+    embeds: Array<PostEmbed>;
+    emojis: Array<CustomEmoji>;
+    files: Array<FileInfo>;
+    images: Dictionary<PostImage>;
+    reactions: Array<Reaction>;
+};
+
+type Post = {
+    id: string;
+    create_at: number;
+    update_at: number;
+    edit_at: number;
+    delete_at: number;
+    is_pinned: boolean;
+    user_id: string;
+    channel_id: string;
+    root_id: string;
+    parent_id: string;
+    original_id: string;
+    message: string;
+    type: PostType;
+    props: Record<string, any>;
+    hashtags: string;
+    pending_post_id: string;
+    reply_count: number;
+    file_ids?: any[];
+    metadata: PostMetadata;
+    failed?: boolean;
+    user_activity_posts?: Array<Post>;
+    state?: 'DELETED';
+    ownPost?: boolean;
+};
+
+type PostWithFormatData = Post & {
+    isFirstReply: boolean;
+    isLastReply: boolean;
+    previousPostIsComment: boolean;
+    commentedOnPost?: Post;
+    consecutivePostByUser: boolean;
+    replyCount: number;
+    isCommentMention: boolean;
+    highlight: boolean;
+};
+
+type PostOrderBlock = {
+    order: Array<string>;
+    recent?: boolean;
+    oldest?: boolean;
+};
+
+type MessageHistory = {
+    messages: Array<string>;
+    index: {
+        post: number;
+        comment: number;
+    };
+};
+
+type PostsState = {
+    posts: IDMappedObjects<Post>;
+    postsInChannel: Dictionary<Array<PostOrderBlock>>;
+    postsInThread: RelationOneToMany<Post, Post>;
+    reactions: RelationOneToOne<Post, Dictionary<Reaction>>;
+    openGraph: RelationOneToOne<Post, any>;
+    pendingPostIds: Array<string>;
+    selectedPostId: string;
+    currentFocusedPostId: string;
+    messagesHistory: MessageHistory;
+    expandedURLs: Dictionary<string>;
+};
+
+type PostProps = {
+    disable_group_highlight?: boolean;
+    mentionHighlightDisabled: boolean;
+};
+
+type PostResponse = PostOrderBlock & {
+    posts: IDMappedObjects<Post>;
+};
diff --git a/types/api/preferences.d.ts b/types/api/preferences.d.ts
index 825d2db1d..3599d778f 100644
--- a/types/api/preferences.d.ts
+++ b/types/api/preferences.d.ts
@@ -2,7 +2,6 @@
 // See LICENSE.txt for license information.
 
 type Theme = {
-    [key: string]: string | undefined;
     type?: string;
     sidebarBg: string;
     sidebarText: string;
@@ -28,4 +27,5 @@ type Theme = {
     mentionHighlightBg: string;
     mentionHighlightLink: string;
     codeTheme: string;
+    [key: string]: any;
 };
diff --git a/types/api/reactions.d.ts b/types/api/reactions.d.ts
new file mode 100644
index 000000000..614b6ffd0
--- /dev/null
+++ b/types/api/reactions.d.ts
@@ -0,0 +1,9 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type Reaction = {
+    user_id: string;
+    post_id: string;
+    emoji_name: string;
+    create_at: number;
+};
diff --git a/types/api/roles.d.ts b/types/api/roles.d.ts
new file mode 100644
index 000000000..a9d6e92c2
--- /dev/null
+++ b/types/api/roles.d.ts
@@ -0,0 +1,17 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type ChannelModerationRoles = 'members' | 'guests';
+
+type Role = {
+    id: string;
+    name: string;
+    display_name: string;
+    description: string;
+    create_at: number;
+    update_at: number;
+    delete_at: number;
+    permissions: Array<string>;
+    scheme_managed: boolean;
+    built_in: boolean;
+};
diff --git a/types/api/teams.d.ts b/types/api/teams.d.ts
new file mode 100644
index 000000000..9e342dab8
--- /dev/null
+++ b/types/api/teams.d.ts
@@ -0,0 +1,55 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type TeamMembership = {
+    mention_count: number;
+    msg_count: number;
+    team_id: string;
+    user_id: string;
+    roles: string;
+    delete_at: number;
+    scheme_user: boolean;
+    scheme_admin: boolean;
+};
+
+type TeamMemberWithError = {
+    member: TeamMembership;
+    user_id: string;
+    error: ApiError;
+}
+
+type TeamType = 'O' | 'I';
+
+type Team = {
+    id: string;
+    create_at: number;
+    update_at: number;
+    delete_at: number;
+    display_name: string;
+    name: string;
+    description: string;
+    email: string;
+    type: TeamType;
+    company_name: string;
+    allowed_domains: string;
+    invite_id: string;
+    allow_open_invite: boolean;
+    scheme_id: string;
+    group_constrained: boolean;
+};
+
+type TeamsState = {
+    currentTeamId: string;
+    teams: Dictionary<Team>;
+    myMembers: Dictionary<TeamMembership>;
+    membersInTeam: any;
+    stats: any;
+    groupsAssociatedToTeam: any;
+    totalCount: number;
+};
+
+type TeamUnread = {
+    team_id: string;
+    mention_count: number;
+    msg_count: number;
+};
diff --git a/types/api/users.d.ts b/types/api/users.d.ts
new file mode 100644
index 000000000..00084441f
--- /dev/null
+++ b/types/api/users.d.ts
@@ -0,0 +1,80 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+type UserNotifyProps = {
+    auto_responder_active?: 'true' | 'false';
+    auto_responder_message?: string;
+    desktop: 'default' | 'all' | 'mention' | 'none';
+    desktop_notification_sound?: string;
+    desktop_sound: 'true' | 'false';
+    email: 'true' | 'false';
+    mark_unread: 'all' | 'mention';
+    push: 'default' | 'all' | 'mention' | 'none';
+    push_status: 'ooo' | 'offline' | 'away' | 'dnd' | 'online';
+    comments: 'never' | 'root' | 'any';
+    first_name: 'true' | 'false';
+    channel: 'true' | 'false';
+    mention_keys: string;
+    user_id?: string;
+};
+
+type UserProfile = {
+    id: string;
+    create_at: number;
+    update_at: number;
+    delete_at: number;
+    username: string;
+    auth_data: string;
+    auth_service: string;
+    email: string;
+    email_verified: boolean;
+    nickname: string;
+    first_name: string;
+    last_name: string;
+    position: string;
+    roles: string;
+    locale: string;
+    notify_props: UserNotifyProps;
+    terms_of_service_id: string;
+    terms_of_service_create_at: number;
+    timezone?: UserTimezone;
+    is_bot: boolean;
+    last_picture_update: number;
+};
+
+type UsersState = {
+    currentUserId: string;
+    isManualStatus: RelationOneToOne<UserProfile, boolean>;
+    mySessions: Array<any>;
+    profiles: IDMappedObjects<UserProfile>;
+    profilesInTeam: RelationOneToMany<Team, UserProfile>;
+    profilesNotInTeam: RelationOneToMany<Team, UserProfile>;
+    profilesWithoutTeam: Set<string>;
+    profilesInChannel: RelationOneToMany<Channel, UserProfile>;
+    profilesNotInChannel: RelationOneToMany<Channel, UserProfile>;
+    statuses: RelationOneToOne<UserProfile, string>;
+    stats: any;
+};
+
+type UserTimezone = {
+    useAutomaticTimezone: boolean | string;
+    automaticTimezone: string;
+    manualTimezone: string;
+};
+
+type UserActivity = {
+    [x in PostType]: {
+        [y in $ID<UserProfile>]: | {
+            ids: Array<$ID<UserProfile>>;
+            usernames: Array<UserProfile['username']>;
+        } | Array<$ID<UserProfile>>;
+    };
+};
+
+type UserStatus = {
+	user_id: string;
+	status: string;
+	manual: boolean;
+	last_activity_at: number;
+	active_channel?: string;
+};
diff --git a/types/credentials/index.d.ts b/types/credentials/index.d.ts
new file mode 100644
index 000000000..7df45fa09
--- /dev/null
+++ b/types/credentials/index.d.ts
@@ -0,0 +1,7 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export type ServerCredentials = {
+    userId: string;
+    token: string;
+};
diff --git a/types/database/config.ts b/types/database/config.ts
new file mode 100644
index 000000000..544a8cc87
--- /dev/null
+++ b/types/database/config.ts
@@ -0,0 +1,170 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export type Config = {
+    AboutLink: string;
+    AllowBannerDismissal: string;
+    AllowCustomThemes: string;
+    AllowedThemes: string;
+    AndroidAppDownloadLink: string;
+    AndroidLatestVersion: string;
+    AndroidMinVersion: string;
+    AppDownloadLink: string;
+    AsymmetricSigningPublicKey: string;
+    AvailableLocales: string;
+    BannerColor: string;
+    BannerText: string;
+    BannerTextColor: string;
+    BuildDate: string;
+    BuildEnterpriseReady: string;
+    BuildHash: string;
+    BuildHashEnterprise: string;
+    BuildNumber: string;
+    CloseUnusedDirectMessages: string;
+    CustomBrandText: string;
+    CustomDescriptionText: string;
+    CustomTermsOfServiceId: string;
+    CustomTermsOfServiceReAcceptancePeriod: string;
+    CustomUrlSchemes: string;
+    DataRetentionEnableFileDeletion: string;
+    DataRetentionEnableMessageDeletion: string;
+    DataRetentionFileRetentionDays: string;
+    DataRetentionMessageRetentionDays: string;
+    DefaultClientLocale: string;
+    DefaultTheme: string;
+    DesktopLatestVersion: string;
+    DesktopMinVersion: string;
+    DiagnosticId: string;
+    DiagnosticsEnabled: string;
+    EmailLoginButtonBorderColor: string;
+    EmailLoginButtonColor: string;
+    EmailLoginButtonTextColor: string;
+    EmailNotificationContentsType: string;
+    EnableBanner: string;
+    EnableBotAccountCreation: string;
+    EnableChannelViewedMessages: string;
+    EnableCluster: string;
+    EnableCommands: string;
+    EnableCompliance: string;
+    EnableConfirmNotificationsToChannel: string;
+    EnableCustomBrand: string;
+    EnableCustomEmoji: string;
+    EnableCustomTermsOfService: string;
+    EnableDeveloper: string;
+    EnableDiagnostics: string;
+    EnableEmailBatching: string;
+    EnableEmailInvitations: string;
+    EnableEmojiPicker: string;
+    EnableFileAttachments: string;
+    EnableGifPicker: string;
+    EnableGuestAccounts: string;
+    EnableIncomingWebhooks: string;
+    EnableLatex: string;
+    EnableLdap: string;
+    EnableLinkPreviews: string;
+    EnableMarketplace: string;
+    EnableMetrics: string;
+    EnableMobileFileDownload: string;
+    EnableMobileFileUpload: string;
+    EnableMultifactorAuthentication: string;
+    EnableOAuthServiceProvider: string;
+    EnableOpenServer: string;
+    EnableOutgoingWebhooks: string;
+    EnablePostIconOverride: string;
+    EnablePostUsernameOverride: string;
+    EnablePreviewFeatures: string;
+    EnablePreviewModeBanner: string;
+    EnablePublicLink: string;
+    EnableSaml: string;
+    EnableSignInWithEmail: string;
+    EnableSignInWithUsername: string;
+    EnableSignUpWithEmail: string;
+    EnableSignUpWithGitLab: string;
+    EnableSignUpWithGoogle: string;
+    EnableSignUpWithOffice365: string;
+    EnableSignUpWithOpenId: string;
+    EnableSVGs: string;
+    EnableTesting: string;
+    EnableThemeSelection: string;
+    EnableTutorial: string;
+    EnableUserAccessTokens: string;
+    EnableUserCreation: string;
+    EnableUserDeactivation: string;
+    EnableUserTypingMessages: string;
+    EnableXToLeaveChannelsFromLHS: string;
+    EnforceMultifactorAuthentication: string;
+    ExperimentalChannelOrganization: string;
+    ExperimentalChannelSidebarOrganization: string;
+    ExperimentalClientSideCertCheck: string;
+    ExperimentalClientSideCertEnable: string;
+    ExperimentalEnableAuthenticationTransfer: string;
+    ExperimentalEnableAutomaticReplies: string;
+    ExperimentalEnableClickToReply: string;
+    ExperimentalEnableDefaultChannelLeaveJoinMessages: string;
+    ExperimentalEnablePostMetadata: string;
+    ExperimentalGroupUnreadChannels: string;
+    ExperimentalHideTownSquareinLHS: string;
+    ExperimentalPrimaryTeam: string;
+    ExperimentalTimezone: string;
+    ExperimentalTownSquareIsReadOnly: string;
+    ExperimentalViewArchivedChannels: string;
+    GfycatApiKey: string;
+    GfycatApiSecret: string;
+    GoogleDeveloperKey: string;
+    GuestAccountsEnforceMultifactorAuthentication: string;
+    HasImageProxy: string;
+    HelpLink: string;
+    IosAppDownloadLink: string;
+    IosLatestVersion: string;
+    IosMinVersion: string;
+    LdapFirstNameAttributeSet: string;
+    LdapLastNameAttributeSet: string;
+    LdapLoginButtonBorderColor: string;
+    LdapLoginButtonColor: string;
+    LdapLoginButtonTextColor: string;
+    LdapLoginFieldName: string;
+    LdapNicknameAttributeSet: string;
+    LdapPositionAttributeSet: string;
+    LockTeammateNameDisplay: string;
+    MaxFileSize: string;
+    MaxNotificationsPerChannel: string;
+    MinimumHashtagLength: string;
+    OpenIdButtonColor: string;
+    OpenIdButtonText: string;
+    PasswordMinimumLength: string;
+    PasswordRequireLowercase: string;
+    PasswordRequireNumber: string;
+    PasswordRequireSymbol: string;
+    PasswordRequireUppercase: string;
+    PluginsEnabled: string;
+    PostEditTimeLimit: string;
+    PrivacyPolicyLink: string;
+    ReportAProblemLink: string;
+    RequireEmailVerification: string;
+    RestrictDirectMessage: string;
+    RunJobs: string;
+    SamlFirstNameAttributeSet: string;
+    SamlLastNameAttributeSet: string;
+    SamlLoginButtonBorderColor: string;
+    SamlLoginButtonColor: string;
+    SamlLoginButtonText: string;
+    SamlLoginButtonTextColor: string;
+    SamlNicknameAttributeSet: string;
+    SamlPositionAttributeSet: string;
+    SendEmailNotifications: string;
+    SendPushNotifications: string;
+    ShowEmailAddress: string;
+    ShowFullName: string;
+    SiteName: string;
+    SiteURL: string;
+    SQLDriverName: string;
+    SupportEmail: string;
+    TeammateNameDisplay: string;
+    TermsOfServiceLink: string;
+    TimeBetweenUserTypingUpdatesMilliseconds: string;
+    Version: string;
+    WebsocketPort: string;
+    WebsocketSecurePort: string;
+    WebsocketURL: string;
+    ExtendSessionLengthWithActivity: string;
+};
diff --git a/types/database/database.d.ts b/types/database/database.d.ts
index 3bc927c87..9afcd03d0 100644
--- a/types/database/database.d.ts
+++ b/types/database/database.d.ts
@@ -5,6 +5,9 @@ import {Database} from '@nozbe/watermelondb';
 import Model from '@nozbe/watermelondb/Model';
 import {Clause} from '@nozbe/watermelondb/QueryDescription';
 import {Class} from '@nozbe/watermelondb/utils/common';
+import {Config} from '@typings/database/config';
+import {License} from '@typings/database/license';
+import System from '@typings/database/system';
 
 import {DatabaseType, IsolatedEntities} from './enums';
 
@@ -223,7 +226,7 @@ export type RawUser = {
   props: UserProps;
   roles: string;
   timezone: {
-    useAutomaticTimezone: boolean;
+    useAutomaticTimezone: string;
     manualTimezone: string;
     automaticTimezone: string;
   };
@@ -234,7 +237,6 @@ export type RawUser = {
 };
 
 export type RawPreference = {
-  id? : string;
   category: string;
   name: string;
   user_id: string;
@@ -685,3 +687,38 @@ export type HandleDraftArgs = {
   drafts: RawDraft[];
   prepareRecordsOnly: boolean;
 };
+
+export type LoginArgs = {
+  config: Partial<Config>;
+  ldapOnly?: boolean;
+  license: Partial<License>;
+  loginId: string;
+  mfaToken?: string;
+  password: string;
+};
+
+export type LoadMeArgs = { user?: RawUser; deviceToken?: string };
+
+export type ServerUrlChangedArgs = {
+  configRecord: System;
+  licenseRecord: System;
+  selectServerRecord: System;
+  serverUrl: string;
+};
+
+export type RetrievedDatabase = {
+  dbInstance: DatabaseInstance;
+  displayName: string;
+  url: string;
+}
+
+export type GetDatabaseConnectionArgs = {
+  serverUrl: string;
+  connectionName?: string;
+  setAsActiveDatabase: boolean;
+}
+
+export type MostRecentConnection = {
+  connection: DatabaseInstance,
+  serverUrl: string,
+}
diff --git a/types/database/global.d.ts b/types/database/global.d.ts
index 1f65d4c45..d9b55a78a 100644
--- a/types/database/global.d.ts
+++ b/types/database/global.d.ts
@@ -15,5 +15,5 @@ export default class Global extends Model {
     name: string;
 
     /** value : The value part of the key-value combination */
-    value: string;
+    value: any;
 }
diff --git a/types/database/index.d.ts b/types/database/index.d.ts
index 838aa367d..7b22a97c1 100644
--- a/types/database/index.d.ts
+++ b/types/database/index.d.ts
@@ -18,11 +18,11 @@ interface UserProps {
 interface Timezone {
     automaticTimezone: string;
     manualTimezone: string;
-    useAutomaticTimezone: boolean;
+    useAutomaticTimezone: string;
 }
 
 interface FileInfo {
-    id?: string;
+    id: string;
     user_id: string;
     post_id: string;
     create_at: number;
diff --git a/types/database/license.ts b/types/database/license.ts
new file mode 100644
index 000000000..4029806cd
--- /dev/null
+++ b/types/database/license.ts
@@ -0,0 +1,33 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export type License = {
+    Announcement: string,
+    Cloud: string,
+    Cluster: string,
+    Company: string,
+    Compliance: string,
+    CustomPermissionsSchemes: string,
+    CustomTermsOfService: string,
+    DataRetention: string,
+    Elasticsearch: string,
+    EmailNotificationContents: string,
+    GoogleOAuth: string,
+    GuestAccounts: string,
+    GuestAccountsPermissions: string,
+    IDLoadedPushNotifications: string,
+    IsLicensed: string,
+    LDAP: string,
+    LDAPGroups: string,
+    LockTeammateNameDisplay: string,
+    MFA: string,
+    MHPNS: string,
+    MessageExport: string,
+    Metrics: string,
+    Office365OAuth: string,
+    OpenId: string,
+    RemoteClusterService: string,
+    SAML: string,
+    SharedChannels: string,
+    Users: string
+}
diff --git a/types/global/global_event_handler.d.ts b/types/global/global_event_handler.d.ts
deleted file mode 100644
index df4611d78..000000000
--- a/types/global/global_event_handler.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-interface launchAppFunc {
-    (skipEmm: boolean): void;
-}
-
-interface GlobalEventHandlerOpts {
-    launchApp: launchAppFunc;
-}
diff --git a/types/global/preferences.d.ts b/types/global/preferences.d.ts
index 543730569..bffd2aeb5 100644
--- a/types/global/preferences.d.ts
+++ b/types/global/preferences.d.ts
@@ -11,32 +11,3 @@ interface PreferenceType {
 interface PreferencesType {
     [x: string]: PreferenceType;
 }
-
-interface Theme {
-    [key: string]: string | undefined;
-    type?: string;
-    sidebarBg: string;
-    sidebarText: string;
-    sidebarUnreadText: string;
-    sidebarTextHoverBg: string;
-    sidebarTextActiveBorder: string;
-    sidebarTextActiveColor: string;
-    sidebarHeaderBg: string;
-    sidebarHeaderTextColor: string;
-    onlineIndicator: string;
-    awayIndicator: string;
-    dndIndicator: string;
-    mentionBg: string;
-    mentionBj: string;
-    mentionColor: string;
-    centerChannelBg: string;
-    centerChannelColor: string;
-    newMessageSeparator: string;
-    linkColor: string;
-    buttonBg: string;
-    buttonColor: string;
-    errorTextColor: string;
-    mentionHighlightBg: string;
-    mentionHighlightLink: string;
-    codeTheme: string;
-}
diff --git a/types/global/push_notifications.d.ts b/types/global/push_notifications.d.ts
index 94ded979d..8e5805759 100644
--- a/types/global/push_notifications.d.ts
+++ b/types/global/push_notifications.d.ts
@@ -29,6 +29,7 @@ interface NotificationData {
     post_id: string;
     root_id?: string;
     sender_id?: string;
+    server_url?: string;
     team_id?: string;
     type: string;
     use_user_icon?: string;
diff --git a/types/global/utilities.d.ts b/types/global/utilities.d.ts
index cd86e6d0a..d09586477 100644
--- a/types/global/utilities.d.ts
+++ b/types/global/utilities.d.ts
@@ -1,6 +1,31 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-interface Dictionary<T> {
+type $ID<E extends {id: string}> = E['id'];
+type $UserID<E extends {user_id: string}> = E['user_id'];
+type $Name<E extends {name: string}> = E['name'];
+type $Username<E extends {username: string}> = E['username'];
+type $Email<E extends {email: string}> = E['email'];
+type RelationOneToOne<E extends {id: string}, T> = {
+    [x in $ID<E>]: T;
+};
+type RelationOneToMany<E1 extends {id: string}, E2 extends {id: string}> = {
+    [x in $ID<E1>]: Array<$ID<E2>>;
+};
+type IDMappedObjects<E extends {id: string}> = RelationOneToOne<E, E>;
+type UserIDMappedObjects<E extends {user_id: string}> = {
+    [x in $UserID<E>]: E;
+};
+type NameMappedObjects<E extends {name: string}> = {
+    [x in $Name<E>]: E;
+};
+type UsernameMappedObjects<E extends {username: string}> = {
+    [x in $Username<E>]: E;
+};
+type EmailMappedObjects<E extends {email: string}> = {
+    [x in $Email<E>]: E;
+};
+
+type Dictionary<T> = {
     [key: string]: T;
-}
+};
diff --git a/types/launch/index.ts b/types/launch/index.ts
new file mode 100644
index 000000000..35dade3b7
--- /dev/null
+++ b/types/launch/index.ts
@@ -0,0 +1,52 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export interface DeepLink {
+    serverUrl: string;
+    teamName: string;
+}
+
+export interface DeepLinkChannel extends DeepLink {
+    channelName: string;
+}
+
+export interface DeepLinkDM extends DeepLink {
+    userName: string;
+}
+
+export interface DeepLinkPermalink extends DeepLink {
+    postId: string;
+}
+
+export interface DeepLinkGM extends DeepLink {
+    channelId: string;
+}
+
+export const DeepLinkType = {
+    Channel: 'channel',
+    DirectMessage: 'dm',
+    GroupMessage: 'gm',
+    Invalid: 'invalid',
+    Permalink: 'permalink',
+} as const;
+
+export type DeepLinkType = typeof DeepLinkType[keyof typeof DeepLinkType];
+
+export interface DeepLinkWithData {
+    type: DeepLinkType;
+    data?: DeepLinkChannel | DeepLinkDM | DeepLinkGM | DeepLinkPermalink;
+}
+
+export const LaunchType = {
+    Normal: 'normal',
+    DeepLink: 'deeplink',
+    Notification: 'notification',
+} as const;
+
+export type LaunchType = typeof LaunchType[keyof typeof LaunchType];
+
+export interface LaunchProps {
+    extra?: DeepLinkWithData | NotificationWithData;
+    launchType: LaunchType;
+    launchError?: Boolean;
+}
diff --git a/packager/moduleNames.js b/types/modules/mock-async-storage.d.ts
similarity index 75%
rename from packager/moduleNames.js
rename to types/modules/mock-async-storage.d.ts
index 44af78ff1..4ea37bf08 100644
--- a/packager/moduleNames.js
+++ b/types/modules/mock-async-storage.d.ts
@@ -1,4 +1,4 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-module.exports = [];
+declare module 'mock-async-storage';
diff --git a/types/screens/gallery.d.ts b/types/screens/gallery.d.ts
index 94e737872..92f7fba55 100644
--- a/types/screens/gallery.d.ts
+++ b/types/screens/gallery.d.ts
@@ -6,9 +6,6 @@ import {intlShape} from 'react-intl';
 import {StyleProp, ViewStyle} from 'react-native';
 import Animated from 'react-native-reanimated';
 
-import type {FileInfo} from '@mm-redux/types/files';
-import type {Theme} from '@mm-redux/types/preferences';
-
 export interface CallbackFunctionWithoutArguments {
     (): void;
 }
diff --git a/types/utils/index.d.ts b/types/utils/index.d.ts
index 75e178b63..883716031 100644
--- a/types/utils/index.d.ts
+++ b/types/utils/index.d.ts
@@ -1,6 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {ImageStyle, TextStyle, ViewStyle} from 'react-native';
+
 type Dictionary<T> = {
     [key: string]: T;
 };
+
+type Styles = ViewStyle | TextStyle | ImageStyle