From 6e3e7a1ab62569c168d475d36bf8ad6d268bc2ed Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 13 Nov 2019 21:02:34 -0500
Subject: [PATCH 01/16] MM-19961 Sync persisted channels with the ones returned
 by the server (#3553)

---
 package-lock.json | 80 ++++++++++++++++++++++++++++++++++++++---------
 package.json      |  5 +--
 2 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 799f2b640..c3e558540 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4884,7 +4884,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4902,11 +4903,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4919,15 +4922,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5030,7 +5036,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5040,6 +5047,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5052,17 +5060,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5079,6 +5090,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5151,7 +5163,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5161,6 +5174,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5236,7 +5250,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5266,6 +5281,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5283,6 +5299,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5321,11 +5338,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -6125,6 +6144,12 @@
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true
     },
+    "is-generator-function": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz",
+      "integrity": "sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==",
+      "dev": true
+    },
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -7759,9 +7784,10 @@
       }
     },
     "mattermost-redux": {
-      "version": "github:mattermost/mattermost-redux#e09899fda322c362c55c8ebbddc967920864a385",
-      "from": "github:mattermost/mattermost-redux#e09899fda322c362c55c8ebbddc967920864a385",
+      "version": "github:mattermost/mattermost-redux#98a375cea54f78fb6c0ede01ee4e9aec009f9fa5",
+      "from": "github:mattermost/mattermost-redux#98a375cea54f78fb6c0ede01ee4e9aec009f9fa5",
       "requires": {
+        "form-data": "2.5.1",
         "gfycat-sdk": "1.4.18",
         "isomorphic-fetch": "2.2.1",
         "moment-timezone": "0.5.26",
@@ -7773,7 +7799,7 @@
         "redux-thunk": "2.3.0",
         "remote-redux-devtools": "0.5.16",
         "reselect": "4.0.0",
-        "serialize-error": "2.1.0",
+        "serialize-error": "5.0.0",
         "shallow-equals": "1.0.0"
       },
       "dependencies": {
@@ -7802,6 +7828,19 @@
             "lodash": "^4.17.4",
             "lodash-es": "^4.17.4"
           }
+        },
+        "serialize-error": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz",
+          "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==",
+          "requires": {
+            "type-fest": "^0.8.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
@@ -13425,6 +13464,19 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
+    "util": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.1.tgz",
+      "integrity": "sha512-MREAtYOp+GTt9/+kwf00IYoHZyjM8VU4aVrkzUlejyqaIjd2GztVl5V9hGXKlvBKE3gENn/FMfHE5v6hElXGcQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "object.entries": "^1.1.0",
+        "safe-buffer": "^5.1.2"
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/package.json b/package.json
index f99348c77..3082d8aae 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "intl": "1.2.5",
     "jail-monkey": "2.3.0",
     "jsc-android": "241213.1.0",
-    "mattermost-redux": "github:mattermost/mattermost-redux#e09899fda322c362c55c8ebbddc967920864a385",
+    "mattermost-redux": "github:mattermost/mattermost-redux#98a375cea54f78fb6c0ede01ee4e9aec009f9fa5",
     "mime-db": "1.42.0",
     "moment-timezone": "0.5.27",
     "prop-types": "15.7.2",
@@ -114,7 +114,8 @@
     "redux-mock-store": "1.5.3",
     "remote-redux-devtools": "0.5.16",
     "socketcluster": "14.4.1",
-    "underscore": "1.9.1"
+    "underscore": "1.9.1",
+    "util": "0.12.1"
   },
   "scripts": {
     "start": "node ./node_modules/react-native/local-cli/cli.js start",

From 96b78adf45be2c27ae514d1a3793a9433ef8d71f Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 14 Nov 2019 10:32:08 -0800
Subject: [PATCH 02/16] Adding ability to disable attachment buttons and
 fields. (#3541)

* Adding ability to disable attachment buttons and fields.

* Revert package lock

* Use changeOpacity
---
 .../autocomplete_selector/autocomplete_selector.js    |  8 +++++++-
 .../action_button/action_button.js                    | 11 +++++++++--
 .../message_attachments/action_menu/action_menu.js    |  3 +++
 .../action_menu/action_menu.test.js                   | 10 ++++++++++
 .../message_attachments/attachment_actions.js         |  2 ++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/components/autocomplete_selector/autocomplete_selector.js b/app/components/autocomplete_selector/autocomplete_selector.js
index 83abb8488..c5b8c1499 100644
--- a/app/components/autocomplete_selector/autocomplete_selector.js
+++ b/app/components/autocomplete_selector/autocomplete_selector.js
@@ -36,6 +36,7 @@ export default class AutocompleteSelector extends PureComponent {
         errorText: PropTypes.node,
         roundedBorders: PropTypes.bool,
         isLandscape: PropTypes.bool.isRequired,
+        disabled: PropTypes.bool,
     };
 
     static contextTypes = {
@@ -119,6 +120,7 @@ export default class AutocompleteSelector extends PureComponent {
             showRequiredAsterisk,
             roundedBorders,
             isLandscape,
+            disabled,
         } = this.props;
         const {selectedText} = this.state;
         const style = getStyleSheet(theme);
@@ -188,9 +190,10 @@ export default class AutocompleteSelector extends PureComponent {
                     {labelContent}
                 </View>
                 <TouchableWithFeedback
-                    style={style.flex}
+                    style={disabled ? style.disabled : null}
                     onPress={this.goToSelectorScreen}
                     type={'opacity'}
+                    disabled={disabled}
                 >
                     <View style={inputStyle}>
                         <Text
@@ -284,5 +287,8 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             color: theme.errorTextColor,
             fontSize: 14,
         },
+        disabled: {
+            opacity: 0.5,
+        },
     };
 });
diff --git a/app/components/message_attachments/action_button/action_button.js b/app/components/message_attachments/action_button/action_button.js
index a604f6995..760a101d8 100644
--- a/app/components/message_attachments/action_button/action_button.js
+++ b/app/components/message_attachments/action_button/action_button.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import Button from 'react-native-button';
 
 import {preventDoubleTap} from 'app/utils/tap';
-import {makeStyleSheetFromTheme} from 'app/utils/theme';
+import {makeStyleSheetFromTheme, changeOpacity} from 'app/utils/theme';
 import ActionButtonText from './action_button_text';
 
 export default class ActionButton extends PureComponent {
@@ -19,6 +19,7 @@ export default class ActionButton extends PureComponent {
         postId: PropTypes.string.isRequired,
         theme: PropTypes.object.isRequired,
         cookie: PropTypes.string.isRequired,
+        disabled: PropTypes.bool,
     };
 
     handleActionPress = preventDoubleTap(() => {
@@ -27,13 +28,15 @@ export default class ActionButton extends PureComponent {
     }, 4000);
 
     render() {
-        const {name, theme} = this.props;
+        const {name, theme, disabled} = this.props;
         const style = getStyleSheet(theme);
 
         return (
             <Button
                 containerStyle={style.button}
+                disabledContainerStyle={style.buttonDisabled}
                 onPress={this.handleActionPress}
+                disabled={disabled}
             >
                 <ActionButtonText
                     message={name}
@@ -49,6 +52,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
         button: {
             borderRadius: 2,
             backgroundColor: theme.buttonBg,
+            opacity: 1,
             alignItems: 'center',
             marginBottom: 2,
             marginRight: 5,
@@ -56,6 +60,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             paddingHorizontal: 10,
             paddingVertical: 7,
         },
+        buttonDisabled: {
+            backgroundColor: changeOpacity(theme.buttonBg, 0.3),
+        },
         text: {
             color: theme.buttonColor,
             fontSize: 12,
diff --git a/app/components/message_attachments/action_menu/action_menu.js b/app/components/message_attachments/action_menu/action_menu.js
index 3ea8d46fd..8157556d5 100644
--- a/app/components/message_attachments/action_menu/action_menu.js
+++ b/app/components/message_attachments/action_menu/action_menu.js
@@ -18,6 +18,7 @@ export default class ActionMenu extends PureComponent {
         options: PropTypes.arrayOf(PropTypes.object),
         postId: PropTypes.string.isRequired,
         selected: PropTypes.object,
+        disabled: PropTypes.bool,
     };
 
     constructor(props) {
@@ -62,6 +63,7 @@ export default class ActionMenu extends PureComponent {
             name,
             dataSource,
             options,
+            disabled,
         } = this.props;
         const {selected} = this.state;
 
@@ -72,6 +74,7 @@ export default class ActionMenu extends PureComponent {
                 options={options}
                 selected={selected}
                 onSelected={this.handleSelect}
+                disabled={disabled}
             />
         );
     }
diff --git a/app/components/message_attachments/action_menu/action_menu.test.js b/app/components/message_attachments/action_menu/action_menu.test.js
index 4037f7070..517f15f05 100644
--- a/app/components/message_attachments/action_menu/action_menu.test.js
+++ b/app/components/message_attachments/action_menu/action_menu.test.js
@@ -52,4 +52,14 @@ describe('ActionMenu', () => {
 
         expect(wrapper.state('selected')).toBe(props.selected);
     });
+
+    test('disabled works', () => {
+        const props = {
+            ...baseProps,
+            disabled: true,
+        };
+        const wrapper = shallow(<ActionMenu {...props}/>);
+
+        expect(wrapper.props().disabled).toBe(true);
+    });
 });
diff --git a/app/components/message_attachments/attachment_actions.js b/app/components/message_attachments/attachment_actions.js
index 9f4203fbd..c526aec85 100644
--- a/app/components/message_attachments/attachment_actions.js
+++ b/app/components/message_attachments/attachment_actions.js
@@ -41,6 +41,7 @@ export default class AttachmentActions extends PureComponent {
                         defaultOption={action.default_option}
                         options={action.options}
                         postId={postId}
+                        disabled={action.disabled}
                     />
                 );
                 break;
@@ -53,6 +54,7 @@ export default class AttachmentActions extends PureComponent {
                         cookie={action.cookie}
                         name={action.name}
                         postId={postId}
+                        disabled={action.disabled}
                     />
                 );
                 break;

From 6610a51a3d089e546f3e39d0b197ec4e0b584a8a Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 14 Nov 2019 22:21:17 -0500
Subject: [PATCH 03/16] Fix partially shown drawers when orientation change on
 iOS (#3555)

---
 app/components/safe_area_view/safe_area_view.ios.js |  2 +-
 app/components/sidebars/drawer_layout.js            | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/components/safe_area_view/safe_area_view.ios.js b/app/components/safe_area_view/safe_area_view.ios.js
index 32c39cf03..490efbd05 100644
--- a/app/components/safe_area_view/safe_area_view.ios.js
+++ b/app/components/safe_area_view/safe_area_view.ios.js
@@ -86,7 +86,7 @@ export default class SafeAreaIos extends PureComponent {
 
         if (DeviceTypes.IS_IPHONE_WITH_INSETS || mattermostManaged.hasSafeAreaInsets) {
             const window = dimensions?.window || Dimensions.get('window');
-            const orientation = window.width > window.length ? LANDSCAPE : PORTRAIT;
+            const orientation = window.width > window.height ? LANDSCAPE : PORTRAIT;
             const {safeAreaInsets} = await SafeArea.getSafeAreaInsetsForRootView();
             this.setSafeAreaInsets(safeAreaInsets, orientation);
         }
diff --git a/app/components/sidebars/drawer_layout.js b/app/components/sidebars/drawer_layout.js
index 16fe14a16..6e014c88b 100644
--- a/app/components/sidebars/drawer_layout.js
+++ b/app/components/sidebars/drawer_layout.js
@@ -11,6 +11,7 @@ import {
     Easing,
     Keyboard,
     PanResponder,
+    Platform,
     StyleSheet,
     TouchableWithoutFeedback,
     View,
@@ -119,6 +120,16 @@ export default class DrawerLayout extends Component {
 
     componentDidMount() {
         Dimensions.addEventListener('change', this.handleDimensionsChange);
+        if (Platform.OS === 'ios') {
+            // on iOS force closing the drawers to prevent them for partially showing
+            // when channging the device orientation, probably caused by RN61
+            Animated.timing(this.openValue, {
+                toValue: 0,
+                duration: 10,
+                easing: Easing.out(Easing.cubic),
+                useNativeDriver: this.props.useNativeAnimations,
+            }).start();
+        }
     }
 
     componentWillUnmount() {
@@ -263,7 +274,6 @@ export default class DrawerLayout extends Component {
         const {isTablet} = this.props;
         const panHandlers = isTablet ? emptyObject : this._panResponder.panHandlers;
         const containerStyles = [styles.container];
-
         if (isTablet) {
             containerStyles.push(styles.tabletContainer);
         }

From 7f031d9b55f56c00a3c923f36389d3722852bd1a Mon Sep 17 00:00:00 2001
From: CJ <38697367+imisshtml@users.noreply.github.com>
Date: Fri, 15 Nov 2019 04:25:25 -0500
Subject: [PATCH 04/16] MM-19696 Added font color for GlobalStyle Input (#3536)

Added the default color #3d3c40 for the GlobalStyle Input that the Server select and Login screen used for style.
---
 .../forgot_password/__snapshots__/forgot_password.test.js.snap  | 2 ++
 app/styles/index.js                                             | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap b/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap
index c75da12af..fe416e910 100644
--- a/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap
+++ b/app/screens/forgot_password/__snapshots__/forgot_password.test.js.snap
@@ -151,6 +151,7 @@ exports[`ForgotPassword should match snapshot 1`] = `
               "borderColor": "gainsboro",
               "borderRadius": 3,
               "borderWidth": 1,
+              "color": "#3d3c40",
               "fontSize": 16,
               "height": 45,
               "marginBottom": 5,
@@ -262,6 +263,7 @@ exports[`ForgotPassword snapshot for error on failure of email regex 1`] = `
               "borderColor": "gainsboro",
               "borderRadius": 3,
               "borderWidth": 1,
+              "color": "#3d3c40",
               "fontSize": 16,
               "height": 45,
               "marginBottom": 5,
diff --git a/app/styles/index.js b/app/styles/index.js
index d7d1744ac..eeec07217 100644
--- a/app/styles/index.js
+++ b/app/styles/index.js
@@ -110,5 +110,6 @@ export const GlobalStyles = StyleSheet.create({
         paddingLeft: 10,
         alignSelf: 'stretch',
         borderRadius: 3,
+        color: '#3d3c40',
     },
 });

From 82d4d88ea51c2fabdb79975ab87d6909d8f6af2d Mon Sep 17 00:00:00 2001
From: CJ <38697367+imisshtml@users.noreply.github.com>
Date: Fri, 15 Nov 2019 09:55:08 -0500
Subject: [PATCH 05/16] MM-19697 - Fixed CameraRoll for iOS (#3537)

* MM-19697 - Fixed CameraRoll for iOS

Switched CameraRoll over to the react-native-community version as it was removed from the core package with RN 0.61.2

* MM-19697 - Fix Jest issues

Updated for jest issues
---
 app/screens/image_preview/downloader.ios.js | 3 ++-
 ios/Podfile.lock                            | 6 ++++++
 package.json                                | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/screens/image_preview/downloader.ios.js b/app/screens/image_preview/downloader.ios.js
index 61b8d02b2..f443530f9 100644
--- a/app/screens/image_preview/downloader.ios.js
+++ b/app/screens/image_preview/downloader.ios.js
@@ -3,11 +3,12 @@
 
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {Alert, Animated, CameraRoll, InteractionManager, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
+import {Alert, Animated, InteractionManager, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
 import RNFetchBlob from 'rn-fetch-blob';
 import {CircularProgress} from 'react-native-circular-progress';
 import Icon from 'react-native-vector-icons/Ionicons';
 import {intlShape} from 'react-intl';
+import CameraRoll from '@react-native-community/cameraroll';
 
 import {Client4} from 'mattermost-redux/client';
 
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index ade0f4131..2cf1c1e62 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -191,6 +191,8 @@ PODS:
     - React-cxxreact (= 0.61.2)
     - React-jsi (= 0.61.2)
   - React-jsinspector (0.61.2)
+  - react-native-cameraroll (1.3.0):
+    - React
   - react-native-cookies (3.2.0):
     - React
   - react-native-document-picker (3.2.4):
@@ -301,6 +303,7 @@ DEPENDENCIES:
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
+  - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
   - react-native-cookies (from `../node_modules/react-native-cookies/ios`)
   - react-native-document-picker (from `../node_modules/react-native-document-picker`)
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
@@ -382,6 +385,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
+  react-native-cameraroll:
+    :path: "../node_modules/@react-native-community/cameraroll"
   react-native-cookies:
     :path: "../node_modules/react-native-cookies/ios"
   react-native-document-picker:
@@ -467,6 +472,7 @@ SPEC CHECKSUMS:
   React-jsi: 32285a21b1b24c36060493ed3057a34677d58d09
   React-jsiexecutor: 8909917ff7d8f21a57e443a866fd8d4560e50c65
   React-jsinspector: 111d7d342b07a904c400592e02a2b958f1098b60
+  react-native-cameraroll: ad20f5a93c25cb83a76455df57a2c62fbb63aaed
   react-native-cookies: 854d59c4135c70b92a02ca4930e68e4e2eb58150
   react-native-document-picker: c36bf5f067a581657ecaf7124dcd921a8be19061
   react-native-image-picker: fd93361c666f397bdf72f9c6c23f13d2685b9173
diff --git a/package.json b/package.json
index 3082d8aae..80ceefd89 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "@babel/runtime": "7.6.3",
     "@react-native-community/async-storage": "1.6.2",
+    "@react-native-community/cameraroll": "1.3.0",
     "@react-native-community/netinfo": "4.4.0",
     "@sentry/react-native": "1.0.9",
     "analytics-react-native": "1.2.0",
@@ -149,7 +150,7 @@
       "assets/images/video_player/(.*).png": "<rootDir>/dist/assets/images/video_player/$1@2x.png"
     },
     "transformIgnorePatterns": [
-      "node_modules/(?!react-native|jail-monkey|@sentry/react-native|react-navigation)"
+      "node_modules/(?!react-native|jail-monkey|@sentry/react-native|react-navigation|@react-native-community/cameraroll)"
     ]
   }
 }

From 66a6e5c93250cccc0296695f36a23cccebca5612 Mon Sep 17 00:00:00 2001
From: Amit Uttam <changingrainbows@gmail.com>
Date: Sat, 16 Nov 2019 00:41:09 -0300
Subject: [PATCH 06/16] [MM-10813] Design update for Post attachments (#3511)

* [MM-10813] Design update for Post attachments

Fixes https://github.com/mattermost/mattermost-server/issues/12841

* Updated visual treatment for Post attachments (images, documents, videos)
* Grouped image attachments, expanding to fit Post width dimension
* Itemized listing of non-image attachments
* Special handling of "small" image attachments (<48 point width/height)

* Set attachment post width to max width of portrait orientation

Accounts for post display offset and extra spacing used for rendering post replies.

* Use available Post real estate: flex: 1 instead of width 100%

* Image spacing responsibility: AttachmentList -> AttachmentImage

* Fit download progress circle correctly over new attachment icons

* Layers progress circle over the icon, rather than under.
* Uses offset constant as far as possible, rather than fixed point spaces.

* Refactor props and 'more' counting for image file attachment(s)

* Implement conditional gutter between image attachments

Flex's `justifyContent: space-between` won't work in this case because of the use of `absoluteFill` and `paddingBottom: 100%` in the box placeholder for an image attachment to auto-fill *all* available flex space.

* Additional snapshots for Post file attachment scenarios

* Use new 'text' icon for text files (.txt, .rtf)

Depends on https://github.com/mattermost/mattermost-redux/pull/979

Even without the change to mattermost-redux above, text files will default to pre-existing "code" icon.

* Set file attachment icon background to theme

Default to transparent. Override if explicitly specified.

* Treat animated GIFs as images when auto-adjusting attachment width

* Fix images layout, progressive image margins, and gallery for images and videos

* fix on iPad (splitview, permanent sidebar) card types and image sizes

* Add all files back to the gallery
---
 .../file_attachment.test.js.snap              |  113 +-
 .../file_attachment_list.test.js.snap         | 1442 ++++++++++++++++-
 .../file_attachment_list/file_attachment.js   |  186 ++-
 .../file_attachment_document.js               |   80 +-
 .../file_attachment_icon.js                   |   29 +-
 .../file_attachment_image.js                  |  138 +-
 .../file_attachment_list.js                   |  244 ++-
 .../file_attachment_list.test.js              |  146 +-
 .../file_upload_item/file_upload_item.js      |    9 +-
 .../__snapshots__/index.test.js.snap          |    8 +
 .../attachment_image/index.js                 |    7 +
 app/components/post_body/post_body.js         |    1 +
 .../progressive_image/progressive_image.js    |   55 +-
 app/constants/attachment.js                   |    2 +
 app/screens/image_preview/image_preview.js    |   12 +-
 assets/base/images/icons/audio.png            |  Bin 1691 -> 2282 bytes
 assets/base/images/icons/code.png             |  Bin 1382 -> 2685 bytes
 assets/base/images/icons/excel.png            |  Bin 472 -> 2175 bytes
 assets/base/images/icons/generic.png          |  Bin 2256 -> 2644 bytes
 assets/base/images/icons/image.png            |  Bin 1006 -> 2605 bytes
 assets/base/images/icons/patch.png            |  Bin 1504 -> 2668 bytes
 assets/base/images/icons/pdf.png              |  Bin 2289 -> 2482 bytes
 assets/base/images/icons/ppt.png              |  Bin 2015 -> 1570 bytes
 assets/base/images/icons/text.png             |  Bin 0 -> 943 bytes
 assets/base/images/icons/video.png            |  Bin 659 -> 1605 bytes
 assets/base/images/icons/word.png             |  Bin 615 -> 2441 bytes
 26 files changed, 2081 insertions(+), 391 deletions(-)
 mode change 100644 => 100755 assets/base/images/icons/excel.png
 mode change 100644 => 100755 assets/base/images/icons/patch.png
 mode change 100644 => 100755 assets/base/images/icons/ppt.png
 create mode 100644 assets/base/images/icons/text.png
 mode change 100644 => 100755 assets/base/images/icons/word.png

diff --git a/app/components/file_attachment_list/__snapshots__/file_attachment.test.js.snap b/app/components/file_attachment_list/__snapshots__/file_attachment.test.js.snap
index a26f8be29..afadadbab 100644
--- a/app/components/file_attachment_list/__snapshots__/file_attachment.test.js.snap
+++ b/app/components/file_attachment_list/__snapshots__/file_attachment.test.js.snap
@@ -5,77 +5,70 @@ exports[`FileAttachment should match snapshot 1`] = `
   style={
     Array [
       Object {
-        "borderColor": "rgba(61,60,64,0.2)",
-        "borderRadius": 2,
+        "borderColor": "rgba(61,60,64,0.4)",
+        "borderRadius": 5,
         "borderWidth": 1,
         "flex": 1,
         "flexDirection": "row",
-        "marginRight": 10,
         "marginTop": 10,
-        "width": 300,
       },
     ]
   }
 >
-  <TouchableWithFeedbackIOS
-    onPress={[Function]}
-    type="opacity"
-  >
-    <FileAttachmentIcon
-      backgroundColor="#fff"
-      file={
-        Object {
-          "mime_type": "image/png",
-        }
-      }
-      iconHeight={60}
-      iconWidth={60}
-      onCaptureRef={[Function]}
-      theme={
-        Object {
-          "awayIndicator": "#ffbc42",
-          "buttonBg": "#166de0",
-          "buttonColor": "#ffffff",
-          "centerChannelBg": "#ffffff",
-          "centerChannelColor": "#3d3c40",
-          "codeTheme": "github",
-          "dndIndicator": "#f74343",
-          "errorTextColor": "#fd5960",
-          "linkColor": "#2389d7",
-          "mentionBg": "#ffffff",
-          "mentionBj": "#ffffff",
-          "mentionColor": "#145dbf",
-          "mentionHighlightBg": "#ffe577",
-          "mentionHighlightLink": "#166de0",
-          "newMessageSeparator": "#ff8800",
-          "onlineIndicator": "#06d6a0",
-          "sidebarBg": "#145dbf",
-          "sidebarHeaderBg": "#1153ab",
-          "sidebarHeaderTextColor": "#ffffff",
-          "sidebarText": "#ffffff",
-          "sidebarTextActiveBorder": "#579eff",
-          "sidebarTextActiveColor": "#ffffff",
-          "sidebarTextHoverBg": "#4578bf",
-          "sidebarUnreadText": "#ffffff",
-          "type": "Mattermost",
-        }
-      }
-      wrapperHeight={80}
-      wrapperWidth={80}
-    />
-  </TouchableWithFeedbackIOS>
-  <TouchableWithFeedbackIOS
-    onPress={[Function]}
+  <View
     style={
       Object {
-        "borderLeftColor": "rgba(61,60,64,0.2)",
-        "borderLeftWidth": 1,
-        "flex": 1,
-        "paddingHorizontal": 8,
-        "paddingVertical": 5,
+        "marginHorizontal": 20,
+        "marginVertical": 10,
       }
     }
-    type="opacity"
-  />
+  >
+    <TouchableWithFeedbackIOS
+      onPress={[Function]}
+      type="opacity"
+    >
+      <FileAttachmentIcon
+        file={
+          Object {
+            "mime_type": "image/png",
+          }
+        }
+        iconHeight={48}
+        iconWidth={36}
+        onCaptureRef={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperHeight={48}
+        wrapperWidth={36}
+      />
+    </TouchableWithFeedbackIOS>
+  </View>
 </View>
 `;
diff --git a/app/components/file_attachment_list/__snapshots__/file_attachment_list.test.js.snap b/app/components/file_attachment_list/__snapshots__/file_attachment_list.test.js.snap
index f1387431d..92df63048 100644
--- a/app/components/file_attachment_list/__snapshots__/file_attachment_list.test.js.snap
+++ b/app/components/file_attachment_list/__snapshots__/file_attachment_list.test.js.snap
@@ -1,71 +1,1395 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PostAttachmentOpenGraph should match snapshot with a single image file 1`] = `
-<ScrollViewMock
-  horizontal={true}
-  keyboardShouldPersistTaps="always"
-  scrollEnabled={false}
+exports[`FileAttachmentList should match snapshot with a single image file 1`] = `
+<View
   style={
     Array [
       undefined,
     ]
   }
 >
-  <FileAttachment
-    canDownloadFiles={true}
-    file={
-      Object {
-        "caption": "image.png",
-        "data": Object {
-          "create_at": 1546893090093,
-          "delete_at": 0,
-          "extension": "png",
-          "has_preview_image": true,
-          "height": 171,
-          "id": "fileId",
-          "mime_type": "image/png",
-          "name": "image.png",
-          "post_id": "postId",
-          "size": 14894,
-          "update_at": 1546893090093,
-          "user_id": "userId",
-          "width": 425,
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+          "marginTop": 5,
         },
-      }
+        Object {
+          "width": undefined,
+        },
+      ]
     }
-    id="fileId"
-    index={0}
-    onCaptureRef={[Function]}
-    onPreviewPress={[Function]}
-    theme={
-      Object {
-        "awayIndicator": "#ffbc42",
-        "buttonBg": "#166de0",
-        "buttonColor": "#ffffff",
-        "centerChannelBg": "#ffffff",
-        "centerChannelColor": "#3d3c40",
-        "codeTheme": "github",
-        "dndIndicator": "#f74343",
-        "errorTextColor": "#fd5960",
-        "linkColor": "#2389d7",
-        "mentionBg": "#ffffff",
-        "mentionBj": "#ffffff",
-        "mentionColor": "#145dbf",
-        "mentionHighlightBg": "#ffe577",
-        "mentionHighlightLink": "#166de0",
-        "newMessageSeparator": "#ff8800",
-        "onlineIndicator": "#06d6a0",
-        "sidebarBg": "#145dbf",
-        "sidebarHeaderBg": "#1153ab",
-        "sidebarHeaderTextColor": "#ffffff",
-        "sidebarText": "#ffffff",
-        "sidebarTextActiveBorder": "#579eff",
-        "sidebarTextActiveColor": "#ffffff",
-        "sidebarTextHoverBg": "#4578bf",
-        "sidebarUnreadText": "#ffffff",
-        "type": "Mattermost",
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+        }
       }
-    }
-  />
-</ScrollViewMock>
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image01.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 171,
+              "id": "fileId",
+              "mime_type": "image/png",
+              "name": "image01.png",
+              "post_id": "postId",
+              "size": 14894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 425,
+            },
+          }
+        }
+        id="fileId"
+        index={0}
+        isSingleImage={true}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+  </View>
+</View>
+`;
+
+exports[`FileAttachmentList should match snapshot with combination of image and non-image attachments 1`] = `
+<View
+  style={
+    Array [
+      undefined,
+    ]
+  }
+>
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+          "marginTop": 5,
+        },
+        Object {
+          "width": undefined,
+        },
+      ]
+    }
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+        }
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image01.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 171,
+              "id": "fileId",
+              "mime_type": "image/png",
+              "name": "image01.png",
+              "post_id": "postId",
+              "size": 14894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 425,
+            },
+          }
+        }
+        id="fileId"
+        index={0}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image02.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "otherFileId",
+              "mime_type": "image/png",
+              "name": "image02.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="otherFileId"
+        index={1}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+  </View>
+  <View
+    style={
+      Object {
+        "flex": 1,
+      }
+    }
+  >
+    <FileAttachment
+      canDownloadFiles={true}
+      file={
+        Object {
+          "caption": "file01.other",
+          "data": Object {
+            "extension": "other",
+            "id": "fileId",
+            "mime_type": "other/type",
+            "name": "file01.other",
+            "post_id": "postId",
+            "size": 14894,
+            "user_id": "userId",
+          },
+        }
+      }
+      id="fileId"
+      index={0}
+      isSingleImage={false}
+      onCaptureRef={[Function]}
+      onPreviewPress={[Function]}
+      theme={
+        Object {
+          "awayIndicator": "#ffbc42",
+          "buttonBg": "#166de0",
+          "buttonColor": "#ffffff",
+          "centerChannelBg": "#ffffff",
+          "centerChannelColor": "#3d3c40",
+          "codeTheme": "github",
+          "dndIndicator": "#f74343",
+          "errorTextColor": "#fd5960",
+          "linkColor": "#2389d7",
+          "mentionBg": "#ffffff",
+          "mentionBj": "#ffffff",
+          "mentionColor": "#145dbf",
+          "mentionHighlightBg": "#ffe577",
+          "mentionHighlightLink": "#166de0",
+          "newMessageSeparator": "#ff8800",
+          "onlineIndicator": "#06d6a0",
+          "sidebarBg": "#145dbf",
+          "sidebarHeaderBg": "#1153ab",
+          "sidebarHeaderTextColor": "#ffffff",
+          "sidebarText": "#ffffff",
+          "sidebarTextActiveBorder": "#579eff",
+          "sidebarTextActiveColor": "#ffffff",
+          "sidebarTextHoverBg": "#4578bf",
+          "sidebarUnreadText": "#ffffff",
+          "type": "Mattermost",
+        }
+      }
+      wrapperWidth={680}
+    />
+  </View>
+</View>
+`;
+
+exports[`FileAttachmentList should match snapshot with four image files 1`] = `
+<View
+  style={
+    Array [
+      undefined,
+    ]
+  }
+>
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+          "marginTop": 5,
+        },
+        Object {
+          "width": undefined,
+        },
+      ]
+    }
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+        }
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image01.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 171,
+              "id": "fileId",
+              "mime_type": "image/png",
+              "name": "image01.png",
+              "post_id": "postId",
+              "size": 14894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 425,
+            },
+          }
+        }
+        id="fileId"
+        index={0}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image02.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "otherFileId",
+              "mime_type": "image/png",
+              "name": "image02.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="otherFileId"
+        index={1}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image03.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "thirdFileId",
+              "mime_type": "image/png",
+              "name": "image03.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="thirdFileId"
+        index={2}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image04.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "fourthFileId",
+              "mime_type": "image/png",
+              "name": "image04.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="fourthFileId"
+        index={3}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+  </View>
+</View>
+`;
+
+exports[`FileAttachmentList should match snapshot with more than four image files 1`] = `
+<View
+  style={
+    Array [
+      undefined,
+    ]
+  }
+>
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+          "marginTop": 5,
+        },
+        Object {
+          "width": undefined,
+        },
+      ]
+    }
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+        }
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image01.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 171,
+              "id": "fileId",
+              "mime_type": "image/png",
+              "name": "image01.png",
+              "post_id": "postId",
+              "size": 14894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 425,
+            },
+          }
+        }
+        id="fileId"
+        index={0}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image02.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "otherFileId",
+              "mime_type": "image/png",
+              "name": "image02.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="otherFileId"
+        index={1}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image03.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "thirdFileId",
+              "mime_type": "image/png",
+              "name": "image03.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="thirdFileId"
+        index={2}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image04.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "fourthFileId",
+              "mime_type": "image/png",
+              "name": "image04.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="fourthFileId"
+        index={3}
+        isSingleImage={false}
+        nonVisibleImagesCount={2}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+  </View>
+</View>
+`;
+
+exports[`FileAttachmentList should match snapshot with non-image attachment 1`] = `
+<View
+  style={
+    Array [
+      undefined,
+    ]
+  }
+>
+  <View
+    style={
+      Object {
+        "flex": 1,
+      }
+    }
+  >
+    <FileAttachment
+      canDownloadFiles={true}
+      file={
+        Object {
+          "caption": "file01.other",
+          "data": Object {
+            "extension": "other",
+            "id": "fileId",
+            "mime_type": "other/type",
+            "name": "file01.other",
+            "post_id": "postId",
+            "size": 14894,
+            "user_id": "userId",
+          },
+        }
+      }
+      id="fileId"
+      index={0}
+      isSingleImage={false}
+      onCaptureRef={[Function]}
+      onPreviewPress={[Function]}
+      theme={
+        Object {
+          "awayIndicator": "#ffbc42",
+          "buttonBg": "#166de0",
+          "buttonColor": "#ffffff",
+          "centerChannelBg": "#ffffff",
+          "centerChannelColor": "#3d3c40",
+          "codeTheme": "github",
+          "dndIndicator": "#f74343",
+          "errorTextColor": "#fd5960",
+          "linkColor": "#2389d7",
+          "mentionBg": "#ffffff",
+          "mentionBj": "#ffffff",
+          "mentionColor": "#145dbf",
+          "mentionHighlightBg": "#ffe577",
+          "mentionHighlightLink": "#166de0",
+          "newMessageSeparator": "#ff8800",
+          "onlineIndicator": "#06d6a0",
+          "sidebarBg": "#145dbf",
+          "sidebarHeaderBg": "#1153ab",
+          "sidebarHeaderTextColor": "#ffffff",
+          "sidebarText": "#ffffff",
+          "sidebarTextActiveBorder": "#579eff",
+          "sidebarTextActiveColor": "#ffffff",
+          "sidebarTextHoverBg": "#4578bf",
+          "sidebarUnreadText": "#ffffff",
+          "type": "Mattermost",
+        }
+      }
+      wrapperWidth={680}
+    />
+  </View>
+</View>
+`;
+
+exports[`FileAttachmentList should match snapshot with three image files 1`] = `
+<View
+  style={
+    Array [
+      undefined,
+    ]
+  }
+>
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+          "marginTop": 5,
+        },
+        Object {
+          "width": undefined,
+        },
+      ]
+    }
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+        }
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image01.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 171,
+              "id": "fileId",
+              "mime_type": "image/png",
+              "name": "image01.png",
+              "post_id": "postId",
+              "size": 14894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 425,
+            },
+          }
+        }
+        id="fileId"
+        index={0}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image02.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "otherFileId",
+              "mime_type": "image/png",
+              "name": "image02.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="otherFileId"
+        index={1}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image03.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "thirdFileId",
+              "mime_type": "image/png",
+              "name": "image03.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="thirdFileId"
+        index={2}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+  </View>
+</View>
+`;
+
+exports[`FileAttachmentList should match snapshot with two image files 1`] = `
+<View
+  style={
+    Array [
+      undefined,
+    ]
+  }
+>
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+          "marginTop": 5,
+        },
+        Object {
+          "width": undefined,
+        },
+      ]
+    }
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+        }
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image01.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 171,
+              "id": "fileId",
+              "mime_type": "image/png",
+              "name": "image01.png",
+              "post_id": "postId",
+              "size": 14894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 425,
+            },
+          }
+        }
+        id="fileId"
+        index={0}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flex": 1,
+          },
+          Object {
+            "marginLeft": 8,
+          },
+        ]
+      }
+    >
+      <FileAttachment
+        canDownloadFiles={true}
+        file={
+          Object {
+            "caption": "image02.png",
+            "data": Object {
+              "create_at": 1546893090093,
+              "delete_at": 0,
+              "extension": "png",
+              "has_preview_image": true,
+              "height": 800,
+              "id": "otherFileId",
+              "mime_type": "image/png",
+              "name": "image02.png",
+              "post_id": "postId",
+              "size": 24894,
+              "update_at": 1546893090093,
+              "user_id": "userId",
+              "width": 555,
+            },
+          }
+        }
+        id="otherFileId"
+        index={1}
+        isSingleImage={false}
+        onCaptureRef={[Function]}
+        onPreviewPress={[Function]}
+        theme={
+          Object {
+            "awayIndicator": "#ffbc42",
+            "buttonBg": "#166de0",
+            "buttonColor": "#ffffff",
+            "centerChannelBg": "#ffffff",
+            "centerChannelColor": "#3d3c40",
+            "codeTheme": "github",
+            "dndIndicator": "#f74343",
+            "errorTextColor": "#fd5960",
+            "linkColor": "#2389d7",
+            "mentionBg": "#ffffff",
+            "mentionBj": "#ffffff",
+            "mentionColor": "#145dbf",
+            "mentionHighlightBg": "#ffe577",
+            "mentionHighlightLink": "#166de0",
+            "newMessageSeparator": "#ff8800",
+            "onlineIndicator": "#06d6a0",
+            "sidebarBg": "#145dbf",
+            "sidebarHeaderBg": "#1153ab",
+            "sidebarHeaderTextColor": "#ffffff",
+            "sidebarText": "#ffffff",
+            "sidebarTextActiveBorder": "#579eff",
+            "sidebarTextActiveColor": "#ffffff",
+            "sidebarTextHoverBg": "#4578bf",
+            "sidebarUnreadText": "#ffffff",
+            "type": "Mattermost",
+          }
+        }
+        wrapperWidth={680}
+      />
+    </View>
+  </View>
+</View>
 `;
diff --git a/app/components/file_attachment_list/file_attachment.js b/app/components/file_attachment_list/file_attachment.js
index e7d0b8009..7a50c637d 100644
--- a/app/components/file_attachment_list/file_attachment.js
+++ b/app/components/file_attachment_list/file_attachment.js
@@ -4,14 +4,18 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {
+    Dimensions,
+    PixelRatio,
     Text,
     View,
+    StyleSheet,
 } from 'react-native';
 
 import * as Utils from 'mattermost-redux/utils/file_utils.js';
 
 import TouchableWithFeedback from 'app/components/touchable_with_feedback';
 import {isDocument, isGif} from 'app/utils/file';
+import {calculateDimensions} from 'app/utils/images';
 import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
 
 import FileAttachmentDocument from './file_attachment_document';
@@ -28,10 +32,14 @@ export default class FileAttachment extends PureComponent {
         onLongPress: PropTypes.func,
         onPreviewPress: PropTypes.func,
         theme: PropTypes.object.isRequired,
+        wrapperWidth: PropTypes.number,
+        isSingleImage: PropTypes.bool,
+        nonVisibleImagesCount: PropTypes.number,
     };
 
     static defaultProps = {
         onPreviewPress: () => true,
+        wrapperWidth: 300,
     };
 
     handleCaptureRef = (ref) => {
@@ -51,7 +59,7 @@ export default class FileAttachment extends PureComponent {
     };
 
     renderFileInfo() {
-        const {file, theme} = this.props;
+        const {file, onLongPress, theme} = this.props;
         const {data} = file;
         const style = getStyleSheet(theme);
 
@@ -60,24 +68,31 @@ export default class FileAttachment extends PureComponent {
         }
 
         return (
-            <View style={style.attachmentContainer}>
-                <Text
-                    numberOfLines={2}
-                    ellipsizeMode='tail'
-                    style={style.fileName}
-                >
-                    {file.caption.trim()}
-                </Text>
-                <View style={style.fileDownloadContainer}>
+            <TouchableWithFeedback
+                onPress={this.handlePreviewPress}
+                onLongPress={onLongPress}
+                type={'opacity'}
+                style={style.attachmentContainer}
+            >
+                <React.Fragment>
                     <Text
-                        numberOfLines={2}
+                        numberOfLines={1}
                         ellipsizeMode='tail'
-                        style={style.fileInfo}
+                        style={style.fileName}
                     >
-                        {`${data.extension.toUpperCase()} ${Utils.getFormattedFileSize(data)}`}
+                        {file.caption.trim()}
                     </Text>
-                </View>
-            </View>
+                    <View style={style.fileDownloadContainer}>
+                        <Text
+                            numberOfLines={1}
+                            ellipsizeMode='tail'
+                            style={style.fileInfo}
+                        >
+                            {`${Utils.getFormattedFileSize(data)}`}
+                        </Text>
+                    </View>
+                </React.Fragment>
+            </TouchableWithFeedback>
         );
     }
 
@@ -85,75 +100,118 @@ export default class FileAttachment extends PureComponent {
         this.documentElement = ref;
     };
 
+    renderMoreImagesOverlay = (value) => {
+        if (!value) {
+            return null;
+        }
+
+        const {theme} = this.props;
+        const style = getStyleSheet(theme);
+
+        return (
+            <View style={style.moreImagesWrapper}>
+                <Text style={style.moreImagesText}>
+                    {`+${value}`}
+                </Text>
+            </View>
+        );
+    };
+
+    getImageDimensions = (file) => {
+        const {isSingleImage, wrapperWidth} = this.props;
+        const viewPortHeight = this.getViewPortHeight();
+
+        if (isSingleImage) {
+            return calculateDimensions(file?.height, file?.width, wrapperWidth, viewPortHeight);
+        }
+
+        return null;
+    };
+
+    getViewPortHeight = () => {
+        const dimensions = Dimensions.get('window');
+        const viewPortHeight = Math.max(dimensions.height, dimensions.width) * 0.45;
+
+        return viewPortHeight;
+    };
+
     render() {
         const {
             canDownloadFiles,
             file,
             theme,
             onLongPress,
+            isSingleImage,
+            nonVisibleImagesCount,
         } = this.props;
         const {data} = file;
         const style = getStyleSheet(theme);
 
         let fileAttachmentComponent;
         if ((data && data.has_preview_image) || file.loading || isGif(data)) {
+            const imageDimensions = this.getImageDimensions(data);
+
             fileAttachmentComponent = (
                 <TouchableWithFeedback
                     key={`${this.props.id}${file.loading}`}
                     onPress={this.handlePreviewPress}
                     onLongPress={onLongPress}
                     type={'opacity'}
+                    style={{width: imageDimensions?.width}}
                 >
                     <FileAttachmentImage
                         file={data || {}}
                         onCaptureRef={this.handleCaptureRef}
                         theme={theme}
+                        isSingleImage={isSingleImage}
+                        imageDimensions={imageDimensions}
                     />
+                    {this.renderMoreImagesOverlay(nonVisibleImagesCount, theme)}
                 </TouchableWithFeedback>
             );
         } else if (isDocument(data)) {
             fileAttachmentComponent = (
-                <FileAttachmentDocument
-                    ref={this.setDocumentRef}
-                    canDownloadFiles={canDownloadFiles}
-                    file={file}
-                    onLongPress={onLongPress}
-                    theme={theme}
-                />
+                <View style={[style.fileWrapper]}>
+                    <View style={style.iconWrapper}>
+                        <FileAttachmentDocument
+                            ref={this.setDocumentRef}
+                            canDownloadFiles={canDownloadFiles}
+                            file={file}
+                            onLongPress={onLongPress}
+                            theme={theme}
+                        />
+                    </View>
+                    {this.renderFileInfo()}
+                </View>
             );
         } else {
             fileAttachmentComponent = (
-                <TouchableWithFeedback
-                    onPress={this.handlePreviewPress}
-                    onLongPress={onLongPress}
-                    type={'opacity'}
-                >
-                    <FileAttachmentIcon
-                        file={data}
-                        onCaptureRef={this.handleCaptureRef}
-                        theme={theme}
-                    />
-                </TouchableWithFeedback>
+                <View style={[style.fileWrapper]}>
+                    <View style={style.iconWrapper}>
+                        <TouchableWithFeedback
+                            onPress={this.handlePreviewPress}
+                            onLongPress={onLongPress}
+                            type={'opacity'}
+                        >
+                            <FileAttachmentIcon
+                                file={data}
+                                onCaptureRef={this.handleCaptureRef}
+                                theme={theme}
+                            />
+                        </TouchableWithFeedback>
+                    </View>
+                    {this.renderFileInfo()}
+                </View>
             );
         }
 
-        return (
-            <View style={[style.fileWrapper]}>
-                {fileAttachmentComponent}
-                <TouchableWithFeedback
-                    style={style.fileInfoContainer}
-                    onLongPress={onLongPress}
-                    onPress={this.handlePreviewPress}
-                    type={'opacity'}
-                >
-                    {this.renderFileInfo()}
-                </TouchableWithFeedback>
-            </View>
-        );
+        return fileAttachmentComponent;
     }
 }
 
 const getStyleSheet = makeStyleSheetFromTheme((theme) => {
+    const scale = Dimensions.get('window').width / 320;
+
     return {
         attachmentContainer: {
             flex: 1,
@@ -168,33 +226,28 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             marginTop: 3,
         },
         fileInfo: {
-            marginLeft: 2,
             fontSize: 14,
-            color: changeOpacity(theme.centerChannelColor, 0.5),
-        },
-        fileInfoContainer: {
-            flex: 1,
-            paddingHorizontal: 8,
-            paddingVertical: 5,
-            borderLeftWidth: 1,
-            borderLeftColor: changeOpacity(theme.centerChannelColor, 0.2),
+            color: theme.centerChannelColor,
         },
         fileName: {
             flexDirection: 'column',
             flexWrap: 'wrap',
-            marginLeft: 2,
             fontSize: 14,
+            fontWeight: '600',
             color: theme.centerChannelColor,
+            paddingRight: 10,
         },
         fileWrapper: {
             flex: 1,
             flexDirection: 'row',
             marginTop: 10,
-            marginRight: 10,
             borderWidth: 1,
-            borderColor: changeOpacity(theme.centerChannelColor, 0.2),
-            borderRadius: 2,
-            width: 300,
+            borderColor: changeOpacity(theme.centerChannelColor, 0.4),
+            borderRadius: 5,
+        },
+        iconWrapper: {
+            marginHorizontal: 20,
+            marginVertical: 10,
         },
         circularProgress: {
             width: '100%',
@@ -211,5 +264,18 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             alignItems: 'center',
             justifyContent: 'center',
         },
+        moreImagesWrapper: {
+            ...StyleSheet.absoluteFill,
+            justifyContent: 'center',
+            alignItems: 'center',
+            backgroundColor: 'rgba(0, 0, 0, 0.6)',
+            borderRadius: 5,
+        },
+        moreImagesText: {
+            color: theme.sidebarHeaderTextColor,
+            fontSize: Math.round(PixelRatio.roundToNearestPixel(24 * scale)),
+            fontFamily: 'Open Sans',
+            textAlign: 'center',
+        },
     };
 });
diff --git a/app/components/file_attachment_list/file_attachment_document/file_attachment_document.js b/app/components/file_attachment_list/file_attachment_document/file_attachment_document.js
index 896c6d894..8fc6419c2 100644
--- a/app/components/file_attachment_list/file_attachment_document/file_attachment_document.js
+++ b/app/components/file_attachment_list/file_attachment_document/file_attachment_document.js
@@ -10,6 +10,7 @@ import {
     Platform,
     StatusBar,
     StyleSheet,
+    Text,
     View,
 } from 'react-native';
 import OpenFile from 'react-native-doc-viewer';
@@ -27,8 +28,9 @@ import mattermostBucket from 'app/mattermost_bucket';
 import {changeOpacity} from 'app/utils/theme';
 import {goToScreen} from 'app/actions/navigation';
 
+import {ATTACHMENT_ICON_HEIGHT, ATTACHMENT_ICON_WIDTH} from 'app/constants/attachment';
+
 const {DOCUMENTS_PATH} = DeviceTypes;
-const DOWNLOADING_OFFSET = 28;
 const TEXT_PREVIEW_FORMATS = [
     'application/json',
     'application/x-x509-ca-cert',
@@ -50,10 +52,10 @@ export default class FileAttachmentDocument extends PureComponent {
     };
 
     static defaultProps = {
-        iconHeight: 47,
-        iconWidth: 47,
-        wrapperHeight: 80,
-        wrapperWidth: 80,
+        iconHeight: ATTACHMENT_ICON_HEIGHT,
+        iconWidth: ATTACHMENT_ICON_WIDTH,
+        wrapperHeight: ATTACHMENT_ICON_HEIGHT,
+        wrapperWidth: ATTACHMENT_ICON_WIDTH,
     };
 
     static contextTypes = {
@@ -284,16 +286,6 @@ export default class FileAttachmentDocument extends PureComponent {
         }
     };
 
-    renderProgress = () => {
-        const {wrapperWidth} = this.props;
-
-        return (
-            <View style={[style.circularProgressContent, {width: wrapperWidth}]}>
-                {this.renderFileAttachmentIcon()}
-            </View>
-        );
-    };
-
     showDownloadDisabledAlert = () => {
         const {intl} = this.context;
 
@@ -338,14 +330,6 @@ export default class FileAttachmentDocument extends PureComponent {
 
     renderFileAttachmentIcon = () => {
         const {backgroundColor, iconHeight, iconWidth, file, theme, wrapperHeight, wrapperWidth} = this.props;
-        const {downloading} = this.state;
-        let height = wrapperHeight;
-        let width = wrapperWidth;
-
-        if (downloading) {
-            height -= DOWNLOADING_OFFSET;
-            width -= DOWNLOADING_OFFSET;
-        }
 
         return (
             <FileAttachmentIcon
@@ -354,29 +338,39 @@ export default class FileAttachmentDocument extends PureComponent {
                 theme={theme}
                 iconHeight={iconHeight}
                 iconWidth={iconWidth}
-                wrapperHeight={height}
-                wrapperWidth={width}
+                wrapperHeight={wrapperHeight}
+                wrapperWidth={wrapperWidth}
             />
         );
     }
 
-    render() {
-        const {onLongPress, theme, wrapperHeight} = this.props;
-        const {downloading, progress} = this.state;
+    renderDownloadProgres = () => {
+        const {theme} = this.props;
+        return (
+            <Text style={{fontSize: 10, color: theme.centerChannelColor, fontWeight: '600'}}>
+                {`${this.state.progress}%`}
+            </Text>
+        );
+    };
 
+    render() {
+        const {onLongPress, theme} = this.props;
+        const {downloading, progress} = this.state;
         let fileAttachmentComponent;
         if (downloading) {
             fileAttachmentComponent = (
-                <CircularProgress
-                    size={wrapperHeight}
-                    fill={progress}
-                    width={circularProgressWidth}
-                    backgroundColor={changeOpacity(theme.centerChannelColor, 0.5)}
-                    tintColor={theme.linkColor}
-                    rotation={0}
-                >
-                    {this.renderProgress}
-                </CircularProgress>
+                <View style={[style.circularProgressContent]}>
+                    <CircularProgress
+                        size={40}
+                        fill={progress}
+                        width={circularProgressWidth}
+                        backgroundColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                        tintColor={theme.linkColor}
+                        rotation={0}
+                    >
+                        {this.renderDownloadProgres}
+                    </CircularProgress>
+                </View>
             );
         } else {
             fileAttachmentComponent = this.renderFileAttachmentIcon();
@@ -396,11 +390,9 @@ export default class FileAttachmentDocument extends PureComponent {
 
 const style = StyleSheet.create({
     circularProgressContent: {
-        alignItems: 'center',
-        height: '100%',
-        justifyContent: 'center',
-        left: -circularProgressWidth,
-        position: 'absolute',
-        top: 0,
+        left: -(circularProgressWidth - 2),
+        top: 4,
+        width: 36,
+        height: 48,
     },
 });
diff --git a/app/components/file_attachment_list/file_attachment_icon.js b/app/components/file_attachment_list/file_attachment_icon.js
index 0c84b0282..08f6ba039 100644
--- a/app/components/file_attachment_list/file_attachment_icon.js
+++ b/app/components/file_attachment_list/file_attachment_icon.js
@@ -19,9 +19,13 @@ import imageIcon from 'assets/images/icons/image.png';
 import patchIcon from 'assets/images/icons/patch.png';
 import pdfIcon from 'assets/images/icons/pdf.png';
 import pptIcon from 'assets/images/icons/ppt.png';
+import textIcon from 'assets/images/icons/text.png';
 import videoIcon from 'assets/images/icons/video.png';
 import wordIcon from 'assets/images/icons/word.png';
 
+import {ATTACHMENT_ICON_HEIGHT, ATTACHMENT_ICON_WIDTH} from 'app/constants/attachment';
+import {changeOpacity} from 'app/utils/theme';
+
 const ICON_PATH_FROM_FILE_TYPE = {
     audio: audioIcon,
     code: codeIcon,
@@ -31,6 +35,7 @@ const ICON_PATH_FROM_FILE_TYPE = {
     pdf: pdfIcon,
     presentation: pptIcon,
     spreadsheet: excelIcon,
+    text: textIcon,
     video: videoIcon,
     word: wordIcon,
 };
@@ -44,14 +49,14 @@ export default class FileAttachmentIcon extends PureComponent {
         onCaptureRef: PropTypes.func,
         wrapperHeight: PropTypes.number,
         wrapperWidth: PropTypes.number,
+        theme: PropTypes.object,
     };
 
     static defaultProps = {
-        backgroundColor: '#fff',
-        iconHeight: 60,
-        iconWidth: 60,
-        wrapperHeight: 80,
-        wrapperWidth: 80,
+        iconHeight: ATTACHMENT_ICON_HEIGHT,
+        iconWidth: ATTACHMENT_ICON_WIDTH,
+        wrapperHeight: ATTACHMENT_ICON_HEIGHT,
+        wrapperWidth: ATTACHMENT_ICON_WIDTH,
     };
 
     getFileIconPath(file) {
@@ -68,16 +73,17 @@ export default class FileAttachmentIcon extends PureComponent {
     };
 
     render() {
-        const {backgroundColor, file, iconHeight, iconWidth, wrapperHeight, wrapperWidth} = this.props;
+        const {backgroundColor, file, iconHeight, iconWidth, wrapperHeight, wrapperWidth, theme} = this.props;
         const source = this.getFileIconPath(file);
+        const bgColor = backgroundColor || theme.centerChannelBg || 'transparent';
 
         return (
             <View
                 ref={this.handleCaptureRef}
-                style={[styles.fileIconWrapper, {backgroundColor, height: wrapperHeight, width: wrapperWidth}]}
+                style={[styles.fileIconWrapper, {backgroundColor: bgColor, height: wrapperHeight, width: wrapperWidth}]}
             >
                 <Image
-                    style={[styles.icon, {height: iconHeight, width: iconWidth}]}
+                    style={{maxHeight: iconHeight, maxWidth: iconWidth, tintColor: changeOpacity(theme.centerChannelColor, 20)}}
                     source={source}
                 />
             </View>
@@ -89,12 +95,5 @@ const styles = StyleSheet.create({
     fileIconWrapper: {
         alignItems: 'center',
         justifyContent: 'center',
-        borderTopLeftRadius: 2,
-        borderBottomLeftRadius: 2,
-    },
-    icon: {
-        borderTopLeftRadius: 2,
-        borderBottomLeftRadius: 2,
-        backgroundColor: '#fff',
     },
 });
diff --git a/app/components/file_attachment_list/file_attachment_image.js b/app/components/file_attachment_list/file_attachment_image.js
index e087447da..b37afe6fa 100644
--- a/app/components/file_attachment_list/file_attachment_image.js
+++ b/app/components/file_attachment_list/file_attachment_image.js
@@ -15,9 +15,13 @@ import ProgressiveImage from 'app/components/progressive_image';
 import {isGif} from 'app/utils/file';
 import {emptyFunction} from 'app/utils/general';
 import ImageCacheManager from 'app/utils/image_cache_manager';
+import {changeOpacity} from 'app/utils/theme';
 
 import thumb from 'assets/images/thumb.png';
 
+const SMALL_IMAGE_MAX_HEIGHT = 48;
+const SMALL_IMAGE_MAX_WIDTH = 48;
+
 const IMAGE_SIZE = {
     Fullsize: 'fullsize',
     Preview: 'preview',
@@ -35,22 +39,18 @@ export default class FileAttachmentImage extends PureComponent {
         ]),
         imageWidth: PropTypes.number,
         onCaptureRef: PropTypes.func,
+        theme: PropTypes.object,
         resizeMode: PropTypes.string,
         resizeMethod: PropTypes.string,
         wrapperHeight: PropTypes.number,
         wrapperWidth: PropTypes.number,
+        isSingleImage: PropTypes.bool,
+        imageDimensions: PropTypes.object,
     };
 
     static defaultProps = {
-        fadeInOnLoad: false,
-        imageHeight: 80,
-        imageSize: IMAGE_SIZE.Preview,
-        imageWidth: 80,
-        loading: false,
         resizeMode: 'cover',
         resizeMethod: 'resize',
-        wrapperHeight: 80,
-        wrapperWidth: 80,
     };
 
     constructor(props) {
@@ -72,15 +72,11 @@ export default class FileAttachmentImage extends PureComponent {
         };
     }
 
-    calculateNeededWidth = (height, width, newHeight) => {
-        const ratio = width / height;
-
-        let newWidth = newHeight * ratio;
-        if (newWidth < newHeight) {
-            newWidth = newHeight;
+    boxPlaceholder = () => {
+        if (this.props.isSingleImage) {
+            return null;
         }
-
-        return newWidth;
+        return (<View style={style.boxPlaceholder}/>);
     };
 
     handleCaptureRef = (ref) => {
@@ -91,27 +87,7 @@ export default class FileAttachmentImage extends PureComponent {
         }
     };
 
-    render() {
-        const {
-            file,
-            imageHeight,
-            imageWidth,
-            imageSize,
-            resizeMethod,
-            resizeMode,
-            wrapperHeight,
-            wrapperWidth,
-        } = this.props;
-
-        let height = imageHeight;
-        let width = imageWidth;
-        let imageStyle = {height, width};
-        if (imageSize === IMAGE_SIZE.Preview) {
-            height = 80;
-            width = this.calculateNeededWidth(file.height, file.width, height) || 80;
-            imageStyle = {height, width, position: 'absolute', top: 0, left: 0, borderBottomLeftRadius: 2, borderTopLeftRadius: 2};
-        }
-
+    imageProps = (file) => {
         const imageProps = {};
         if (file.localPath) {
             imageProps.defaultSource = {uri: file.localPath};
@@ -119,20 +95,73 @@ export default class FileAttachmentImage extends PureComponent {
             imageProps.thumbnailUri = Client4.getFileThumbnailUrl(file.id);
             imageProps.imageUri = Client4.getFilePreviewUrl(file.id);
         }
+        return imageProps;
+    };
+
+    renderSmallImage = () => {
+        const {file, isSingleImage, resizeMethod, theme} = this.props;
+
+        let wrapperStyle = style.fileImageWrapper;
+
+        if (isSingleImage) {
+            wrapperStyle = style.singleSmallImageWrapper;
+
+            if (file.width > SMALL_IMAGE_MAX_WIDTH) {
+                wrapperStyle = [wrapperStyle, {width: '100%'}];
+            }
+        }
 
         return (
             <View
                 ref={this.handleCaptureRef}
-                style={[style.fileImageWrapper, {height: wrapperHeight, width: wrapperWidth, overflow: 'hidden'}]}
+                style={[
+                    wrapperStyle,
+                    style.smallImageBorder,
+                    {borderColor: changeOpacity(theme.centerChannelColor, 0.4)},
+                ]}
             >
+                {this.boxPlaceholder()}
+                <View style={style.smallImageOverlay}>
+                    <ProgressiveImage
+                        style={{height: file.height, width: file.width}}
+                        defaultSource={thumb}
+                        tintDefaultSource={!file.localPath}
+                        filename={file.name}
+                        resizeMode={'contain'}
+                        resizeMethod={resizeMethod}
+                        {...this.imageProps(file)}
+                    />
+                </View>
+            </View>
+        );
+    };
+
+    render() {
+        const {
+            file,
+            imageDimensions,
+            resizeMethod,
+            resizeMode,
+        } = this.props;
+
+        if (file.height <= SMALL_IMAGE_MAX_HEIGHT || file.width <= SMALL_IMAGE_MAX_WIDTH) {
+            return this.renderSmallImage();
+        }
+
+        return (
+            <View
+                ref={this.handleCaptureRef}
+                style={style.fileImageWrapper}
+            >
+                {this.boxPlaceholder()}
                 <ProgressiveImage
-                    style={imageStyle}
+                    style={[this.props.isSingleImage ? null : style.imagePreview, imageDimensions]}
                     defaultSource={thumb}
                     tintDefaultSource={!file.localPath}
                     filename={file.name}
                     resizeMode={resizeMode}
                     resizeMethod={resizeMethod}
-                    {...imageProps}
+                    {...this.imageProps(file)}
                 />
             </View>
         );
@@ -140,17 +169,28 @@ export default class FileAttachmentImage extends PureComponent {
 }
 
 const style = StyleSheet.create({
-    fileImageWrapper: {
-        alignItems: 'center',
-        justifyContent: 'center',
-        borderBottomLeftRadius: 2,
-        borderTopLeftRadius: 2,
+    imagePreview: {
+        ...StyleSheet.absoluteFill,
     },
-    loaderContainer: {
-        position: 'absolute',
-        height: '100%',
-        width: '100%',
-        alignItems: 'center',
+    fileImageWrapper: {
+        borderRadius: 5,
+        overflow: 'hidden',
+    },
+    boxPlaceholder: {
+        paddingBottom: '100%',
+    },
+    smallImageBorder: {
+        borderWidth: 1,
+        borderRadius: 5,
+    },
+    smallImageOverlay: {
+        ...StyleSheet.absoluteFill,
         justifyContent: 'center',
+        alignItems: 'center',
+    },
+    singleSmallImageWrapper: {
+        height: SMALL_IMAGE_MAX_HEIGHT,
+        width: SMALL_IMAGE_MAX_WIDTH,
+        overflow: 'hidden',
     },
 });
diff --git a/app/components/file_attachment_list/file_attachment_list.js b/app/components/file_attachment_list/file_attachment_list.js
index fd8a15596..ceb1fde43 100644
--- a/app/components/file_attachment_list/file_attachment_list.js
+++ b/app/components/file_attachment_list/file_attachment_list.js
@@ -1,15 +1,17 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import React, {Component} from 'react';
+import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {
-    ScrollView,
-    StyleSheet,
-} from 'react-native';
+import {Dimensions, StyleSheet, View} from 'react-native';
+import AsyncStorage from '@react-native-community/async-storage';
 
 import {Client4} from 'mattermost-redux/client';
+import EventEmitter from 'mattermost-redux/utils/event_emitter';
 
+import {TABLET_WIDTH} from 'app/components/sidebars/drawer_layout';
+import {DeviceTypes} from 'app/constants';
+import mattermostManaged from 'app/mattermost_managed';
 import {isDocument, isGif, isVideo} from 'app/utils/file';
 import ImageCacheManager from 'app/utils/image_cache_manager';
 import {previewImageAtIndex} from 'app/utils/images';
@@ -18,7 +20,11 @@ import {emptyFunction} from 'app/utils/general';
 
 import FileAttachment from './file_attachment';
 
-export default class FileAttachmentList extends Component {
+const MAX_VISIBLE_ROW_IMAGES = 4;
+const VIEWPORT_IMAGE_OFFSET = 70;
+const VIEWPORT_IMAGE_REPLY_OFFSET = 11;
+
+export default class FileAttachmentList extends PureComponent {
     static propTypes = {
         actions: PropTypes.shape({
             loadFilesForPostIfNecessary: PropTypes.func.isRequired,
@@ -30,6 +36,7 @@ export default class FileAttachmentList extends Component {
         onLongPress: PropTypes.func,
         postId: PropTypes.string.isRequired,
         theme: PropTypes.object.isRequired,
+        isReplyPost: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -40,19 +47,25 @@ export default class FileAttachmentList extends Component {
         super(props);
 
         this.items = [];
-        this.previewItems = [];
-
+        this.filesForGallery = this.getFilesForGallery(props);
         this.state = {
             loadingFiles: props.files.length === 0,
         };
 
-        this.buildGalleryFiles(props).then((results) => {
+        this.buildGalleryFiles().then((results) => {
             this.galleryFiles = results;
         });
     }
 
     componentDidMount() {
         const {files} = this.props;
+
+        this.mounted = true;
+        this.handlePermanentSidebar();
+        this.handleDimensions();
+        EventEmitter.on(DeviceTypes.PERMANENT_SIDEBAR_SETTINGS, this.handlePermanentSidebar);
+        Dimensions.addEventListener('change', this.handleDimensions);
+
         if (files.length === 0) {
             this.loadFilesForPost();
         }
@@ -60,7 +73,8 @@ export default class FileAttachmentList extends Component {
 
     componentWillReceiveProps(nextProps) {
         if (this.props.files !== nextProps.files) {
-            this.buildGalleryFiles(nextProps).then((results) => {
+            this.filesForGallery = this.getFilesForGallery(nextProps);
+            this.buildGalleryFiles().then((results) => {
                 this.galleryFiles = results;
             });
         }
@@ -72,20 +86,33 @@ export default class FileAttachmentList extends Component {
         }
     }
 
-    loadFilesForPost = async () => {
-        await this.props.actions.loadFilesForPostIfNecessary(this.props.postId);
-        this.setState({
-            loadingFiles: false,
-        });
+    componentWillUnmount() {
+        this.mounted = false;
+        EventEmitter.off(DeviceTypes.PERMANENT_SIDEBAR_SETTINGS, this.handlePermanentSidebar);
+        Dimensions.removeEventListener('change', this.handleDimensions);
     }
 
-    buildGalleryFiles = async (props) => {
-        const {files} = props;
+    attachmentIndex = (fileId) => {
+        return this.filesForGallery.findIndex((file) => file.id === fileId) || 0;
+    };
+
+    attachmentManifest = (attachments) => {
+        return attachments.reduce((info, file) => {
+            if (this.isImage(file)) {
+                info.imageAttachments.push(file);
+            } else {
+                info.nonImageAttachments.push(file);
+            }
+            return info;
+        }, {imageAttachments: [], nonImageAttachments: []});
+    };
+
+    buildGalleryFiles = async () => {
         const results = [];
 
-        if (files && files.length) {
-            for (let i = 0; i < files.length; i++) {
-                const file = files[i];
+        if (this.filesForGallery && this.filesForGallery.length) {
+            for (let i = 0; i < this.filesForGallery.length; i++) {
+                const file = this.filesForGallery[i];
                 const caption = file.name;
 
                 if (isDocument(file) || isVideo(file) || (!file.has_preview_image && !isGif(file))) {
@@ -116,16 +143,141 @@ export default class FileAttachmentList extends Component {
         return results;
     };
 
+    getFilesForGallery = (props) => {
+        const manifest = this.attachmentManifest(props.files);
+        const files = manifest.imageAttachments.concat(manifest.nonImageAttachments);
+        const results = [];
+
+        if (files && files.length) {
+            files.forEach((file) => {
+                results.push(file);
+            });
+        }
+
+        return results;
+    };
+
+    getPortraitPostWidth = () => {
+        const {isReplyPost} = this.props;
+        const {width, height} = Dimensions.get('window');
+        const permanentSidebar = DeviceTypes.IS_TABLET && !this.state?.isSplitView && this.state?.permanentSidebar;
+        let portraitPostWidth = Math.min(width, height) - VIEWPORT_IMAGE_OFFSET;
+
+        if (permanentSidebar) {
+            portraitPostWidth -= TABLET_WIDTH;
+        }
+
+        if (isReplyPost) {
+            portraitPostWidth -= VIEWPORT_IMAGE_REPLY_OFFSET;
+        }
+
+        return portraitPostWidth;
+    };
+
     handleCaptureRef = (ref, idx) => {
         this.items[idx] = ref;
     };
 
+    handleDimensions = () => {
+        if (this.mounted) {
+            if (DeviceTypes.IS_TABLET) {
+                mattermostManaged.isRunningInSplitView().then((result) => {
+                    const isSplitView = Boolean(result.isSplitView);
+                    this.setState({isSplitView});
+                });
+            }
+        }
+    };
+
+    handlePermanentSidebar = async () => {
+        if (DeviceTypes.IS_TABLET && this.mounted) {
+            const enabled = await AsyncStorage.getItem(DeviceTypes.PERMANENT_SIDEBAR_SETTINGS);
+            this.setState({permanentSidebar: enabled === 'true'});
+        }
+    };
+
     handlePreviewPress = preventDoubleTap((idx) => {
         previewImageAtIndex(this.items, idx, this.galleryFiles);
     });
 
-    renderItems = () => {
-        const {canDownloadFiles, fileIds, files} = this.props;
+    isImage = (file) => (file.has_preview_image || isGif(file));
+
+    isSingleImage = (files) => (files.length === 1 && this.isImage(files[0]));
+
+    loadFilesForPost = async () => {
+        await this.props.actions.loadFilesForPostIfNecessary(this.props.postId);
+        this.setState({
+            loadingFiles: false,
+        });
+    }
+
+    renderItems = (items, moreImagesCount, includeGutter = false) => {
+        const {canDownloadFiles, onLongPress, theme} = this.props;
+        const isSingleImage = this.isSingleImage(items);
+        let nonVisibleImagesCount;
+        let container = styles.container;
+        const containerWithGutter = [container, styles.gutter];
+
+        return items.map((file, idx) => {
+            const f = {
+                caption: file.name,
+                data: file,
+            };
+
+            if (moreImagesCount && idx === MAX_VISIBLE_ROW_IMAGES - 1) {
+                nonVisibleImagesCount = moreImagesCount;
+            }
+
+            if (idx !== 0 && includeGutter) {
+                container = containerWithGutter;
+            }
+
+            return (
+                <View
+                    style={container}
+                    key={file.id}
+                >
+                    <FileAttachment
+                        key={file.id}
+                        canDownloadFiles={canDownloadFiles}
+                        file={f}
+                        id={file.id}
+                        index={this.attachmentIndex(file.id)}
+                        onCaptureRef={this.handleCaptureRef}
+                        onPreviewPress={this.handlePreviewPress}
+                        onLongPress={onLongPress}
+                        theme={theme}
+                        isSingleImage={isSingleImage}
+                        nonVisibleImagesCount={nonVisibleImagesCount}
+                        wrapperWidth={this.getPortraitPostWidth()}
+                    />
+                </View>
+            );
+        });
+    };
+
+    renderImageRow = (images) => {
+        if (images.length === 0) {
+            return null;
+        }
+
+        const visibleImages = images.slice(0, MAX_VISIBLE_ROW_IMAGES);
+        const {portraitPostWidth} = this.state;
+
+        let nonVisibleImagesCount;
+        if (images.length > MAX_VISIBLE_ROW_IMAGES) {
+            nonVisibleImagesCount = images.length - MAX_VISIBLE_ROW_IMAGES;
+        }
+
+        return (
+            <View style={[styles.row, {width: portraitPostWidth}]}>
+                { this.renderItems(visibleImages, nonVisibleImagesCount, true) }
+            </View>
+        );
+    };
+
+    render() {
+        const {canDownloadFiles, fileIds, files, isFailed} = this.props;
 
         if (!files.length && fileIds.length > 0) {
             return fileIds.map((id, idx) => (
@@ -140,45 +292,29 @@ export default class FileAttachmentList extends Component {
             ));
         }
 
-        return files.map((file, idx) => {
-            const f = {
-                caption: file.name,
-                data: file,
-            };
-
-            return (
-                <FileAttachment
-                    key={file.id}
-                    canDownloadFiles={canDownloadFiles}
-                    file={f}
-                    id={file.id}
-                    index={idx}
-                    onCaptureRef={this.handleCaptureRef}
-                    onPreviewPress={this.handlePreviewPress}
-                    onLongPress={this.props.onLongPress}
-                    theme={this.props.theme}
-                />
-            );
-        });
-    };
-
-    render() {
-        const {fileIds, isFailed} = this.props;
+        const manifest = this.attachmentManifest(files);
 
         return (
-            <ScrollView
-                horizontal={true}
-                scrollEnabled={fileIds.length > 1}
-                style={[(isFailed && styles.failed)]}
-                keyboardShouldPersistTaps={'always'}
-            >
-                {this.renderItems()}
-            </ScrollView>
+            <View style={[isFailed && styles.failed]}>
+                {this.renderImageRow(manifest.imageAttachments)}
+                {this.renderItems(manifest.nonImageAttachments)}
+            </View>
         );
     }
 }
 
 const styles = StyleSheet.create({
+    row: {
+        flex: 1,
+        flexDirection: 'row',
+        marginTop: 5,
+    },
+    container: {
+        flex: 1,
+    },
+    gutter: {
+        marginLeft: 8,
+    },
     failed: {
         opacity: 0.5,
     },
diff --git a/app/components/file_attachment_list/file_attachment_list.test.js b/app/components/file_attachment_list/file_attachment_list.test.js
index 245e0bac1..69dcb609d 100644
--- a/app/components/file_attachment_list/file_attachment_list.test.js
+++ b/app/components/file_attachment_list/file_attachment_list.test.js
@@ -10,9 +10,50 @@ jest.mock('react-native-doc-viewer', () => ({
     openDoc: jest.fn(),
 }));
 
-describe('PostAttachmentOpenGraph', () => {
+describe('FileAttachmentList', () => {
     const loadFilesForPostIfNecessary = jest.fn().mockImplementationOnce(() => Promise.resolve({data: {}}));
 
+    const files = [{
+        create_at: 1546893090093,
+        delete_at: 0,
+        extension: 'png',
+        has_preview_image: true,
+        height: 171,
+        id: 'fileId',
+        mime_type: 'image/png',
+        name: 'image01.png',
+        post_id: 'postId',
+        size: 14894,
+        update_at: 1546893090093,
+        user_id: 'userId',
+        width: 425,
+    },
+    {
+        create_at: 1546893090093,
+        delete_at: 0,
+        extension: 'png',
+        has_preview_image: true,
+        height: 800,
+        id: 'otherFileId',
+        mime_type: 'image/png',
+        name: 'image02.png',
+        post_id: 'postId',
+        size: 24894,
+        update_at: 1546893090093,
+        user_id: 'userId',
+        width: 555,
+    }];
+
+    const nonImage = {
+        extension: 'other',
+        id: 'fileId',
+        mime_type: 'other/type',
+        name: 'file01.other',
+        post_id: 'postId',
+        size: 14894,
+        user_id: 'userId',
+    };
+
     const baseProps = {
         actions: {
             loadFilesForPostIfNecessary,
@@ -21,21 +62,7 @@ describe('PostAttachmentOpenGraph', () => {
         deviceHeight: 680,
         deviceWidth: 660,
         fileIds: ['fileId'],
-        files: [{
-            create_at: 1546893090093,
-            delete_at: 0,
-            extension: 'png',
-            has_preview_image: true,
-            height: 171,
-            id: 'fileId',
-            mime_type: 'image/png',
-            name: 'image.png',
-            post_id: 'postId',
-            size: 14894,
-            update_at: 1546893090093,
-            user_id: 'userId',
-            width: 425,
-        }],
+        files: [files[0]],
         postId: 'postId',
         theme: Preferences.THEMES.default,
     };
@@ -48,6 +75,93 @@ describe('PostAttachmentOpenGraph', () => {
         expect(wrapper.getElement()).toMatchSnapshot();
     });
 
+    test('should match snapshot with two image files', () => {
+        const props = {
+            ...baseProps,
+            files,
+        };
+
+        const wrapper = shallow(
+            <FileAttachment {...props}/>
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
+    test('should match snapshot with three image files', () => {
+        const thirdImage = {...files[1], id: 'thirdFileId', name: 'image03.png'};
+        const props = {
+            ...baseProps,
+            files: [...files, thirdImage],
+        };
+
+        const wrapper = shallow(
+            <FileAttachment {...props}/>
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
+    test('should match snapshot with four image files', () => {
+        const thirdImage = {...files[1], id: 'thirdFileId', name: 'image03.png'};
+        const fourthImage = {...files[1], id: 'fourthFileId', name: 'image04.png'};
+
+        const props = {
+            ...baseProps,
+            files: [...files, thirdImage, fourthImage],
+        };
+
+        const wrapper = shallow(
+            <FileAttachment {...props}/>
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
+    test('should match snapshot with more than four image files', () => {
+        const thirdImage = {...files[1], id: 'thirdFileId', name: 'image03.png'};
+        const fourthImage = {...files[1], id: 'fourthFileId', name: 'image04.png'};
+        const fifthImage = {...files[1], id: 'fifthFileId', name: 'image05.png'};
+        const sixthImage = {...files[1], id: 'sixthFileId', name: 'image06.png'};
+
+        const props = {
+            ...baseProps,
+            files: [...files, thirdImage, fourthImage, fifthImage, sixthImage],
+        };
+
+        const wrapper = shallow(
+            <FileAttachment {...props}/>
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
+    test('should match snapshot with non-image attachment', () => {
+        const props = {
+            ...baseProps,
+            files: [nonImage],
+        };
+
+        const wrapper = shallow(
+            <FileAttachment {...props}/>
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
+    test('should match snapshot with combination of image and non-image attachments', () => {
+        const props = {
+            ...baseProps,
+            files: [...files, nonImage],
+        };
+
+        const wrapper = shallow(
+            <FileAttachment {...props}/>
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
     test('should call loadFilesForPostIfNecessary when files does not exist', async () => {
         const props = {
             ...baseProps,
diff --git a/app/components/file_upload_preview/file_upload_item/file_upload_item.js b/app/components/file_upload_preview/file_upload_item/file_upload_item.js
index ff33c5243..0304b61c2 100644
--- a/app/components/file_upload_preview/file_upload_item/file_upload_item.js
+++ b/app/components/file_upload_preview/file_upload_item/file_upload_item.js
@@ -190,11 +190,7 @@ export default class FileUploadItem extends PureComponent {
             filePreviewComponent = (
                 <FileAttachmentImage
                     file={file}
-                    imageSize='fullsize'
-                    imageHeight={100}
-                    imageWidth={100}
-                    wrapperHeight={100}
-                    wrapperWidth={100}
+                    theme={theme}
                 />
             );
         } else {
@@ -202,8 +198,6 @@ export default class FileUploadItem extends PureComponent {
                 <FileAttachmentIcon
                     file={file}
                     theme={theme}
-                    imageHeight={100}
-                    imageWidth={100}
                     wrapperHeight={100}
                     wrapperWidth={100}
                 />
@@ -260,6 +254,7 @@ const styles = StyleSheet.create({
         height: 100,
         width: 100,
         elevation: 10,
+        borderRadius: 5,
         ...Platform.select({
             ios: {
                 backgroundColor: '#fff',
diff --git a/app/components/message_attachments/attachment_image/__snapshots__/index.test.js.snap b/app/components/message_attachments/attachment_image/__snapshots__/index.test.js.snap
index c941946d9..e4b92da1f 100644
--- a/app/components/message_attachments/attachment_image/__snapshots__/index.test.js.snap
+++ b/app/components/message_attachments/attachment_image/__snapshots__/index.test.js.snap
@@ -32,6 +32,14 @@ exports[`AttachmentImage it matches snapshot 1`] = `
     }
   >
     <Connect(ProgressiveImage)
+      imageStyle={
+        Object {
+          "marginBottom": 5,
+          "marginLeft": 2.5,
+          "marginRight": 5,
+          "marginTop": 2.5,
+        }
+      }
       imageUri="https://images.com/image.png"
       resizeMode="contain"
       style={
diff --git a/app/components/message_attachments/attachment_image/index.js b/app/components/message_attachments/attachment_image/index.js
index 2843c11b3..9f2a5f92e 100644
--- a/app/components/message_attachments/attachment_image/index.js
+++ b/app/components/message_attachments/attachment_image/index.js
@@ -141,6 +141,7 @@ export default class AttachmentImage extends PureComponent {
             progressiveImage = (
                 <ProgressiveImage
                     ref={this.setImageRef}
+                    imageStyle={style.attachmentMargin}
                     style={{height, width}}
                     imageUri={imageUri}
                     resizeMode='contain'
@@ -178,5 +179,11 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             borderRadius: 2,
             flex: 1,
         },
+        attachmentMargin: {
+            marginTop: 2.5,
+            marginLeft: 2.5,
+            marginBottom: 5,
+            marginRight: 5,
+        },
     };
 });
diff --git a/app/components/post_body/post_body.js b/app/components/post_body/post_body.js
index b49a69f92..0ddd542f0 100644
--- a/app/components/post_body/post_body.js
+++ b/app/components/post_body/post_body.js
@@ -247,6 +247,7 @@ export default class PostBody extends PureComponent {
                     isFailed={isFailed}
                     onLongPress={this.showPostOptions}
                     postId={post.id}
+                    isReplyPost={this.props.isReplyPost}
                 />
             );
         }
diff --git a/app/components/progressive_image/progressive_image.js b/app/components/progressive_image/progressive_image.js
index 1b4d73bd7..68fb5f276 100644
--- a/app/components/progressive_image/progressive_image.js
+++ b/app/components/progressive_image/progressive_image.js
@@ -7,7 +7,7 @@ import {Animated, Image, ImageBackground, Platform, View, StyleSheet} from 'reac
 
 import CustomPropTypes from 'app/constants/custom_prop_types';
 import ImageCacheManager from 'app/utils/image_cache_manager';
-import {changeOpacity} from 'app/utils/theme';
+import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
 
 const AnimatedImageBackground = Animated.createAnimatedComponent(ImageBackground);
 
@@ -18,6 +18,7 @@ export default class ProgressiveImage extends PureComponent {
         defaultSource: PropTypes.oneOfType([PropTypes.object, PropTypes.number]), // this should be provided by the component
         filename: PropTypes.string,
         imageUri: PropTypes.string,
+        imageStyle: CustomPropTypes.Style,
         onError: PropTypes.func,
         resizeMethod: PropTypes.string,
         resizeMode: PropTypes.string,
@@ -96,7 +97,17 @@ export default class ProgressiveImage extends PureComponent {
     };
 
     render() {
-        const {style, defaultSource, isBackgroundImage, theme, tintDefaultSource, onError, resizeMode, resizeMethod} = this.props;
+        const {
+            defaultSource,
+            imageStyle,
+            isBackgroundImage,
+            onError,
+            resizeMode,
+            resizeMethod,
+            style,
+            theme,
+            tintDefaultSource,
+        } = this.props;
         const {uri, intensity, thumb} = this.state;
         const hasDefaultSource = Boolean(defaultSource);
         const hasPreview = Boolean(thumb);
@@ -117,13 +128,15 @@ export default class ProgressiveImage extends PureComponent {
             ImageComponent = Animated.Image;
         }
 
+        const styles = getStyleSheet(theme);
+
         let defaultImage;
         if (hasDefaultSource && tintDefaultSource) {
             defaultImage = (
                 <View style={styles.defaultImageContainer}>
                     <DefaultComponent
                         source={defaultSource}
-                        style={{flex: 1, tintColor: changeOpacity(theme.centerChannelColor, 0.2)}}
+                        style={styles.defaultImageTint}
                         resizeMode='center'
                         resizeMethod={resizeMethod}
                         onError={onError}
@@ -139,7 +152,7 @@ export default class ProgressiveImage extends PureComponent {
                     resizeMethod={resizeMethod}
                     onError={onError}
                     source={defaultSource}
-                    style={StyleSheet.absoluteFill}
+                    style={[StyleSheet.absoluteFill, imageStyle]}
                 >
                     {this.props.children}
                 </DefaultComponent>
@@ -155,7 +168,7 @@ export default class ProgressiveImage extends PureComponent {
                     resizeMethod={resizeMethod}
                     onError={onError}
                     source={{uri: thumb}}
-                    style={StyleSheet.absoluteFill}
+                    style={[StyleSheet.absoluteFill, imageStyle]}
                     blurRadius={5}
                 >
                     {this.props.children}
@@ -167,7 +180,7 @@ export default class ProgressiveImage extends PureComponent {
                     resizeMethod={resizeMethod}
                     onError={onError}
                     source={{uri}}
-                    style={[StyleSheet.absoluteFill, styles.attachmentMargin]}
+                    style={[StyleSheet.absoluteFill, imageStyle]}
                 >
                     {this.props.children}
                 </ImageComponent>
@@ -180,19 +193,19 @@ export default class ProgressiveImage extends PureComponent {
     }
 }
 
-const styles = StyleSheet.create({
-    defaultImageContainer: {
-        flex: 1,
-        position: 'absolute',
-        height: 80,
-        width: 80,
-        alignItems: 'center',
-        justifyContent: 'center',
-    },
-    attachmentMargin: {
-        marginTop: 2.5,
-        marginLeft: 2.5,
-        marginBottom: 5,
-        marginRight: 5,
-    },
+const getStyleSheet = makeStyleSheetFromTheme((theme) => {
+    return {
+        defaultImageContainer: {
+            flex: 1,
+            position: 'absolute',
+            height: 80,
+            width: 80,
+            alignItems: 'center',
+            justifyContent: 'center',
+        },
+        defaultImageTint: {
+            flex: 1,
+            tintColor: changeOpacity(theme.centerChannelColor, 0.2),
+        },
+    };
 });
diff --git a/app/constants/attachment.js b/app/constants/attachment.js
index 7f234bf52..532fcf90b 100644
--- a/app/constants/attachment.js
+++ b/app/constants/attachment.js
@@ -2,3 +2,5 @@
 // See LICENSE.txt for license information.
 
 export const MAX_ATTACHMENT_FOOTER_LENGTH = 300;
+export const ATTACHMENT_ICON_HEIGHT = 48;
+export const ATTACHMENT_ICON_WIDTH = 36;
diff --git a/app/screens/image_preview/image_preview.js b/app/screens/image_preview/image_preview.js
index 2f0214773..150e8d879 100644
--- a/app/screens/image_preview/image_preview.js
+++ b/app/screens/image_preview/image_preview.js
@@ -206,8 +206,8 @@ export default class ImagePreview extends PureComponent {
                     backgroundColor='transparent'
                     canDownloadFiles={canDownloadFiles}
                     file={file}
-                    iconHeight={100}
-                    iconWidth={100}
+                    iconHeight={200}
+                    iconWidth={200}
                     theme={theme}
                     wrapperHeight={200}
                     wrapperWidth={200}
@@ -223,8 +223,8 @@ export default class ImagePreview extends PureComponent {
                     backgroundColor='transparent'
                     file={file}
                     theme={this.props.theme}
-                    iconHeight={150}
-                    iconWidth={150}
+                    iconHeight={200}
+                    iconWidth={200}
                     wrapperHeight={200}
                     wrapperWidth={200}
                 />
@@ -366,7 +366,7 @@ export default class ImagePreview extends PureComponent {
         if (imageDimensions) {
             const {deviceHeight, deviceWidth} = this.props;
             const {height, width} = imageDimensions;
-            const {style, ...otherProps} = imageProps;
+            const {style, source} = imageProps;
             const statusBar = DeviceTypes.IS_IPHONE_WITH_INSETS ? 0 : 20;
             const flattenStyle = StyleSheet.flatten(style);
             const calculatedDimensions = calculateDimensions(height, width, deviceWidth, deviceHeight - statusBar);
@@ -375,7 +375,7 @@ export default class ImagePreview extends PureComponent {
             return (
                 <View style={[style, {justifyContent: 'center', alignItems: 'center'}]}>
                     <Image
-                        {...otherProps}
+                        source={source}
                         style={imageStyle}
                     />
                 </View>
diff --git a/assets/base/images/icons/audio.png b/assets/base/images/icons/audio.png
index 93cf6ef33ba799f82c80e69c6b17e8b91da33a03..dc4d3cb4901f6fc2feb400829816b7babf1767b2 100644
GIT binary patch
literal 2282
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
Ef>~lP$p8QV

literal 1691
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

diff --git a/assets/base/images/icons/code.png b/assets/base/images/icons/code.png
index c0c8458f8816325163a3799801d0a41d431615f7..14c159dea094086a2882481dfc7b0ef2934120b2 100644
GIT binary patch
literal 2685
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

literal 1382
zcmV-s1)2JZP)<h;3K|Lk000e1NJLTq004LZ004Lh1^@s6Ib=4{000FoNkl<ZcmeFe
z0RaF21OOo0?Dh@pr~&{000000fR{DwodfVCJrKm_vu)e9ZQHhO+qP}nwr!kkn^Wv_
zI<NNf-$|yc`h3~W{+?gb`|677pVXby&#RA8FD%)}0e`C=F%JKu-d9Y^;m!x3<Mc4~
z;$l_~`0(+<g|`s1a=<SI;0{&KBqrr>r&9L`0RBwO$^maiJUpK*X61mdCjhS?X61nY
z3czh6X60}fBksNTiCH<|V+p`Ji&;6~*8^||s;3uM^oiX@{gC=B^^{GNVH$P+0O0o;
z81n-4gX)b+g?os4*eECQjiiu~V>{yE`Lu}frd5A3%Ksg#-mP@F=^-P_Z3N(@$+4yb
zTo{ncfP3gT;lghwfs8!=2jKqSI9wib8F1le66IN%$Z}gHFVp~e_j2LF!__k+$aET!
zWxM$I(LCg`;KJ?HlP1XZZXid0^)%$ebNBKf1McvM$@f!llpxpi>VbhQuSblxy?T&&
z$O+(Xk|^8GM4n?K$J`+j@{p<_J6z<ukI1x`s2p-Na5qkzv2`HRUjjK~!Q>7z0Cxo<
z*YyIWg1m>rttRK$M7GT;IL`JdAv;`T{Vb5Jk9sOmIb<w1t-)I%D(g(@p@Doa31kAY
z!$sabh>V9%q;IWaAP)s(hZ~dmVIt>z0vUqra3@uF3grA%pu!*{<Pi<P-LM8vC#w-z
zuM((EkoR=B;p`U>dDl;rW!tJCJ6z=dI*_-!dNP6RLQVj;Z_VJ&NqlAbtUz^!yjRsB
zjx-AwbJ&l_eULyVAUj;l;|XGO_nb|<gt$S-4tFwjw?Ou91u_LWCEN{a`Z@XfME*+!
zvIcqY*n=FE1zgPMa$*i^)ojPdz<9`|!Nr_@2+W}q7WvtRTs7Q22H?(1%;`~qtV7<X
z7`SY64*IWhgN#9r&JHf-_8f6SX07=gwr&J67RcobcM5e+wmBz5$h(RD&?7szI4PSD
zb2>+$+#t6Q{h@2bf9S1VKeOhXRgD225W(yJM!vZ3V+FG2{EgTHHA$v$u~0yNaZGNI
zHQ$0vb56!^_a$CQn}m!TZFmm5WcuO?aI<^6#BazRte&X=xS2slv1q?Q?hmtk?+axJ
z8Tq&5n{x_-Yx<*0WWR;TyKJ5xO%?!|XwGR>JX~{MA0qGKM8-P>%Hr$6{2?RjiA-~j
z!?m`A2RYvf<QjnH9Q#XjidsHPHs`z}ko`q=WkAM0Tq4hj4%ZrF<hnDyIj69N?k2ag
zAXBSAhQA%I(amUNbIvUW;bOB{k&uz&4C2^Z3NH(Lf(w9*3?DMhIo9BM(+-+*1_zG!
ziXpgr2;`8-=A2`!!F9+u=KaKR7PJJ{A>&w+sM{rI&PiH)=B1=K&Z@-NR~v=vkjdtp
zO&o5$Aa4{g{^x=5da9>L@gYV!xb`7;R8LBbJF9wVg616Rq8tedz)iQn^Ox1ZnEMiA
z9i0C1v^?BWAwOGDbIx$}ys6e<7Y&zy%wO6L#iCsTC-etNA^y^KfLrDz?f{n<W375M
z=KykXa0$qO%m4pN3BYShQUP)SaOq_$kEqY);nK}H-B2u=P`HNhh3bdZn}{pESd@6N
z_Jp|10zSxabB>Du{47x{I;*(siEPgKT3luUZ$LaeUmz~CfUh##oZ}(@{~CbXo^Q@^
zS!~XESX>6hFRt4|TxJ2UX1O`X#czCTF&@Bgiz^$@OQ?@mzpU<}{#Lz&6t9u(!2t;X
o004lX|F45~r~?21000002xfr}Q1mZg3;+NC07*qoM6N<$f`?S0R{#J2

diff --git a/assets/base/images/icons/excel.png b/assets/base/images/icons/excel.png
old mode 100644
new mode 100755
index f9e9bc83a87c2c9d087ac85375204c209573a115..dfb83aceba672f57fd626ce1d682086610dcfc07
GIT binary patch
literal 2175
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
B53v9M

literal 472
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(z%mREuT!FOCq!?0>*(>8IK%GJ*
zL4Lsu4hjYT@1K7!u)jWFegAxe1mAqeC(9Wa80|e>978G?_grVqYjcojdDvL`{;z&?
z{3riiz4f2n3M&d;JYKh4`p#dYqYBT<8Ds7U2er8#eXn({`bxs3xqsf-^}Tz*v*9$S
zQc6T9--@&E^=@nl{rTdPan=EaL(9(kFq$Om*OY25klbD4%+6^N@6G36+WPF*>Ex`H
z3w|2S>oCeVHqR;JP?(eOHi20imR@M_y-@XrF>$)ouMfTk3)fuGy!P~oxT)j&Hi22Y
zzg!T?X?oTsX2mLN=D59kW2<~@aI5bHbKA}Ol3SP?mK{>dVEW+v%eFtd`R%`dis8q$
zwe?kWF}*2DioGZE`)y6mVJYk7pV^8Gj=lRo(abt0u9m$$uj}nAz2?KQ^RKz@F7;q#
z;5i&nAolEjj_DGGCFM5nFYjSycyRoi_rrz)haLO}m<7ee*j{{gXlZR_{ADAMnD}rX
ZBU9#+;ENkBx&s56!PC{xWt~$(696jw%qIW<

diff --git a/assets/base/images/icons/generic.png b/assets/base/images/icons/generic.png
index e89b90ff0b2bb8d52bb208b99c124dad18b7afad..d17636fcf5c6ad74188a0f2d47ce6bc82c40c634 100644
GIT binary patch
literal 2644
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
CN9?fx

literal 2256
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

diff --git a/assets/base/images/icons/image.png b/assets/base/images/icons/image.png
index 8aafdbef16e69953f9c077196c222d39f59eb4f1..993621dc924743808240895501b00da994f3423a 100644
GIT binary patch
literal 2605
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
P00000NkvXXu0mjf_2KOq

literal 1006
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q}r7FmLsAaSW+od~=aekU@Zf<)Hq$
z#zjFBm^PRfbDB+BlB~V8biZ}N0k#|{YWOc*P!iI>&#{4l+aTdU10%Co0wV}L@Mh8h
zapQPxZfs_cI6aA>Ythf-+uL$)ml@3CJiaY=b}ops?W5oOZQ9}bJ6lz>*G*n`@BYze
zYge>foY8%8MNhP|T{rXQt^86BY`h!&Ph><UlzltQpwYy5Lx0H@?SfE^wpEHtRU2<w
z$g^s+F`e7~!2Wm6d*;m_^`{)jx9qQ0|5YhJqxWC{lXJ05d45lO!Myj4;?A5pCkr3^
zSLCq&DOVvk<-ndf$M#CzIv|oGzt82kxkh{8_ahM*!sS*17Jnuj-TzWPgL~C)nIB0S
zjon3J-`NhYukPO1f4=_33cjNOw&{iC$1_em$ehpo9%v0q^TzUXO#c~YE|~njpZE7d
z(Uc2Zzn|;8+p6IpIOoaNV#Vs)59&+~xab^rF*)$}h8j@!VGfN&{&%_F{FDDy-<TxP
zoa^-9QOqB=Ia43r6V-4qjFo0euYVb9AQW8S##U{e%rV8`rGUk6?|MeZ8BM{#?`pYK
zP55`W9=I9%BSfds%s_Jak{^f97-_V+J3YwJi*CAhLCoifr{VXqLk=2C(-aHLrq{|C
zN%RXRy{Y9)O|b0aXuKR-67SRKW59RZ^~P?7(+hg`Onuj;_~CwlOLF0w#BBF3%|<2$
zEPiz-y#pGOBzhNb-}GHGghjmdz(@TZvQ^HUJx3<aelxdwX@KCLSE&hQ+x-i_iE6Y8
zTGX7q#`l6*^km7K2gwhvfAniAZco;ma>+oZjenui?(3@$<m5F!6u8%0xs7eg#EB71
zqLI1xneKDsKG@swJg-@23(N1_@;ClO{zyD>oF(#AWW3xTe$zikel2`>=lO)AyM7D(
zus!kMvF;p8R&RyVb6=GtY}<BN;snclDLLVsZ%bb{zHd<aRdRNwyP|u~@ojqS>-dj;
zP+sQ1xAWr318-znpH6swYNyl>;}>@m?7kIf8Aw|vDBa-x(30KwzMY9-Z4CDv9xeuv
zf-S<0mi0_rv){74-zD@TI>Y#2z?2Bt8Jn#WwM23*s%~SiJF!FdPiFOlZO7gwsFiIp
zGI;LSe1^#;A^SnR!e)lAYq`(Nj5Xvo;@%*_eoO4fNddiS;<?;+OkKKDTlIS0<uGh<
zXIBB{JBFrz`}5orE-<l5fHM#`FehzbU}odFv6)fYAc5HoiV%6OnNfNJBV3%B&Bib2
XhI_!w-wtdkAoDz3{an^LB{Ts53P`yi

diff --git a/assets/base/images/icons/patch.png b/assets/base/images/icons/patch.png
old mode 100644
new mode 100755
index c4b423525f62f53b4aff7cf899f27bf8c60bece5..fdc66287a88ef9e29ec389538eaa00adfb59c0fd
GIT binary patch
literal 2668
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
atp5Yx?4m|DGq%?N0000<MNUMnLSTZH0|U?i

literal 1504
zcmV<61t0o}P)<h;3K|Lk000e1NJLTq004LZ004Lh1^@s6Ib=4{000H2Nkl<ZcmeI*
zLzrbd6hPtIwr%&QZQFRZZQHhO+qTWNW^KFhRNQY3+FiWL$<D6t`_DYJu9K6*H2j_a
z>iGH?ffH~8Uci@_jTP8}t&nZDVhfgIHon9QxB<sw80y9B&q>Ux7=jD&9+pE=WEtMU
zg&2s+Rv<M|o8vURhir%=8F&jPp^24AENVTRjBk(+iI{wRffG^Nij_U=U_6VzA)d&_
zQ|NC6i;h|m2jFLj=YGIGs9<6FC*VNLhbS{Q=+F#&6lOw{`xS#i3fm6vKmt;TSI|oP
z`|LT$h6E}Tr=y~_xE=8e7^K1XXs0FaG024M#$@0KpTkzi(~uIGM^VkUxNR{5QYPkC
zwDcuzU#x+Yi&=>tQI9(%p-;&s3*)02_YmYj5@K?&Z{$8HCw0ch<l&I0#68&JrbI6G
zbscwFN?(>u4#v2OJ1{MCwk8AJ(;c^UTE7aJm1v!=xHX(i^O@gJH64MUg%~FuOLg4i
zAjYX9QWdu|vLVK)t!S6*xRvlLBofSbsF2LS=RqRHoSv+>?IZcpY%-Jb)yeY(a)p?O
zFN^S_f(Py^iN+lb@zgiyQifG0mm|;P2k_8D7NyVe_(Mq5K)(L{jtcS4?~13o$1&dD
zAfDPco;A#iARby8=PTCb5KqlPg;1WoKPRwgL4tS|d;X)wk8uV*0^+f6%R0~@5DV<3
zeq|ZxOBUE$Pn9;v2KdJUdn+4tN*d&u5DV<J6H6N84;I*aUlcdMRw%H*-pfOiq6T<6
z!~&~uQc(l^2o_j}H}@P|HDtpA>yUveyAEyy1QuA20a|`&x4=caVAsKYs4lPterwmk
ztyLG;0x#J<uqF_|0xMF8x-l+eAb<r{W>}2NX=(#o;NxOkZihIw95a&SsW<~q!i*$Y
zfE<Wp*T=ZL?s!YT9!mG-tc$B1FUfsA#^pPQ>z1nou)FS2PG^=Jt)47Er+~Il{u<)I
zj2M@7kTjbe*yiVFIQuTlB?FRX9|ab8ABY26V`-V>x4=^&4rIi*h}yswI9GdM3#|Vo
z+Fqhve8~Dbu)v4A{E)TI(UOv?0R?`*<=3Qz5C<*_ByJmIx%{EyJBK@|9;rNTTP%P$
z^10i|2H<C0hEtMcp9D5~J0(fZ#54E{;(D^-Hi!l`A6)cw;i-B9+l0R@+0h+%s4cqF
zz38rvEt^%mY&M{U@3!#$GIfD1@cDN0nf{y4?DkRpw~wlOAGW}FL-!UA7Wl-X2G~;Z
zCM>oI%eFy&uP3l=qong?+5(@Tdn-fR%CL561AV~)d+W)v40MnM_EsO;5Iock!HYPy
zT|710{S9JH>{H%DITk`Z^e<`$c5Lo!R0!!<ovY$FzV9FP&)y;q#+nWBP(BVV$GYYD
z`VYp^cC;PvB~Hf_jN8MJcmUauV2-vcBJ$f16G<=I@v?elpp_jEt=DOG#JgVKqC&E7
zr0Rq$h;eEw+QpgCgL8Jxp{c$l@)?M6;*oUR^I9D<ASSJTLDh8K*xVW`Ato(WqIJ6O
zUhjv$Att3V(B0+sKsgYT5;+*-dLN2|kPk6QkGoG)HXAw8A}2lWK~dXL<{*2yPKqpy
zjq0{RlWk%mAsf&?>U%@=!D@&pm!;_H)9!9%pPVp1poMR{yj8*7D1?|I72p<B_I)ee
zO%}7r_uC1Y_H6tS78dvht+Z{-SrKOiKBt_4Q&B<t_PVb^0#b-q&?=-|&_@L_?f5GO
z1rxT2#q|eZ9z>Zrm>#pg9q-Tk;0Glipr#i8K5Mc2;~8Xoc4z(L=xYVb9=aY*!dDTU
zsmjA=I03b-SYol8;3T|-42UC}@fwapV=I%I*p)F57vLQ%P2pFYC3pkpVIV450e3Iw
zLvb9g!}ItIv#=anw#nOO%Qnj~1E1k}T!&*Y7<FR`{{9E9F|7>)DtT-G0000<MNUMn
GLSTaY2h#Zf

diff --git a/assets/base/images/icons/pdf.png b/assets/base/images/icons/pdf.png
index c716eed792b2eb1323ce0b2acf0df6fa6a320ed1..ad73c128eb60aea29fc44dbf6cc63f78efb2160e 100644
GIT binary patch
literal 2482
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

literal 2289
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
LNkvXXu0mjfG*wh0

diff --git a/assets/base/images/icons/ppt.png b/assets/base/images/icons/ppt.png
old mode 100644
new mode 100755
index 225b5e53aec9abea04c87724043b29319b1d8bc2..5e3787b00173221e7e2e6da32d15d5b5a6baa83e
GIT binary patch
literal 1570
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
U`A!mFz5oCK07*qoM6N<$g39F87ytkO

literal 2015
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

diff --git a/assets/base/images/icons/text.png b/assets/base/images/icons/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..52cb3f1707fca7cb1c0de76f7f71ff64fa0b2645
GIT binary patch
literal 943
zcmV;g15o^lP)<h;3K|Lk000e1NJLTq002k;003YJ1^@s6z7jMX00001b5ch_0Itp)
z=>Px&X-PyuRCodHok4EZFc5|xAoT$3ka_{cmOX4aLbqI~n=ZRy!!3Xtu!0MK#HQ-1
zT_9EMWB!K{WyXmoY3w}L{ztN6d;BuvFJs3|s(82CM&5~;ACm4QT}gV7v@ayxh#x;C
zolANnX><7`7E1yWyD<0S>xHC~ttfpJLotU+)qU9l(zhoHr@Lr~q-+v{^IEJv&t`e~
ziC@W2&LsVo)WN|K!!6646oUi9rOHcj%tFG%om4zHB?AHoL=t@L67FuvWDL&O-7A^F
z3@5^H>)_ysB|s9Hg7Z<%J~W7Y>5|;v7#zSzZZI?9r2cwvng%onPP2gK!f6uF5;)BP
zS_-ErK#zgb44|>U%CQK<I>(c}G#DnY{jv2!Uy*lZ4IG?&u|e0PybTulyB1E>fKtGz
z7EmfURRT&0r#e8X;Zy|(53219{vdU8Zsh<mCH9<C?MkU1_4iV|vx*$$Kc!HJ_+k6K
zdn=6*DOQoA{5j%SDJt9V-S>^)T#KF4QYb|H2mt-f3<$#tk@FPbfLj0v@5+ajcyHCR
z3|Z`-2?@+UICk<vGN@}+0H_y$Q58}i!s;6~lu<lNdIenMH6S48vJemfIRqRvBZz<;
z0*;yyL_iJ!N6iQ#AcugXW&{zCL%>lpf(XbV;HViv1mqBK)Qq4F0DTY}_Fwqbb6wFN
zqYR(m+iJ1SFFj$2aJoLhx24kk_Hg77n}JUeo6+7jscncU9(=1|FSmKi!yy&|QZ)pm
zaD)W{3Yn;y6o6`*q!l0()T|w7{R*ywd`5M*SQ|mL4Kc-o>!2|B0jQT0lXQQw8Z!js
zTvY<v08nj{bbw6F+JV-u;5x`>RCkND5meg{Q#`m13WJ~PppeOQ4R7<)Yz`U%+5ph8
zCTT1$U^~00S^E*zj=2tk?bM=paEQ&otBB2LZ=2LM#1s#%gY4zzd$Ev6tcG(?jE?9C
zh=3ddj+zlfKn?*%%?KhOhk&DI1QC!!z)>@TW&pZ1ZSc|QR>k)H77_Hz(0FgkEfsCw
z4{Y#Z`{AGXcnF0L;I}4|AN|MH2-qUQLc#~|ZOGLK4Shsk?UPZpZ3H&i7y@Gc{}wiV
zK%7W!>??S!f&vRLQGyCYk{xa>K|<fbAb=xvy<kql#Enfiu&+ezfTG)H{R7x8Y=9is
R;bZ^+002ovPDHLkV1hUAqa*+T

literal 0
HcmV?d00001

diff --git a/assets/base/images/icons/video.png b/assets/base/images/icons/video.png
index ed0c2918c3dbcb9a88bda200618a2636cf26c3a5..9256f20b4fd76e7019b67cebf24ef5ed0b616795 100644
GIT binary patch
literal 1605
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
D?b+ny

literal 659
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q}r7FhzN~IEGX(zP-`d7E&m2?4jn;
zB+ZT{hZWosleNUU7YGPAgkRJWQLN@(&EfQdtxRVc%S)zJN>io?oj$i@TNOKd*Dc$O
z-}UpR%Qwt@yl{OnTN)UAyM0Ye%q`Q@_fr3|%PPH>R~(jImbsJtstIrU0qs=zpvRIQ
z+-|a8NeTGP$SSdcVY~E$#=qB@c_a)Hm~$F<KlJf$U^F|xc7s7W;XnhUG+40Ud%*Nd
z&%fy1^(k)1X59bdY56|i@Jo3I{x(KetXQ5YR}lMP9s5g(2eS^uO1}&{_?u_Phg!Cn
zr*_Qm?jJ6ZDPVli^j)&xFHra&Q20Mcc>0zr2Y~DkcFcNp^BKkWpKthouy)_vZ;b0W
z@07|H<UZg%u(feI<8_ue|L#ow2T=#^U%p#%<^Q7BjP`!Z_po1QuA8g3Ja%8oRi-%q
z>z5iGnVDlAoMY0fO9z^@xq<s$<bl8M-^{)CPUpd+a<PJq*4#V(&($?JF#9S{q^Ml%
z!{%E+;^-H(y<XkAK*d1sGPCi3{0s_%g8#4(00)bySi%7&9T4JW`Qf~4mfy0ynR;`5
zPruY|+17ad(nI?_OXmB%cih7H$42(fq3JV>UrP7PWsZA!^Ji{N-tLRP->>+zJ!3U@
zP6Hz|+njk{-W)QkdlK}1|6<u{->RKQuP-T%n|$l<g^wDtKe^wz3*<7D*Lq#Q+_}YG
z*6Z`jxLYk3ST-<lZ(#V&@nOju<}4%TIL+S;Qs*1mGo#);H1R$BuKBRW+F#FixlA_k
hTkP0B69jJhx4%2+d+V=RCor)wc)I$ztaD0e0sx;)Fw+14

diff --git a/assets/base/images/icons/word.png b/assets/base/images/icons/word.png
old mode 100644
new mode 100755
index ee4295454b8ec5a7942c9e55dea2ab8f300e00a7..abf02590af0d3698d586189b30ce020c5dbc6aec
GIT binary patch
literal 2441
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

literal 615
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(z%mREuT!C~%(jHRLHmCe+K%GJ*
zL4Lsu>;DHB)Zc$!(7#{7VgC690bhA>-75?XjORRE978G?lNK0Durgdb#T;HD(9zg7
zA?|(s&3Hknlm2%X&wIAv@TR3@YK>vmn@?O?zpnAY+Olu*>*biz-%fET_{?!_A(zkA
z&6)>{lnz)m>Brp7UaooIEXTBis`h_xEn?AEUU7q`W^1wb!IK<X?@oyB@A^>DuOQC$
z?AA|_gWJ!v#z<KFn(8iiLnUUGbi#4<54Oc2Nu@KU9NfJmY<iEC2GjnESxH`Y0l#@x
zDAuRg3bb6#3FdewrMLEshOXb{Y4W}OKjd$_p1if@Zu8=g$xml%M5<Z{<*LPm=<uEl
z`J;8>)K=T%)G0Mdub->RTlkxGPP+fXW6Q-3;Vqt1YKos9x45WfZKkiH|K_XA=@ske
z3A&w3&rx9#+4RD>Qn4~=_40-rp~7Y&D(}ta9$x(M&PAsQe;(93<eBUX;5ixpX^+a{
zDXglkPYR<gCot&o=xxyKQRTQSZ_?_>B;s83Z_gGM4Kvp5pG?BvaK$~n7{w^s;9nWy
zvr)6cB`9av4VCvyFE3_nKCiz#@{X$N<(g^IdI#S;JG`fWbKRfHmy_<Qs&2pk_L?Ch
zg91Z~gZ7R6Ycx}S?q*su$B^Mp&xQ~BhZt<xm2`A?E)**qIt1nHdCYk2&4+hC7j0<=
P#yf+jtDnm{r-UW|OT`Wo


From c5cf784c76d819f3e948e1ecf84cc1471a196c84 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Sun, 17 Nov 2019 17:02:04 -0500
Subject: [PATCH 07/16] MM-19600 Align Sidebar separator line between Teams and
 Channel view (#3559)

---
 app/components/sidebars/main/teams_list/teams_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/sidebars/main/teams_list/teams_list.js b/app/components/sidebars/main/teams_list/teams_list.js
index b882e9806..f685e392f 100644
--- a/app/components/sidebars/main/teams_list/teams_list.js
+++ b/app/components/sidebars/main/teams_list/teams_list.js
@@ -195,7 +195,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
                     height: ANDROID_TOP_PORTRAIT,
                 },
                 ios: {
-                    height: 44,
+                    height: 54,
                 },
             }),
         },

From c7cdce01fa3af580e28689826e1a4bc8734fa252 Mon Sep 17 00:00:00 2001
From: CJ <38697367+imisshtml@users.noreply.github.com>
Date: Sun, 17 Nov 2019 23:33:14 -0500
Subject: [PATCH 08/16] MM-18054 Checked for prev post comment line (#3523)

* MM-18054 Checked for prev post comment line

Added check for prev post to stop the "Commented on" line when in same thread.

* MM-18054 Added Unit Tests

Added Unit Tests

* MM-18054 Update props

Updated the prop for isFirstReply
---
 app/components/post/post.js                   |   2 +
 .../__snapshots__/post_header.test.js.snap    | 157 ++++++++++++++++++
 app/components/post_header/post_header.js     |   4 +-
 .../post_header/post_header.test.js           |  31 ++++
 4 files changed, 193 insertions(+), 1 deletion(-)

diff --git a/app/components/post/post.js b/app/components/post/post.js
index 1afd68ce4..d008271aa 100644
--- a/app/components/post/post.js
+++ b/app/components/post/post.js
@@ -254,6 +254,7 @@ export default class Post extends PureComponent {
             isLandscape,
             previousPostExists,
             beforePrevPostUserId,
+            isFirstReply,
         } = this.props;
 
         if (!post) {
@@ -305,6 +306,7 @@ export default class Post extends PureComponent {
                     theme={theme}
                     previousPostExists={previousPostExists}
                     beforePrevPostUserId={beforePrevPostUserId}
+                    isFirstReply={isFirstReply}
                 />
             );
         }
diff --git a/app/components/post_header/__snapshots__/post_header.test.js.snap b/app/components/post_header/__snapshots__/post_header.test.js.snap
index c37b24749..73b3b3730 100644
--- a/app/components/post_header/__snapshots__/post_header.test.js.snap
+++ b/app/components/post_header/__snapshots__/post_header.test.js.snap
@@ -244,6 +244,76 @@ exports[`PostHeader should match snapshot when post is from system message 1`] =
 </React.Fragment>
 `;
 
+exports[`PostHeader should match snapshot when post is same thread, so dont display Commented On 1`] = `
+<React.Fragment>
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "marginTop": 10,
+        },
+        false,
+      ]
+    }
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+        }
+      }
+    >
+      <TouchableWithFeedbackIOS
+        onPress={[Function]}
+        style={
+          Array [
+            Object {
+              "marginBottom": 3,
+              "marginRight": 5,
+              "maxWidth": "60%",
+            },
+            null,
+          ]
+        }
+        type="opacity"
+      >
+        <Text
+          ellipsizeMode="tail"
+          numberOfLines={1}
+          style={
+            Object {
+              "color": "#3d3c40",
+              "flexGrow": 1,
+              "fontSize": 15,
+              "fontWeight": "600",
+              "paddingVertical": 2,
+            }
+          }
+        >
+          John Smith
+        </Text>
+      </TouchableWithFeedbackIOS>
+      <FormattedTime
+        hour12={true}
+        style={
+          Object {
+            "color": "#3d3c40",
+            "flex": 1,
+            "fontSize": 12,
+            "marginTop": 5,
+            "opacity": 0.5,
+          }
+        }
+        timeZone=""
+        value={0}
+      />
+    </View>
+  </View>
+</React.Fragment>
+`;
+
 exports[`PostHeader should match snapshot when post isBot and shouldRenderReplyButton 1`] = `
 <React.Fragment>
   <View
@@ -396,6 +466,93 @@ exports[`PostHeader should match snapshot when post isBot and shouldRenderReplyB
 </React.Fragment>
 `;
 
+exports[`PostHeader should match snapshot when post renders Commented On for new post 1`] = `
+<React.Fragment>
+  <View
+    style={
+      Array [
+        Object {
+          "flex": 1,
+          "marginTop": 10,
+        },
+        false,
+      ]
+    }
+  >
+    <View
+      style={
+        Object {
+          "flex": 1,
+          "flexDirection": "row",
+        }
+      }
+    >
+      <TouchableWithFeedbackIOS
+        onPress={[Function]}
+        style={
+          Array [
+            Object {
+              "marginBottom": 3,
+              "marginRight": 5,
+              "maxWidth": "60%",
+            },
+            null,
+          ]
+        }
+        type="opacity"
+      >
+        <Text
+          ellipsizeMode="tail"
+          numberOfLines={1}
+          style={
+            Object {
+              "color": "#3d3c40",
+              "flexGrow": 1,
+              "fontSize": 15,
+              "fontWeight": "600",
+              "paddingVertical": 2,
+            }
+          }
+        >
+          John Smith
+        </Text>
+      </TouchableWithFeedbackIOS>
+      <FormattedTime
+        hour12={true}
+        style={
+          Object {
+            "color": "#3d3c40",
+            "flex": 1,
+            "fontSize": 12,
+            "marginTop": 5,
+            "opacity": 0.5,
+          }
+        }
+        timeZone=""
+        value={0}
+      />
+    </View>
+  </View>
+  <FormattedText
+    defaultMessage="Commented on {name}{apostrophe} message: "
+    id="post_body.commentedOn"
+    style={
+      Object {
+        "color": "rgba(61,60,64,0.65)",
+        "lineHeight": 21,
+        "marginBottom": 3,
+      }
+    }
+    values={
+      Object {
+        "apostrophe": "'s",
+        "name": "John Doe",
+      }
+    }
+  />
+</React.Fragment>
+`;
+
 exports[`PostHeader should match snapshot when post should display reply button 1`] = `
 <React.Fragment>
   <View
diff --git a/app/components/post_header/post_header.js b/app/components/post_header/post_header.js
index 7b2841f59..d65da16f6 100644
--- a/app/components/post_header/post_header.js
+++ b/app/components/post_header/post_header.js
@@ -46,6 +46,7 @@ export default class PostHeader extends PureComponent {
         previousPostExists: PropTypes.bool,
         post: PropTypes.object,
         beforePrevPostUserId: PropTypes.string,
+        isFirstReply: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -68,8 +69,9 @@ export default class PostHeader extends PureComponent {
             previousPostExists,
             renderReplies,
             theme,
+            isFirstReply,
         } = this.props;
-        if (!renderReplies || !commentedOnDisplayName || (!previousPostExists && post.user_id === beforePrevPostUserId)) {
+        if (!isFirstReply || !renderReplies || !commentedOnDisplayName || (!previousPostExists && post.user_id === beforePrevPostUserId)) {
             return null;
         }
 
diff --git a/app/components/post_header/post_header.test.js b/app/components/post_header/post_header.test.js
index 2baab41c1..bfd9f4fde 100644
--- a/app/components/post_header/post_header.test.js
+++ b/app/components/post_header/post_header.test.js
@@ -35,6 +35,7 @@ describe('PostHeader', () => {
         post: {id: 'post'},
         beforePrevPostUserId: '0',
         onPress: jest.fn(),
+        isFirstReply: true,
     };
 
     test('should match snapshot when just a base post', () => {
@@ -95,4 +96,34 @@ describe('PostHeader', () => {
         expect(wrapper.getElement()).toMatchSnapshot();
         expect(wrapper.find('#ReplyIcon').exists()).toEqual(false);
     });
+
+    test('should match snapshot when post renders Commented On for new post', () => {
+        const props = {
+            ...baseProps,
+            isFirstReply: true,
+            renderReplies: true,
+            commentedOnDisplayName: 'John Doe',
+            previousPostExists: true,
+        };
+
+        const wrapper = shallow(
+            <PostHeader {...props}/>
+        );
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
+    test('should match snapshot when post is same thread, so dont display Commented On', () => {
+        const props = {
+            ...baseProps,
+            isFirstReply: false,
+            renderReplies: true,
+            commentedOnDisplayName: 'John Doe',
+            previousPostExists: true,
+        };
+
+        const wrapper = shallow(
+            <PostHeader {...props}/>
+        );
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
 });
\ No newline at end of file

From a1c8a4691e250d15bd701531654489c1caa2a86f Mon Sep 17 00:00:00 2001
From: Kaiden Sin <ksnz93@gmail.com>
Date: Mon, 18 Nov 2019 12:34:39 +0800
Subject: [PATCH 09/16] [mm 15792] Fix massive app slowdown with many emojis
 (#3209)

* [MM-16593] [MM-17175] [MM-17164] [MM-17189] [MM-17181] Android - Upgrade to RN 0.60 (#3145)

* Upgrade to react-native 0.60

* Use @sentry/react-native

* Manually link @sentry/react-native

* Address review comments

* Jetify after install

* Call jetify from node_modules

* Run npm install react-native-fast-image --save

* Link react-native-fast-image for Android

* Link react-native-fast-image to iOS Pod

* Replace Image with FastImage in emoji.js and remove redundant caching

* Remove duplicate sentry gradle

* Feedback review

* Remove FastImage and Sentry from the Podfile
---
 android/app/build.gradle                      |    1 +
 .../mattermost/rnbeta/MainApplication.java    |    2 +
 android/settings.gradle                       |    2 +
 app/components/emoji/emoji.js                 |    3 +-
 ios/Mattermost.xcodeproj/project.pbxproj      |   54 +-
 ios/Podfile.lock                              |   29 +
 package-lock.json                             | 1155 ++++++++++-------
 package.json                                  |    1 +
 8 files changed, 778 insertions(+), 469 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2f38a30ed..6bf0a8c38 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -268,6 +268,7 @@ dependencies {
     implementation project(':react-native-android-open-settings')
     implementation project(':react-native-haptic-feedback')
 
+    implementation project(':react-native-fast-image')
     // For animated GIF support
     implementation 'com.facebook.fresco:fresco:2.0.0'
     implementation 'com.facebook.fresco:animated-gif:2.0.0'
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 38eb0ee70..852efb43e 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -31,6 +31,7 @@ import com.reactnativecommunity.asyncstorage.AsyncStorageModule;
 import com.reactnativecommunity.netinfo.NetInfoModule;
 import com.reactnativecommunity.webview.RNCWebViewPackage;
 import io.sentry.RNSentryModule;
+import com.dylanvann.fastimage.FastImageViewPackage;
 import com.levelasquez.androidopensettings.AndroidOpenSettings;
 import com.mkuczera.RNReactNativeHapticFeedbackModule;
 
@@ -192,6 +193,7 @@ public class MainApplication extends NavigationApplication implements INotificat
                 };
               }
             },
+            new FastImageViewPackage(),
             new RNCWebViewPackage(),
             new SvgPackage(),
             new LinearGradientPackage(),
diff --git a/android/settings.gradle b/android/settings.gradle
index baaaf279c..d5c0323b4 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -3,6 +3,8 @@ include ':@sentry_react-native'
 project(':@sentry_react-native').projectDir = new File(rootProject.projectDir, '../node_modules/@sentry/react-native/android')
 include ':react-native-android-open-settings'
 project(':react-native-android-open-settings').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-android-open-settings/android')
+include ':react-native-fast-image'
+project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
 include ':react-native-haptic-feedback'
 project(':react-native-haptic-feedback').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-haptic-feedback/android')
 include ':react-native-gesture-handler'
diff --git a/app/components/emoji/emoji.js b/app/components/emoji/emoji.js
index 6f467fe3b..841070c8f 100644
--- a/app/components/emoji/emoji.js
+++ b/app/components/emoji/emoji.js
@@ -9,6 +9,7 @@ import {
     StyleSheet,
     Text,
 } from 'react-native';
+import FastImage from 'react-native-fast-image';
 
 import CustomPropTypes from 'app/constants/custom_prop_types';
 import ImageCacheManager from 'app/utils/image_cache_manager';
@@ -140,7 +141,7 @@ export default class Emoji extends React.PureComponent {
         }
 
         return (
-            <Image
+            <FastImage
                 key={key}
                 style={{width, height}}
                 source={{uri: imageUrl}}
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index 5b90b036a..096c2fc0c 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* MattermostTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* MattermostTests.m */; };
 		0111A42B7F264BCF8CBDE3ED /* OpenSans-ExtraBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FBBEC29EE2D3418D9AC33BD5 /* OpenSans-ExtraBoldItalic.ttf */; };
@@ -266,6 +265,7 @@
 		D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Bold.ttf"; path = "../assets/fonts/OpenSans-Bold.ttf"; sourceTree = "<group>"; };
 		EB4F0DF36537B0B21BE962FB /* Pods-Mattermost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost.debug.xcconfig"; path = "Target Support Files/Pods-Mattermost/Pods-Mattermost.debug.xcconfig"; sourceTree = "<group>"; };
 		FBBEC29EE2D3418D9AC33BD5 /* OpenSans-ExtraBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-ExtraBoldItalic.ttf"; path = "../assets/fonts/OpenSans-ExtraBoldItalic.ttf"; sourceTree = "<group>"; };
+		81061F4CBB31484A94D5A8EE /* libz.tbd */ = {isa = PBXFileReference; name = "libz.tbd"; path = "usr/lib/libz.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -815,6 +815,58 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		1D22DC6FC0A37F7F657B8274 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Mattermost/Pods-Mattermost-resources.sh",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-youtube/assets/YTPlayerView-iframe-player.html",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/YTPlayerView-iframe-player.html",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Mattermost/Pods-Mattermost-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		AE4769B235D14E6C9C64EA78 /* Upload Debug Symbols to Sentry */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2cf1c1e62..b90ad2810 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -25,6 +25,15 @@ PODS:
     - React
   - KeyboardTrackingView (5.5.0):
     - React
+  - libwebp (1.0.3):
+    - libwebp/demux (= 1.0.3)
+    - libwebp/mux (= 1.0.3)
+    - libwebp/webp (= 1.0.3)
+  - libwebp/demux (1.0.3):
+    - libwebp/webp
+  - libwebp/mux (1.0.3):
+    - libwebp/demux
+  - libwebp/webp (1.0.3)
   - RCTRequired (0.61.2)
   - RCTTypeSafety (0.61.2):
     - FBLazyVector (= 0.61.2)
@@ -259,6 +268,10 @@ PODS:
     - React
   - RNDeviceInfo (2.1.2):
     - React
+  - RNFastImage (7.0.2):
+    - React
+    - SDWebImage (~> 5.0)
+    - SDWebImageWebPCoder (~> 0.2.3)
   - RNGestureHandler (1.4.1):
     - React
   - RNKeychain (4.0.1):
@@ -274,6 +287,12 @@ PODS:
     - React
   - RNVectorIcons (6.6.0):
     - React
+  - SDWebImage (5.2.2):
+    - SDWebImage/Core (= 5.2.2)
+  - SDWebImage/Core (5.2.2)
+  - SDWebImageWebPCoder (0.2.5):
+    - libwebp (~> 1.0)
+    - SDWebImage/Core (~> 5.0)
   - Sentry (4.4.0):
     - Sentry/Core (= 4.4.0)
   - Sentry/Core (4.4.0)
@@ -329,6 +348,7 @@ DEPENDENCIES:
   - rn-fetch-blob (from `../node_modules/rn-fetch-blob`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
+  - RNFastImage (from `../node_modules/react-native-fast-image`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
   - RNReactNativeDocViewer (from `../node_modules/react-native-doc-viewer`)
@@ -343,6 +363,9 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - boost-for-react-native
+    - libwebp
+    - SDWebImage
+    - SDWebImageWebPCoder
     - Sentry
     - Swime
     - XCDYouTubeKit
@@ -435,6 +458,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/async-storage"
   RNDeviceInfo:
     :path: "../node_modules/react-native-device-info"
+  RNFastImage:
+    :path: "../node_modules/react-native-fast-image"
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
   RNKeychain:
@@ -462,6 +487,7 @@ SPEC CHECKSUMS:
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
   jail-monkey: 0830c18bb6f085938a4c8529d554f9b29230a5a4
   KeyboardTrackingView: d4d7236123b401ed9b1e02869e7943117740c522
+  libwebp: 057912d6d0abfb6357d8bb05c0ea470301f5d61e
   RCTRequired: c639d59ed389cfb1f1203f65c2ea946d8ec586e2
   RCTTypeSafety: dc23fb655d6c77667c78e327bf661bc11e3b8aec
   RCTYouTube: a36b9960e040063877fb8dc61fff19d3bd1a97ff
@@ -497,6 +523,7 @@ SPEC CHECKSUMS:
   rn-fetch-blob: 3258c6483235bb7daf16cf921306ffb18406071f
   RNCAsyncStorage: 5ae4d57458804e99f73d427214442a6b10a53856
   RNDeviceInfo: fd8296de6fca8b743cdc499b896f48e8a9f1faf5
+  RNFastImage: 9b0c22643872bb7494c8d87bbbb66cc4c0d9e7a2
   RNGestureHandler: 4cb47a93019c1a201df2644413a0a1569a51c8aa
   RNKeychain: 45dbd50d1ac4bd42c3740f76ffb135abf05746d0
   RNReactNativeDocViewer: 571c6ac38483531b8fb521d02a6ba54652ed10a7
@@ -504,6 +531,8 @@ SPEC CHECKSUMS:
   RNSentry: 2803ba8c8129dcf26b79e9b4d8c80168be6e4390
   RNSVG: be27aa7c58819f97399388ae53d7fa0572f32c7f
   RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
+  SDWebImage: 5fcdb02cc35e05fc35791ec514b191d27189f872
+  SDWebImageWebPCoder: 947093edd1349d820c40afbd9f42acb6cdecd987
   Sentry: 26650184fe71eb7476dfd2737acb5ea6cc64b4b1
   Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
   XCDYouTubeKit: 4ca4e3322fa556ec1c32932d378365c15ce1386e
diff --git a/package-lock.json b/package-lock.json
index c3e558540..9fe3dd749 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,6 +48,7 @@
       "version": "7.6.4",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.4.tgz",
       "integrity": "sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.5.5",
         "@babel/generator": "^7.6.4",
@@ -69,6 +70,7 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
@@ -76,21 +78,23 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         }
       }
     },
     "@babel/generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.4.tgz",
-      "integrity": "sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz",
+      "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==",
       "requires": {
-        "@babel/types": "^7.6.3",
+        "@babel/types": "^7.7.2",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.13",
         "source-map": "^0.5.0"
@@ -104,134 +108,143 @@
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
-      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz",
+      "integrity": "sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
-      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz",
+      "integrity": "sha512-Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-explode-assignable-expression": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-builder-react-jsx": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz",
-      "integrity": "sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.0.tgz",
+      "integrity": "sha512-LSln3cexwInTMYYoFeVLKnYPPMfWNJ8PubTBs3hkh7wCu9iBaqq1OOyW+xGmEdLxT1nhsl+9SJ+h2oUDYz0l2A==",
       "requires": {
-        "@babel/types": "^7.3.0",
+        "@babel/types": "^7.7.0",
         "esutils": "^2.0.0"
       }
     },
     "@babel/helper-call-delegate": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
-      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz",
+      "integrity": "sha512-Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw==",
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/helper-hoist-variables": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz",
-      "integrity": "sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz",
+      "integrity": "sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-member-expression-to-functions": "^7.5.5",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-function-name": "^7.7.0",
+        "@babel/helper-member-expression-to-functions": "^7.7.0",
+        "@babel/helper-optimise-call-expression": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.5.5",
-        "@babel/helper-split-export-declaration": "^7.4.4"
+        "@babel/helper-replace-supers": "^7.7.0",
+        "@babel/helper-split-export-declaration": "^7.7.0"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz",
+      "integrity": "sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==",
+      "requires": {
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
-      "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz",
+      "integrity": "sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.5.5",
+        "@babel/helper-function-name": "^7.7.0",
+        "@babel/types": "^7.7.0",
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
-      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz",
+      "integrity": "sha512-CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg==",
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz",
+      "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==",
       "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-get-function-arity": "^7.7.0",
+        "@babel/template": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz",
+      "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
-      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz",
+      "integrity": "sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==",
       "requires": {
-        "@babel/types": "^7.4.4"
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
-      "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz",
+      "integrity": "sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==",
       "requires": {
-        "@babel/types": "^7.5.5"
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
-      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz",
+      "integrity": "sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
-      "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz",
+      "integrity": "sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==",
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/template": "^7.4.4",
-        "@babel/types": "^7.5.5",
+        "@babel/helper-module-imports": "^7.7.0",
+        "@babel/helper-simple-access": "^7.7.0",
+        "@babel/helper-split-export-declaration": "^7.7.0",
+        "@babel/template": "^7.7.0",
+        "@babel/types": "^7.7.0",
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
-      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz",
+      "integrity": "sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-plugin-utils": {
@@ -248,64 +261,64 @@
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
-      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz",
+      "integrity": "sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-wrap-function": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.7.0",
+        "@babel/helper-wrap-function": "^7.7.0",
+        "@babel/template": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
-      "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz",
+      "integrity": "sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==",
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.5.5",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5"
+        "@babel/helper-member-expression-to-functions": "^7.7.0",
+        "@babel/helper-optimise-call-expression": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
-      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz",
+      "integrity": "sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==",
       "requires": {
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/template": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz",
+      "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==",
       "requires": {
-        "@babel/types": "^7.4.4"
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helper-wrap-function": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
-      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz",
+      "integrity": "sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.2.0"
+        "@babel/helper-function-name": "^7.7.0",
+        "@babel/template": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/helpers": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
-      "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.0.tgz",
+      "integrity": "sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==",
       "requires": {
-        "@babel/template": "^7.6.0",
-        "@babel/traverse": "^7.6.2",
-        "@babel/types": "^7.6.0"
+        "@babel/template": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/highlight": {
@@ -319,9 +332,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.4.tgz",
-      "integrity": "sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A=="
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz",
+      "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A=="
     },
     "@babel/plugin-external-helpers": {
       "version": "7.2.0",
@@ -332,29 +345,29 @@
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
-      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz",
+      "integrity": "sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/helper-remap-async-to-generator": "^7.7.0",
         "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz",
-      "integrity": "sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz",
+      "integrity": "sha512-tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.5.5",
+        "@babel/helper-create-class-features-plugin": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
-      "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz",
+      "integrity": "sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -417,14 +430,13 @@
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz",
-      "integrity": "sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz",
+      "integrity": "sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.7.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -461,9 +473,9 @@
       }
     },
     "@babel/plugin-syntax-flow": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz",
-      "integrity": "sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.0.tgz",
+      "integrity": "sha512-vQMV07p+L+jZeUnvX3pEJ9EiXGCjB5CTTvsirFD9rpEuATnoAvLBLoYbw1v5tyn3d2XxSuvEKi8cV3KqYUa0vQ==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
@@ -534,13 +546,13 @@
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
-      "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz",
+      "integrity": "sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==",
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-module-imports": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0"
+        "@babel/helper-remap-async-to-generator": "^7.7.0"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
@@ -561,17 +573,17 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
-      "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz",
+      "integrity": "sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.5.5",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-annotate-as-pure": "^7.7.0",
+        "@babel/helper-define-map": "^7.7.0",
+        "@babel/helper-function-name": "^7.7.0",
+        "@babel/helper-optimise-call-expression": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.5.5",
-        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/helper-replace-supers": "^7.7.0",
+        "@babel/helper-split-export-declaration": "^7.7.0",
         "globals": "^11.1.0"
       }
     },
@@ -592,14 +604,13 @@
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz",
-      "integrity": "sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz",
+      "integrity": "sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.7.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
@@ -638,11 +649,11 @@
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
-      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz",
+      "integrity": "sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-function-name": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
@@ -674,44 +685,44 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
-      "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz",
+      "integrity": "sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-module-transforms": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-simple-access": "^7.7.0",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
-      "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz",
+      "integrity": "sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-hoist-variables": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
-      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz",
+      "integrity": "sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-module-transforms": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz",
-      "integrity": "sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz",
+      "integrity": "sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==",
       "dev": true,
       "requires": {
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.7.0"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -767,11 +778,11 @@
       }
     },
     "@babel/plugin-transform-react-jsx": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz",
-      "integrity": "sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.0.tgz",
+      "integrity": "sha512-mXhBtyVB1Ujfy+0L6934jeJcSXj/VCg6whZzEcgiiZHNS0PGC7vUCsZDQCxxztkpIdF+dY1fUMcjAgEOC3ZOMQ==",
       "requires": {
-        "@babel/helper-builder-react-jsx": "^7.3.0",
+        "@babel/helper-builder-react-jsx": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-syntax-jsx": "^7.2.0"
       }
@@ -786,9 +797,9 @@
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
-      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz",
+      "integrity": "sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==",
       "requires": {
         "regenerator-transform": "^0.14.0"
       }
@@ -864,23 +875,22 @@
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz",
-      "integrity": "sha512-aiWINBrPMSC3xTXRNM/dfmyYuPNKY/aexYqBgh0HBI5Y+WO5oRAqW/oROYeYHrF4Zw12r9rK4fMk/ZlAmqx/FQ==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.2.tgz",
+      "integrity": "sha512-UWhDaJRqdPUtdK1s0sKYdoRuqK0NepjZto2UZltvuCgMoMZmdjhgz5hcRokie/3aYEaSz3xvusyoayVaq4PjRg==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.6.0",
+        "@babel/helper-create-class-features-plugin": "^7.7.0",
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-syntax-typescript": "^7.2.0"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz",
-      "integrity": "sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz",
+      "integrity": "sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.7.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/preset-env": {
@@ -953,6 +963,7 @@
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.6.2.tgz",
       "integrity": "sha512-xgZk2LRZvt6i2SAUWxc7ellk4+OYRgS3Zpsnr13nMS1Qo25w21Uu8o6vTOAqNaxiqrnv30KTYzh9YWY2k21CeQ==",
+      "dev": true,
       "requires": {
         "find-cache-dir": "^2.0.0",
         "lodash": "^4.17.13",
@@ -970,26 +981,26 @@
       }
     },
     "@babel/template": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
-      "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz",
+      "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.6.0",
-        "@babel/types": "^7.6.0"
+        "@babel/parser": "^7.7.0",
+        "@babel/types": "^7.7.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.3.tgz",
-      "integrity": "sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz",
+      "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==",
       "requires": {
         "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.6.3",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.6.3",
-        "@babel/types": "^7.6.3",
+        "@babel/generator": "^7.7.2",
+        "@babel/helper-function-name": "^7.7.0",
+        "@babel/helper-split-export-declaration": "^7.7.0",
+        "@babel/parser": "^7.7.2",
+        "@babel/types": "^7.7.2",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
@@ -1006,9 +1017,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
-      "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz",
+      "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==",
       "requires": {
         "esutils": "^2.0.2",
         "lodash": "^4.17.13",
@@ -1042,9 +1053,9 @@
       "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
     },
     "@hapi/hoek": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.2.tgz",
-      "integrity": "sha512-NP5SG4bzix+EtSMtcudp8TvI0lB46mXNo8uFpTDw6tqxGx4z5yx+giIunEFA0Z7oUO4DuWrOJV9xqR2tJVEdyA=="
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz",
+      "integrity": "sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw=="
     },
     "@hapi/joi": {
       "version": "15.1.1",
@@ -1340,9 +1351,9 @@
       },
       "dependencies": {
         "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+          "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==",
           "requires": {
             "react-is": "^16.7.0"
           }
@@ -1360,9 +1371,9 @@
       },
       "dependencies": {
         "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+          "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==",
           "requires": {
             "react-is": "^16.7.0"
           }
@@ -1370,20 +1381,20 @@
       }
     },
     "@sentry/browser": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.7.1.tgz",
-      "integrity": "sha512-K0x1XhsHS8PPdtlVOLrKZyYvi5Vexs9WApdd214bO6KaGF296gJvH1mG8XOY0+7aA5i2A7T3ttcaJNDYS49lzw==",
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.9.0.tgz",
+      "integrity": "sha512-KTpmAau98QyJZtoV7LVYEFd1cdKQGk5yHlRyP3pCkhDcRbgicBNR3umdRDpsI5Ozgix3zNlyQprz0iQPmrPNRQ==",
       "requires": {
-        "@sentry/core": "5.7.1",
+        "@sentry/core": "5.8.0",
         "@sentry/types": "5.7.1",
-        "@sentry/utils": "5.7.1",
+        "@sentry/utils": "5.8.0",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/cli": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.48.0.tgz",
-      "integrity": "sha512-Td6UpZP6BoI0R5Guctiq3NIphAfskbyeiboWx4H1yuXPA9p4F0hL+Hrz6k3NNfzkt3AQzEkeAhvpKmIfmUOkjA==",
+      "version": "1.49.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.49.0.tgz",
+      "integrity": "sha512-Augz7c42Cxz/xWQ/NOVjUGePKVA370quvskWbCICMUwxcTvKnCLI+7KDdzEoCexj4MSuxFfBzLnrrn4w2+c9TQ==",
       "requires": {
         "fs-copy-file-sync": "^1.1.1",
         "https-proxy-agent": "^3.0.0",
@@ -1394,43 +1405,43 @@
       }
     },
     "@sentry/core": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.7.1.tgz",
-      "integrity": "sha512-AOn3k3uVWh2VyajcHbV9Ta4ieDIeLckfo7UMLM+CTk2kt7C89SayDGayJMSsIrsZlL4qxBoLB9QY4W2FgAGJrg==",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.8.0.tgz",
+      "integrity": "sha512-aAh2KLidIXJVGrxmHSVq2eVKbu7tZiYn5ylW6yzJXFetS5z4MA+JYaSBaG2inVYDEEqqMIkb17TyWxxziUDieg==",
       "requires": {
-        "@sentry/hub": "5.7.1",
-        "@sentry/minimal": "5.7.1",
+        "@sentry/hub": "5.8.0",
+        "@sentry/minimal": "5.8.0",
         "@sentry/types": "5.7.1",
-        "@sentry/utils": "5.7.1",
+        "@sentry/utils": "5.8.0",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/hub": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.7.1.tgz",
-      "integrity": "sha512-evGh323WR073WSBCg/RkhlUmCQyzU0xzBzCZPscvcoy5hd4SsLE6t9Zin+WACHB9JFsRQIDwNDn+D+pj3yKsig==",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.8.0.tgz",
+      "integrity": "sha512-VdApn1ZCNwH1wwQwoO6pu53PM/qgHG+DQege0hbByluImpLBhAj9w50nXnF/8KzV4UoMIVbzCb6jXzMRmqqp9A==",
       "requires": {
         "@sentry/types": "5.7.1",
-        "@sentry/utils": "5.7.1",
+        "@sentry/utils": "5.8.0",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/integrations": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.7.1.tgz",
-      "integrity": "sha512-LMKVVfB4VlpPE5I8OyD2soj/iNaicnpWObpBxfPDfsJAnXo5sV7zkWwEfvCia2dcXCXkpE2Xz77tiZubK7zrMQ==",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.8.0.tgz",
+      "integrity": "sha512-Obe3GqTtq63PAJ4opYEbeZ6Bm8uw+CND+7MywJLDguqnvIVRvxpcJIZ6wxcE/VjbU3OMkNmTMnM+ra8RB7Wj6w==",
       "requires": {
         "@sentry/types": "5.7.1",
-        "@sentry/utils": "5.7.1",
+        "@sentry/utils": "5.8.0",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/minimal": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.7.1.tgz",
-      "integrity": "sha512-nS/Dg+jWAZtcxQW8wKbkkw4dYvF6uyY/vDiz/jFCaux0LX0uhgXAC9gMOJmgJ/tYBLJ64l0ca5LzpZa7BMJQ0g==",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.8.0.tgz",
+      "integrity": "sha512-MIlFOgd+JvAUrBBmq7vr9ovRH1HvckhnwzHdoUPpKRBN+rQgTyZy1o6+kA2fASCbrRqFCP+Zk7EHMACKg8DpIw==",
       "requires": {
-        "@sentry/hub": "5.7.1",
+        "@sentry/hub": "5.8.0",
         "@sentry/types": "5.7.1",
         "tslib": "^1.9.3"
       }
@@ -1454,9 +1465,9 @@
       "integrity": "sha512-tbUnTYlSliXvnou5D4C8Zr+7/wJrHLbpYX1YkLXuIJRU0NSi81bHMroAuHWILcQKWhVjaV/HZzr7Y/hhWtbXVQ=="
     },
     "@sentry/utils": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.7.1.tgz",
-      "integrity": "sha512-nhirUKj/qFLsR1i9kJ5BRvNyzdx/E2vorIsukuDrbo8e3iZ11JMgCOVrmC8Eq9YkHBqgwX4UnrPumjFyvGMZ2Q==",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.8.0.tgz",
+      "integrity": "sha512-KDxUvBSYi0/dHMdunbxAxD3389pcQioLtcO6CI6zt/nJXeVFolix66cRraeQvqupdLhvOk/el649W4fCPayTHw==",
       "requires": {
         "@sentry/types": "5.7.1",
         "tslib": "^1.9.3"
@@ -1489,9 +1500,9 @@
       }
     },
     "@snyk/cocoapods-lockfile-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-2.0.4.tgz",
-      "integrity": "sha512-d57bajPjqCiNXMuyMmt9Zt98zbjABZUFw+91B705flzV6oB7OThgtA40Eoin6iatYoStIx28bC3T6b0mScy/iA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.0.0.tgz",
+      "integrity": "sha512-AebCc+v9vtOL9tFkU4/tommgVsXxqdx6t45kCkBW+FC4PaYvfYEg9Eg/9GqlY9+nFrLFo/uTr+E/aR0AF/KqYA==",
       "requires": {
         "@snyk/dep-graph": "^1.11.0",
         "@snyk/ruby-semver": "^2.0.4",
@@ -1503,9 +1514,9 @@
       }
     },
     "@snyk/composer-lockfile-parser": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.3.tgz",
-      "integrity": "sha512-hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.2.0.tgz",
+      "integrity": "sha512-kZT+HTqgNcQMeoE5NM9M3jj463M8zI7ZxqZXLw9WoyVs5JTt9g0qFWxIG1cNwZdGVI+y7tzZbNWw9BlMD1vCCQ==",
       "requires": {
         "lodash": "^4.17.13"
       }
@@ -1537,13 +1548,13 @@
       }
     },
     "@snyk/snyk-cocoapods-plugin": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-1.0.3.tgz",
-      "integrity": "sha512-AHAA7z23nPi1eHODsDxeSkl73Ze3yphuqJjMl39ie323EzBDcb9g6uAACrk0Qn2K/K2D8uyxMAf2zDtc+JGQfw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.0.1.tgz",
+      "integrity": "sha512-XVkvaMvMzQ3miJi/YZmsRJSAUfDloYhfg6pXPgzAeAugB4p+cNi01Z68pT62ypB8U/Ugh1Xx2pb9aoOFqBbSjA==",
       "requires": {
         "@snyk/cli-interface": "1.5.0",
-        "@snyk/cocoapods-lockfile-parser": "2.0.4",
-        "@snyk/dep-graph": "1.13.0",
+        "@snyk/cocoapods-lockfile-parser": "3.0.0",
+        "@snyk/dep-graph": "^1.13.1",
         "source-map-support": "^0.5.7",
         "tslib": "^1.9.3"
       },
@@ -1555,19 +1566,6 @@
           "requires": {
             "tslib": "^1.9.3"
           }
-        },
-        "@snyk/dep-graph": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.13.0.tgz",
-          "integrity": "sha512-e0XcLH6Kgs/lunf6iDjbxEnm9+JYFEJn6eo/PlEUW+SMWBZ2uEXHBTDNp9oxjJou48PngzWMveEkniBAN+ulOQ==",
-          "requires": {
-            "graphlib": "^2.1.5",
-            "lodash": "^4.7.14",
-            "object-hash": "^1.3.1",
-            "semver": "^6.0.0",
-            "source-map-support": "^0.5.11",
-            "tslib": "^1.9.3"
-          }
         }
       }
     },
@@ -1681,9 +1679,9 @@
       }
     },
     "@types/node": {
-      "version": "12.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.7.tgz",
-      "integrity": "sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA=="
+      "version": "12.12.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.7.tgz",
+      "integrity": "sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w=="
     },
     "@types/node-notifier": {
       "version": "5.4.0",
@@ -1803,9 +1801,9 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
     },
     "abab": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz",
-      "integrity": "sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
+      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
       "dev": true
     },
     "abbrev": {
@@ -2440,9 +2438,9 @@
       }
     },
     "big-integer": {
-      "version": "1.6.47",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.47.tgz",
-      "integrity": "sha512-9t9f7X3as2XGX8b52GqG6ox0GvIdM86LyIXASJnDCFhYNgt+A+MByQZ3W2PyMRZjEvG5f8TEbSPfEotVuMJnQg=="
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="
     },
     "big.js": {
       "version": "5.2.2",
@@ -2524,19 +2522,19 @@
       }
     },
     "bplist-creator": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz",
-      "integrity": "sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=",
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
+      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
       "requires": {
         "stream-buffers": "~2.2.0"
       }
     },
     "bplist-parser": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
-      "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
       "requires": {
-        "big-integer": "^1.6.7"
+        "big-integer": "^1.6.44"
       }
     },
     "brace-expansion": {
@@ -2726,9 +2724,9 @@
       "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
     },
     "caniuse-lite": {
-      "version": "1.0.30001005",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001005.tgz",
-      "integrity": "sha512-g78miZm1Z5njjYR216a5812oPiLgV1ssndgGxITHWUopmjUrCswMisA0a2kSB7a0vZRox6JOKhM51+efmYN8Mg==",
+      "version": "1.0.30001010",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001010.tgz",
+      "integrity": "sha512-RA5GH9YjFNea4ZQszdWgh2SC+dpLiRAg4VDQS2b5JRI45OxmbGrYocYHTa9x0bKMQUE7uvHkNPNffUr+pCxSGw==",
       "dev": true
     },
     "capture-exit": {
@@ -3138,9 +3136,9 @@
       }
     },
     "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
       "requires": {
         "safe-buffer": "~5.1.1"
       }
@@ -3156,9 +3154,9 @@
       "integrity": "sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg=="
     },
     "core-js-compat": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.3.4.tgz",
-      "integrity": "sha512-7OK3/LPP8R3Ovasf3GilEOp+o1w0ZKJ75FMou2RDfTwIV69G5RkKCGFnqgBv/ZhR6xo9GCzlfVALyHmydbE7DA==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.1.tgz",
+      "integrity": "sha512-YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw==",
       "dev": true,
       "requires": {
         "browserslist": "^4.7.2",
@@ -3358,9 +3356,9 @@
       }
     },
     "dayjs": {
-      "version": "1.8.16",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.16.tgz",
-      "integrity": "sha512-XPmqzWz/EJiaRHjBqSJ2s6hE/BUoCIHKgdS2QPtTQtKcS9E4/Qn0WomoH1lXanWCzri+g7zPcuNV4aTZ8PMORQ=="
+      "version": "1.8.17",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.17.tgz",
+      "integrity": "sha512-47VY/htqYqr9GHd7HW/h56PpQzRBSJcxIQFwqL3P20bMF/3az5c3PWdVY3LmPXFl6cQCYHL7c79b9ov+2bOBbw=="
     },
     "debounce": {
       "version": "1.2.0",
@@ -3708,9 +3706,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.296",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz",
-      "integrity": "sha512-s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ==",
+      "version": "1.3.306",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz",
+      "integrity": "sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A==",
       "dev": true
     },
     "email-validator": {
@@ -3848,9 +3846,9 @@
       }
     },
     "enzyme-matchers": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-7.1.1.tgz",
-      "integrity": "sha512-fw/FxwpEg6n1KYpEHnhA44iFduYHDUVVePXSMmf883q/JDMXb+sIU55maSw2oFWqt9zd7rcGqmSV8sHQO5pReg==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-7.1.2.tgz",
+      "integrity": "sha512-03WqAg2XDl7id9rARIO97HQ1JIw9F2heJ3R4meGu/13hx0ULTDEgl0E67MGl2Uq1jq1DyRnJfto1/VSzskdV5A==",
       "dev": true,
       "requires": {
         "circular-json-es6": "^2.0.1",
@@ -3926,9 +3924,9 @@
       }
     },
     "es-to-primitive": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "requires": {
         "is-callable": "^1.1.4",
         "is-date-object": "^1.0.1",
@@ -4047,9 +4045,9 @@
           }
         },
         "import-fresh": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
-          "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+          "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
           "dev": true,
           "requires": {
             "parent-module": "^1.0.0",
@@ -4209,9 +4207,9 @@
       "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
     },
     "exec-sh": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
-      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A=="
     },
     "execa": {
       "version": "1.0.0",
@@ -4491,6 +4489,27 @@
         "through2": "^2.0.0"
       },
       "dependencies": {
+        "@babel/core": {
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz",
+          "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==",
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.7.2",
+            "@babel/helpers": "^7.7.0",
+            "@babel/parser": "^7.7.2",
+            "@babel/template": "^7.7.0",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.7.2",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          }
+        },
         "core-js": {
           "version": "2.6.10",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
@@ -4506,6 +4525,14 @@
             "which": "^1.2.9"
           }
         },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
         "lru-cache": {
           "version": "4.1.5",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -4520,6 +4547,11 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
         "yallist": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
@@ -5490,9 +5522,9 @@
       }
     },
     "glob": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
-      "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5628,9 +5660,9 @@
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handlebars": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz",
-      "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.2.tgz",
+      "integrity": "sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.0",
@@ -5640,9 +5672,9 @@
       },
       "dependencies": {
         "uglify-js": {
-          "version": "3.6.4",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.4.tgz",
-          "integrity": "sha512-9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA==",
+          "version": "3.6.9",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz",
+          "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -6653,9 +6685,9 @@
       }
     },
     "jest-environment-enzyme": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-enzyme/-/jest-environment-enzyme-7.1.1.tgz",
-      "integrity": "sha512-k+QJkK0iRtjWbNfKdtj1QQIs12JbbvPmHW30cSbDoIgOFO7Bd1lLo6qOabM+PdhPCeLWQ1D1ZoTrHPauXdYpzA==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-enzyme/-/jest-environment-enzyme-7.1.2.tgz",
+      "integrity": "sha512-3tfaYAzO7qZSRrv+srQnfK16Vu5XwH/pHi8FpoqSHjKKngbHzXf7aBCBuWh8y3w0OtknHRfDMFrC60Khj+g1hA==",
       "dev": true,
       "requires": {
         "jest-environment-jsdom": "^24.0.0"
@@ -7828,19 +7860,6 @@
             "lodash": "^4.17.4",
             "lodash-es": "^4.17.4"
           }
-        },
-        "serialize-error": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz",
-          "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==",
-          "requires": {
-            "type-fest": "^0.8.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
@@ -7953,6 +7972,37 @@
         "yargs": "^9.0.0"
       },
       "dependencies": {
+        "@babel/core": {
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz",
+          "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==",
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.7.2",
+            "@babel/helpers": "^7.7.0",
+            "@babel/parser": "^7.7.2",
+            "@babel/template": "^7.7.0",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.7.2",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "4.1.1",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+              "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            }
+          }
+        },
         "async": {
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
@@ -7982,6 +8032,13 @@
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
             "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            }
           }
         },
         "execa": {
@@ -8093,11 +8150,6 @@
             "mime-db": "~1.23.0"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
         "os-locale": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -8108,6 +8160,16 @@
             "mem": "^1.1.0"
           }
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "serialize-error": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
+          "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go="
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -8186,10 +8248,75 @@
         "escape-string-regexp": "^1.0.5"
       },
       "dependencies": {
+        "@babel/core": {
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz",
+          "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==",
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.7.2",
+            "@babel/helpers": "^7.7.0",
+            "@babel/parser": "^7.7.2",
+            "@babel/template": "^7.7.0",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.7.2",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/register": {
+          "version": "7.7.0",
+          "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.7.0.tgz",
+          "integrity": "sha512-HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg==",
+          "requires": {
+            "find-cache-dir": "^2.0.0",
+            "lodash": "^4.17.13",
+            "make-dir": "^2.1.0",
+            "pirates": "^4.0.0",
+            "source-map-support": "^0.5.16"
+          }
+        },
         "core-js": {
           "version": "2.6.10",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
           "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
@@ -8200,6 +8327,47 @@
       "requires": {
         "@babel/core": "^7.0.0",
         "metro-source-map": "0.56.3"
+      },
+      "dependencies": {
+        "@babel/core": {
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz",
+          "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==",
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.7.2",
+            "@babel/helpers": "^7.7.0",
+            "@babel/parser": "^7.7.2",
+            "@babel/template": "^7.7.0",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.7.2",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
       }
     },
     "metro-cache": {
@@ -8443,6 +8611,35 @@
         "metro-source-map": "0.56.3"
       },
       "dependencies": {
+        "@babel/core": {
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz",
+          "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==",
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.7.2",
+            "@babel/helpers": "^7.7.0",
+            "@babel/parser": "^7.7.2",
+            "@babel/template": "^7.7.0",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.7.2",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
         "metro-react-native-babel-preset": {
           "version": "0.56.3",
           "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.56.3.tgz",
@@ -8484,6 +8681,16 @@
             "@babel/template": "^7.0.0",
             "react-refresh": "^0.4.0"
           }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
@@ -8573,18 +8780,11 @@
       "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
     },
     "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "version": "2.1.25",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
+      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
       "requires": {
-        "mime-db": "1.40.0"
-      },
-      "dependencies": {
-        "mime-db": {
-          "version": "1.40.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-        }
+        "mime-db": "1.42.0"
       }
     },
     "mimic-fn": {
@@ -8649,7 +8849,7 @@
       }
     },
     "mmjstool": {
-      "version": "github:mattermost/mattermost-utilities#ce99d7a9e82128a02fd36e44720a4aef2653810d",
+      "version": "github:mattermost/mattermost-utilities#b3e2e308b8b85469849a91c21958b46a89ab33ab",
       "from": "github:mattermost/mattermost-utilities",
       "dev": true,
       "requires": {
@@ -8961,9 +9161,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.39",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.39.tgz",
-      "integrity": "sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==",
+      "version": "1.1.40",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.40.tgz",
+      "integrity": "sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==",
       "dev": true,
       "requires": {
         "semver": "^6.3.0"
@@ -9028,9 +9228,9 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "nwsapi": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
-      "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
       "dev": true
     },
     "nyc": {
@@ -9212,9 +9412,9 @@
       "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
     },
     "object-inspect": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
     },
     "object-is": {
       "version": "1.0.1",
@@ -9362,16 +9562,16 @@
       }
     },
     "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "requires": {
         "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
+        "fast-levenshtein": "~2.0.6",
         "levn": "~0.3.0",
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "word-wrap": "~1.2.3"
       }
     },
     "options": {
@@ -9719,9 +9919,9 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "path-to-regexp": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
       "requires": {
         "isarray": "0.0.1"
       }
@@ -9936,9 +10136,9 @@
       }
     },
     "prompts": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz",
-      "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz",
+      "integrity": "sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
@@ -10052,9 +10252,9 @@
       "dev": true
     },
     "query-string": {
-      "version": "6.8.3",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.3.tgz",
-      "integrity": "sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ==",
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.9.0.tgz",
+      "integrity": "sha512-KG4bhCFYapExLsUHrFt+kQVEegF2agm4cpF/VNc6pZVthIfCc/GK8t8VyNIE3nyXG9DK3Tf2EGkxjR6/uRdYsA==",
       "requires": {
         "decode-uri-component": "^0.2.0",
         "split-on-first": "^1.0.0",
@@ -10213,9 +10413,9 @@
       }
     },
     "react-is": {
-      "version": "16.11.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",
-      "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw=="
+      "version": "16.12.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
+      "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q=="
     },
     "react-lifecycles-compat": {
       "version": "2.0.0",
@@ -10488,6 +10688,11 @@
       "resolved": "https://registry.npmjs.org/react-native-exception-handler/-/react-native-exception-handler-2.10.8.tgz",
       "integrity": "sha512-ZN+jwpADRkCUNdad/50k0mZdMoICGrGdtaxgvRU+pNcWRRBAXJhuo4+jY0eQaoVpx1ghycGE6tBu9ka8gL2NOQ=="
     },
+    "react-native-fast-image": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-7.0.2.tgz",
+      "integrity": "sha512-MfuzJbC0RjYobR2gFCdqe1I7jvNOCfDkjQ7VGOHXniqjohhULMkcWNBE9Umovi9Dx93lJ6t5utcE2wf/09zvlg=="
+    },
     "react-native-gesture-handler": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.4.1.tgz",
@@ -10563,9 +10768,9 @@
       },
       "dependencies": {
         "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+          "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==",
           "requires": {
             "react-is": "^16.7.0"
           }
@@ -10790,9 +10995,9 @@
       },
       "dependencies": {
         "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+          "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==",
           "requires": {
             "react-is": "^16.7.0"
           }
@@ -11252,21 +11457,21 @@
       }
     },
     "request-promise-core": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
-      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
+      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.15"
       }
     },
     "request-promise-native": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
-      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
+      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
       "dev": true,
       "requires": {
-        "request-promise-core": "1.1.2",
+        "request-promise-core": "1.1.3",
         "stealthy-require": "^1.1.1",
         "tough-cookie": "^2.3.3"
       }
@@ -11393,9 +11598,9 @@
       }
     },
     "rn-host-detect": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/rn-host-detect/-/rn-host-detect-1.1.5.tgz",
-      "integrity": "sha512-ufk2dFT3QeP9HyZ/xTuMtW27KnFy815CYitJMqQm+pgG3ZAtHBsrU8nXizNKkqXGy3bQmhEoloVbrfbvMJMqkg=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/rn-host-detect/-/rn-host-detect-1.2.0.tgz",
+      "integrity": "sha512-btNg5kzHcjZZ7t7mvvV/4wNJ9e3MPgrWivkRgWURzXL0JJ0pwWlU4zrbmdlz3HHzHOxhBhHB4D+/dbMFfu4/4A=="
     },
     "rn-placeholder": {
       "version": "github:mattermost/rn-placeholder#02c629c65d0123a2eee623ada0fd17186415d3c3",
@@ -11705,9 +11910,12 @@
       }
     },
     "serialize-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
-      "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz",
+      "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==",
+      "requires": {
+        "type-fest": "^0.8.0"
+      }
     },
     "serve-static": {
       "version": "1.14.1",
@@ -11762,9 +11970,9 @@
       "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
     },
     "shaka-player": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-2.5.5.tgz",
-      "integrity": "sha512-YEWBFapWKjwy2+wIgH9NqoFW9A14LIYNAoJ9cQr3c9BGS7qjqxeiYM/H1BJ8so1FQexpsWUdyjwHvcspdc7/nw=="
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-2.5.6.tgz",
+      "integrity": "sha512-z1BM/kpg5OVk57w5gXYBGk78Le04gfCHBOpT106Nz7h4VU7im7o8ZldUKxC9+FlSL4sPvdU8lY6OxL7L3hw5Fw=="
     },
     "shallow-clone": {
       "version": "0.1.2",
@@ -11827,19 +12035,19 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simple-plist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.0.0.tgz",
-      "integrity": "sha512-043L2rO80LVF7zfZ+fqhsEkoJFvW8o59rt/l4ctx1TJWoTx7/jkiS1R5TatD15Z1oYnuLJytzE7gcnnBuIPL2g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.0.tgz",
+      "integrity": "sha512-2i5Tc0BYAqppM7jVzmNrI+aEUntPolIq4fDgji6WuNNn1D/qYdn2KwoLhZdzQkE04lu9L5tUoeJsjuJAvd+lFg==",
       "requires": {
-        "bplist-creator": "0.0.7",
-        "bplist-parser": "0.1.1",
+        "bplist-creator": "0.0.8",
+        "bplist-parser": "0.2.0",
         "plist": "^3.0.1"
       }
     },
     "sisteransi": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz",
-      "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz",
+      "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==",
       "dev": true
     },
     "slash": {
@@ -11863,9 +12071,9 @@
       "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
     },
     "smart-buffer": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz",
-      "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
     },
     "smart-mixin": {
       "version": "2.0.0",
@@ -11983,14 +12191,14 @@
       }
     },
     "snyk": {
-      "version": "1.239.2",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.239.2.tgz",
-      "integrity": "sha512-u+HB+ZYbzHVwN4KZivyv26PtHEROsMCg4wqjbOVq0ilWUMRWkH5kHjFHTjN3mYiIa/Wo9juR9cYJjfDLnq4Byw==",
+      "version": "1.247.1",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.247.1.tgz",
+      "integrity": "sha512-/3n8Eair/MCtetCfaU7jRdIq0wac4fpFQXrp5phwRLvnxO9x6racbozrBszmlOBCCLlveFCBJg5il5hf1kacwQ==",
       "requires": {
         "@snyk/cli-interface": "2.2.0",
         "@snyk/dep-graph": "1.13.1",
         "@snyk/gemfile": "1.2.0",
-        "@snyk/snyk-cocoapods-plugin": "1.0.3",
+        "@snyk/snyk-cocoapods-plugin": "2.0.1",
         "@types/agent-base": "^4.2.0",
         "@types/restify": "^4.3.6",
         "abbrev": "^1.1.1",
@@ -12013,17 +12221,17 @@
         "snyk-config": "^2.2.1",
         "snyk-docker-plugin": "1.33.1",
         "snyk-go-plugin": "1.11.1",
-        "snyk-gradle-plugin": "3.1.0",
+        "snyk-gradle-plugin": "3.2.2",
         "snyk-module": "1.9.1",
         "snyk-mvn-plugin": "2.4.0",
-        "snyk-nodejs-lockfile-parser": "1.16.0",
-        "snyk-nuget-plugin": "1.13.0",
-        "snyk-php-plugin": "1.6.4",
+        "snyk-nodejs-lockfile-parser": "1.16.1",
+        "snyk-nuget-plugin": "1.13.1",
+        "snyk-php-plugin": "1.7.0",
         "snyk-policy": "1.13.5",
         "snyk-python-plugin": "^1.13.3",
         "snyk-resolve": "1.0.1",
         "snyk-resolve-deps": "4.4.0",
-        "snyk-sbt-plugin": "2.8.0",
+        "snyk-sbt-plugin": "2.9.0",
         "snyk-tree": "^1.0.0",
         "snyk-try-require": "1.3.1",
         "source-map-support": "^0.5.11",
@@ -12099,11 +12307,11 @@
       }
     },
     "snyk-gradle-plugin": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz",
-      "integrity": "sha512-789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.2.tgz",
+      "integrity": "sha512-ijIWsypbtpdTuRcYTFsnEWbaBnhCc7q0iIg0A4OcOW/xLyInPwyfBMnip4ubNfHAS/PrvzgfwwwJhttcQD0ZaQ==",
       "requires": {
-        "@snyk/cli-interface": "^2.1.0",
+        "@snyk/cli-interface": "2.2.0",
         "@types/debug": "^4.1.4",
         "chalk": "^2.4.2",
         "clone-deep": "^0.3.0",
@@ -12148,9 +12356,9 @@
       }
     },
     "snyk-nodejs-lockfile-parser": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.0.tgz",
-      "integrity": "sha512-cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.1.tgz",
+      "integrity": "sha512-MEQImB2XU35D66wYve6g1RcDuD9vyoxGvYtM+ngSd5ItujzjIpyF26W7niqHwBRGLamqjsKF5cOlbmHs+wsx/Q==",
       "requires": {
         "@yarnpkg/lockfile": "^1.0.2",
         "graphlib": "^2.1.5",
@@ -12161,9 +12369,9 @@
       }
     },
     "snyk-nuget-plugin": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.0.tgz",
-      "integrity": "sha512-9PrsN6kSz79lKUlpfqAYvMtac7HYbscf4OJ5LTzTcPn2XRs24NCTZylUUpilkSY0r2DyDLY18cl+qHHjfJKnig==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.1.tgz",
+      "integrity": "sha512-2AQVeahBK7Rt38p0Acl1fMsFQu3dsqoRODPoRaS0IM/bOBzVdAkDF9pCb5yKMREGpMZcyRFkt8Q+hGiUk0Nlfg==",
       "requires": {
         "debug": "^3.1.0",
         "dotnet-deps-parser": "4.5.2",
@@ -12183,11 +12391,12 @@
       }
     },
     "snyk-php-plugin": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.6.4.tgz",
-      "integrity": "sha512-FFQeimtbwq17nDUS0o0zuKgyjXSX7SpoC9iYTeKvxTXrmKf2QlxTtPvmMM4/hQxehEu1i40ow1Ozw0Ahxm8Dpw==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.7.0.tgz",
+      "integrity": "sha512-mDe90xkqSEVrpx1ZC7ItqCOc6fZCySbE+pHVI+dAPUmf1C1LSWZrZVmAVeo/Dw9sJzJfzmcdAFQl+jZP8/uV0A==",
       "requires": {
-        "@snyk/composer-lockfile-parser": "1.0.3",
+        "@snyk/cli-interface": "2.2.0",
+        "@snyk/composer-lockfile-parser": "1.2.0",
         "tslib": "1.9.3"
       },
       "dependencies": {
@@ -12215,9 +12424,9 @@
       }
     },
     "snyk-python-plugin": {
-      "version": "1.13.3",
-      "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.13.3.tgz",
-      "integrity": "sha512-Ud7mHmpMG4uCChvYLx5jA8HwOV/FNpT65xTxSt+6wsOjIUTuLiqM86mbvgzgk3pir8vMP9yQEsCi1i0zYLBArw==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.13.4.tgz",
+      "integrity": "sha512-XjGmvKMYENFMH94q+GSQz5JzTjgsgapdF0ZcS107c3UzMYeXa2Qd2Du9S5IB+mjvm335EJGcQJPlgFYb/qoeFw==",
       "requires": {
         "@snyk/cli-interface": "^2.0.3",
         "tmp": "0.0.33"
@@ -12257,9 +12466,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "6.14.8",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.14.8.tgz",
-          "integrity": "sha512-ZVswkI0zxOcADy2b4T9Lj3N+OYyHwCyzMtmkRIi1P94vF/GOLpDPB76P1uBXX/QM6e5wICriSz2XBPSBdxIN5g=="
+          "version": "6.14.9",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.14.9.tgz",
+          "integrity": "sha512-leP/gxHunuazPdZaCvsCefPQxinqUDsCxCR5xaDUrY2MkYxQRFZZwU5e7GojyYsGB7QVtCi7iVEl/hoFXQYc+w=="
         },
         "lru-cache": {
           "version": "4.1.5",
@@ -12283,9 +12492,9 @@
       }
     },
     "snyk-sbt-plugin": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.8.0.tgz",
-      "integrity": "sha512-ZzyBdND5CsaO0xkv05geZXu8Dd6Llvr/5oTj811U7h7UmrvljrAiABW4RGjRJPrPVuuJaDej2p633sgGtK9UsA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.9.0.tgz",
+      "integrity": "sha512-R8jfRDkqlSsiSHYNAItKBUKUwb0n5z304Ko8ply/eoNAJMkXbFASDKHRto1v4F4wryJb4Rl1j/vFvIwytqZrww==",
       "requires": {
         "semver": "^6.1.2",
         "tmp": "^0.1.0",
@@ -12515,12 +12724,12 @@
       }
     },
     "socks": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
-      "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
       "requires": {
-        "ip": "^1.1.5",
-        "smart-buffer": "4.0.2"
+        "ip": "1.1.5",
+        "smart-buffer": "^4.1.0"
       }
     },
     "socks-proxy-agent": {
@@ -12579,9 +12788,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
+      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -12680,6 +12889,13 @@
       "integrity": "sha512-Evm+NuZ2ZTwGazsbsZC+EV1EGsvyxgIvtNwbyFfeXaq/8L78M5Kdh0qpmQaTkUpbOAKbbPP7c7qZa7u8XFsrUA==",
       "requires": {
         "type-fest": "^0.7.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
+          "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="
+        }
       }
     },
     "static-extend": {
@@ -12832,9 +13048,9 @@
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
     "sudo-prompt": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.0.0.tgz",
-      "integrity": "sha512-kUn5fiOk0nhY2oKD9onIkcNCE4Zt85WTsvOfSmqCplmlEvXCcPOmp1npH5YWuf8Bmyy9wLWkIxx+D+8cThBORQ=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.1.1.tgz",
+      "integrity": "sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA=="
     },
     "supports-color": {
       "version": "5.5.0",
@@ -13236,9 +13452,9 @@
       }
     },
     "type-fest": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
-      "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
     },
     "type-of": {
       "version": "2.0.1",
@@ -13574,9 +13790,9 @@
       "dev": true
     },
     "webpack-cli": {
-      "version": "3.3.9",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz",
-      "integrity": "sha512-xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz",
+      "integrity": "sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==",
       "dev": true,
       "requires": {
         "chalk": "2.4.2",
@@ -13775,6 +13991,11 @@
         "execa": "^1.0.0"
       }
     },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
diff --git a/package.json b/package.json
index 80ceefd89..e9e0f22c4 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "react-native-document-picker": "3.2.4",
     "react-native-exception-handler": "2.10.8",
     "react-native-gesture-handler": "1.4.1",
+    "react-native-fast-image": "7.0.2",
     "react-native-haptic-feedback": "1.8.2",
     "react-native-image-gallery": "github:mattermost/react-native-image-gallery#c1a9f7118e90cc87d47620bc0584c9cac4b0cf38",
     "react-native-image-picker": "0.28.1",

From 0204722627c6a946a5473e54298d7a7cb00dd723 Mon Sep 17 00:00:00 2001
From: CJ <38697367+imisshtml@users.noreply.github.com>
Date: Sun, 17 Nov 2019 23:35:44 -0500
Subject: [PATCH 10/16] MM-19037 Updated Progressive Image Loader (#3414)

* MM-19037 Updated Progressive Image Loader

Set the return for the listener to return a null for hte loader images, stopping the component from thinking it had a loaded image on a failure.

Also enabled the thumbnail to make an additional attempt to load when it receives the null response.

* MM-19037 Updated Eslint

Eslint issue resolved

* MM-19037 Add Unit Tests

Added Unit tests

* empty commit
---
 .../progressive_image.test.js.snap            | 13 ++++++
 .../progressive_image/progressive_image.js    | 18 +++++---
 .../progressive_image.test.js                 | 43 +++++++++++++++++++
 app/utils/image_cache_manager.js              |  2 +-
 4 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 app/components/progressive_image/__snapshots__/progressive_image.test.js.snap
 create mode 100644 app/components/progressive_image/progressive_image.test.js

diff --git a/app/components/progressive_image/__snapshots__/progressive_image.test.js.snap b/app/components/progressive_image/__snapshots__/progressive_image.test.js.snap
new file mode 100644
index 000000000..235e0a782
--- /dev/null
+++ b/app/components/progressive_image/__snapshots__/progressive_image.test.js.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ProgressiveImage should match snapshot when just a image loads 1`] = `
+<View
+  style={Object {}}
+/>
+`;
+
+exports[`ProgressiveImage should match snapshot when no thumbnail 1`] = `
+<View
+  style={Object {}}
+/>
+`;
diff --git a/app/components/progressive_image/progressive_image.js b/app/components/progressive_image/progressive_image.js
index 68fb5f276..3f8ac7c18 100644
--- a/app/components/progressive_image/progressive_image.js
+++ b/app/components/progressive_image/progressive_image.js
@@ -41,6 +41,7 @@ export default class ProgressiveImage extends PureComponent {
             intensity: new Animated.Value(80),
             thumb: null,
             uri: null,
+            failedImageLoad: false,
         };
     }
 
@@ -87,12 +88,17 @@ export default class ProgressiveImage extends PureComponent {
 
     setThumbnail = (thumb) => {
         if (this.subscribedToCache) {
-            const {filename, imageUri} = this.props;
-            this.setState({thumb}, () => {
-                setTimeout(() => {
-                    ImageCacheManager.cache(filename, imageUri, this.setImage);
-                }, 300);
-            });
+            if (!thumb && !this.state.failedImageLoad) {
+                this.load();
+                this.setState({failedImageLoad: true});
+            } else {
+                const {filename, imageUri} = this.props;
+                this.setState({thumb}, () => {
+                    setTimeout(() => {
+                        ImageCacheManager.cache(filename, imageUri, this.setImage);
+                    }, 300);
+                });
+            }
         }
     };
 
diff --git a/app/components/progressive_image/progressive_image.test.js b/app/components/progressive_image/progressive_image.test.js
new file mode 100644
index 000000000..6d51700cc
--- /dev/null
+++ b/app/components/progressive_image/progressive_image.test.js
@@ -0,0 +1,43 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {shallow} from 'enzyme';
+
+import Preferences from 'mattermost-redux/constants/preferences';
+
+import ProgressiveImage from './progressive_image';
+
+describe('ProgressiveImage', () => {
+    const baseProps = {
+        isBackgroundImage: false,
+        defaultSource: 0,
+        filename: 'defaultImage',
+        imageUri: 'https://images.com/image.png',
+        onError: jest.fn(),
+        resizeMethod: 'auto',
+        resizeMode: 'contain',
+        theme: Preferences.THEMES.default,
+        thumbnailUri: 'https://images.com/image.png',
+        tintDefaultSource: false,
+    };
+
+    test('should match snapshot when just a image loads', () => {
+        const wrapper = shallow(
+            <ProgressiveImage {...baseProps}/>
+        );
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+
+    test('should match snapshot when no thumbnail', () => {
+        const props = {
+            ...baseProps,
+            thumbnailUri: null,
+        };
+
+        const wrapper = shallow(
+            <ProgressiveImage {...props}/>
+        );
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+});
\ No newline at end of file
diff --git a/app/utils/image_cache_manager.js b/app/utils/image_cache_manager.js
index 1b5c19578..0cd161c7a 100644
--- a/app/utils/image_cache_manager.js
+++ b/app/utils/image_cache_manager.js
@@ -82,7 +82,7 @@ export default class ImageCacheManager {
                     notifyAll(uri, pathWithPrefix);
                 } catch (e) {
                     RNFetchBlob.fs.unlink(pathWithPrefix);
-                    notifyAll(uri, uri);
+                    notifyAll(uri, null);
                     unsubscribe(uri);
                     return null;
                 }

From 17a7054ae68bf60224f9c0c42efc89c70dab6352 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 18 Nov 2019 11:04:52 -0300
Subject: [PATCH 11/16] MM-19993 Fix Channel spinner is black on dark theme
 (#3558)

---
 .../autocomplete_section_header.js            |  7 +++-
 .../__snapshots__/index.test.js.snap          | 10 +++++
 app/components/custom_list/index.js           | 13 +++++--
 .../edit_channel_info/edit_channel_info.js    |  2 +-
 .../emoji_picker/emoji_picker_base.js         |  2 +-
 .../load_more_posts/load_more_posts.js        |  2 +-
 .../__snapshots__/post_list.test.js.snap      | 39 +++++++++++++++++--
 app/components/post_list/post_list.js         | 17 ++++----
 app/screens/channel/channel_base.js           |  5 ++-
 .../channel_add_members.js                    |  2 +-
 .../channel_members/channel_members.js        |  2 +-
 app/screens/edit_post/edit_post.js            |  2 +-
 app/screens/edit_profile/edit_profile.js      |  2 +-
 .../error_teams_list/error_teams_list.js      |  2 +-
 app/screens/more_channels/more_channels.js    |  2 +-
 app/screens/more_dms/more_dms.js              |  2 +-
 .../__snapshots__/permalink.test.js.snap      |  2 +-
 app/screens/permalink/permalink.js            |  2 +-
 app/screens/search/search.js                  | 10 +++--
 .../__snapshots__/select_team.test.js.snap    | 18 ++++++---
 app/screens/select_team/select_team.js        | 14 ++++++-
 .../terms_of_service.test.js.snap             |  4 +-
 .../terms_of_service/terms_of_service.js      |  2 +-
 .../__snapshots__/thread.ios.test.js.snap     |  8 ++--
 app/screens/thread/thread.android.js          |  2 +-
 app/screens/thread/thread.ios.js              |  2 +-
 app/screens/thread/thread_base.js             | 10 +++--
 27 files changed, 134 insertions(+), 51 deletions(-)

diff --git a/app/components/autocomplete/autocomplete_section_header.js b/app/components/autocomplete/autocomplete_section_header.js
index 997a8cf44..0fb6f6d80 100644
--- a/app/components/autocomplete/autocomplete_section_header.js
+++ b/app/components/autocomplete/autocomplete_section_header.js
@@ -34,7 +34,12 @@ export default class AutocompleteSectionHeader extends PureComponent {
                         defaultMessage={defaultMessage}
                         style={style.sectionText}
                     />
-                    {loading && <ActivityIndicator size='small'/>}
+                    {loading &&
+                    <ActivityIndicator
+                        color={theme.centerChannelColor}
+                        size='small'
+                    />
+                    }
                 </View>
             </View>
         );
diff --git a/app/components/custom_list/__snapshots__/index.test.js.snap b/app/components/custom_list/__snapshots__/index.test.js.snap
index 38087a1d3..e205d5f3e 100644
--- a/app/components/custom_list/__snapshots__/index.test.js.snap
+++ b/app/components/custom_list/__snapshots__/index.test.js.snap
@@ -31,6 +31,16 @@ exports[`CustomList should match snapshot with FlatList 1`] = `
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onScroll={[Function]}
+  refreshControl={
+    <RefreshControlMock
+      colors={
+        Array [
+          "#3d3c40",
+        ]
+      }
+      tintColor="#3d3c40"
+    />
+  }
   removeClippedSubviews={true}
   renderItem={[Function]}
   scrollEventThrottle={60}
diff --git a/app/components/custom_list/index.js b/app/components/custom_list/index.js
index 42ae0461d..5b2acf0bb 100644
--- a/app/components/custom_list/index.js
+++ b/app/components/custom_list/index.js
@@ -3,7 +3,7 @@
 
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {FlatList, Keyboard, Platform, SectionList, Text, View} from 'react-native';
+import {FlatList, Keyboard, Platform, RefreshControl, SectionList, Text, View} from 'react-native';
 
 import {ListTypes} from 'app/constants';
 import {makeStyleSheetFromTheme, changeOpacity} from 'app/utils/theme';
@@ -113,6 +113,14 @@ export default class CustomList extends PureComponent {
         const {data, extraData, theme, onRefresh, refreshing} = this.props;
         const style = getStyleFromTheme(theme);
 
+        const refreshControl = (
+            <RefreshControl
+                refreshing={refreshing}
+                onRefresh={onRefresh}
+                colors={[theme.centerChannelColor]}
+                tintColor={theme.centerChannelColor}
+            />);
+
         return (
             <FlatList
                 contentContainerStyle={style.container}
@@ -128,8 +136,7 @@ export default class CustomList extends PureComponent {
                 maxToRenderPerBatch={INITIAL_BATCH_TO_RENDER + 1}
                 onLayout={this.handleLayout}
                 onScroll={this.handleScroll}
-                onRefresh={onRefresh}
-                refreshing={refreshing}
+                refreshControl={refreshControl}
                 ref={this.setListRef}
                 removeClippedSubviews={true}
                 renderItem={this.renderItem}
diff --git a/app/components/edit_channel_info/edit_channel_info.js b/app/components/edit_channel_info/edit_channel_info.js
index 13bafe9b7..8c6850410 100644
--- a/app/components/edit_channel_info/edit_channel_info.js
+++ b/app/components/edit_channel_info/edit_channel_info.js
@@ -182,7 +182,7 @@ export default class EditChannelInfo extends PureComponent {
             return (
                 <View style={style.container}>
                     <StatusBar/>
-                    <Loading/>
+                    <Loading color={theme.centerChannelColor}/>
                 </View>
             );
         }
diff --git a/app/components/emoji_picker/emoji_picker_base.js b/app/components/emoji_picker/emoji_picker_base.js
index cafb8788f..58d6f4e30 100644
--- a/app/components/emoji_picker/emoji_picker_base.js
+++ b/app/components/emoji_picker/emoji_picker_base.js
@@ -440,7 +440,7 @@ export default class EmojiPicker extends PureComponent {
         const styles = getStyleSheetFromTheme(theme);
         return (
             <View style={styles.loading}>
-                <ActivityIndicator/>
+                <ActivityIndicator color={theme.centerChannelColor}/>
             </View>
         );
     };
diff --git a/app/components/load_more_posts/load_more_posts.js b/app/components/load_more_posts/load_more_posts.js
index 15e7c94b1..6578b4489 100644
--- a/app/components/load_more_posts/load_more_posts.js
+++ b/app/components/load_more_posts/load_more_posts.js
@@ -46,7 +46,7 @@ export default class LoadMorePosts extends PureComponent {
 
         return (
             <View style={{flex: 1, alignItems: 'center'}}>
-                <ActivityIndicator/>
+                <ActivityIndicator color={this.props.theme.centerChannelColor}/>
             </View>
         );
     }
diff --git a/app/components/post_list/__snapshots__/post_list.test.js.snap b/app/components/post_list/__snapshots__/post_list.test.js.snap
index 82979e601..0c882c26f 100644
--- a/app/components/post_list/__snapshots__/post_list.test.js.snap
+++ b/app/components/post_list/__snapshots__/post_list.test.js.snap
@@ -41,7 +41,18 @@ exports[`PostList setting channel deep link 1`] = `
   onLayout={[Function]}
   onScroll={[Function]}
   onScrollToIndexFailed={[Function]}
-  refreshing={false}
+  refreshControl={
+    <RefreshControlMock
+      colors={
+        Array [
+          "#3d3c40",
+        ]
+      }
+      onRefresh={null}
+      refreshing={false}
+      tintColor="#3d3c40"
+    />
+  }
   removeClippedSubviews={true}
   renderItem={[Function]}
   scrollEventThrottle={60}
@@ -91,7 +102,18 @@ exports[`PostList setting permalink deep link 1`] = `
   onLayout={[Function]}
   onScroll={[Function]}
   onScrollToIndexFailed={[Function]}
-  refreshing={false}
+  refreshControl={
+    <RefreshControlMock
+      colors={
+        Array [
+          "#3d3c40",
+        ]
+      }
+      onRefresh={null}
+      refreshing={false}
+      tintColor="#3d3c40"
+    />
+  }
   removeClippedSubviews={true}
   renderItem={[Function]}
   scrollEventThrottle={60}
@@ -141,7 +163,18 @@ exports[`PostList should match snapshot 1`] = `
   onLayout={[Function]}
   onScroll={[Function]}
   onScrollToIndexFailed={[Function]}
-  refreshing={false}
+  refreshControl={
+    <RefreshControlMock
+      colors={
+        Array [
+          "#3d3c40",
+        ]
+      }
+      onRefresh={null}
+      refreshing={false}
+      tintColor="#3d3c40"
+    />
+  }
   removeClippedSubviews={true}
   renderItem={[Function]}
   scrollEventThrottle={60}
diff --git a/app/components/post_list/post_list.js b/app/components/post_list/post_list.js
index 87f228c82..d2ed9dcf2 100644
--- a/app/components/post_list/post_list.js
+++ b/app/components/post_list/post_list.js
@@ -3,7 +3,7 @@
 
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {FlatList, StyleSheet} from 'react-native';
+import {FlatList, RefreshControl, StyleSheet} from 'react-native';
 
 import EventEmitter from 'mattermost-redux/utils/event_emitter';
 import * as PostListUtils from 'mattermost-redux/utils/post_list';
@@ -366,13 +366,16 @@ export default class PostList extends PureComponent {
             postIds,
             refreshing,
             scrollViewNativeID,
+            theme,
         } = this.props;
 
-        const refreshControl = {refreshing};
-
-        if (channelId) {
-            refreshControl.onRefresh = this.handleRefresh;
-        }
+        const refreshControl = (
+            <RefreshControl
+                refreshing={refreshing}
+                onRefresh={channelId ? this.handleRefresh : null}
+                colors={[theme.centerChannelColor]}
+                tintColor={theme.centerChannelColor}
+            />);
 
         const hasPostsKey = postIds.length ? 'true' : 'false';
 
@@ -398,7 +401,7 @@ export default class PostList extends PureComponent {
                 removeClippedSubviews={true}
                 renderItem={this.renderItem}
                 scrollEventThrottle={60}
-                {...refreshControl}
+                refreshControl={refreshControl}
                 nativeID={scrollViewNativeID}
             />
         );
diff --git a/app/screens/channel/channel_base.js b/app/screens/channel/channel_base.js
index eb41aa3c4..9ac5c5054 100644
--- a/app/screens/channel/channel_base.js
+++ b/app/screens/channel/channel_base.js
@@ -292,7 +292,10 @@ export default class ChannelBase extends PureComponent {
                             theme={theme}
                             isLandscape={isLandscape}
                         />
-                        <Loading channelIsLoading={true}/>
+                        <Loading
+                            channelIsLoading={true}
+                            color={theme.centerChannelColor}
+                        />
                     </View>
                 </SafeAreaView>
             );
diff --git a/app/screens/channel_add_members/channel_add_members.js b/app/screens/channel_add_members/channel_add_members.js
index 114a22ad5..6359d5ec8 100644
--- a/app/screens/channel_add_members/channel_add_members.js
+++ b/app/screens/channel_add_members/channel_add_members.js
@@ -303,7 +303,7 @@ export default class ChannelAddMembers extends PureComponent {
             return (
                 <View style={style.container}>
                     <StatusBar/>
-                    <Loading/>
+                    <Loading color={theme.centerChannelColor}/>
                 </View>
             );
         }
diff --git a/app/screens/channel_members/channel_members.js b/app/screens/channel_members/channel_members.js
index 54e590f0b..49cf3a4ac 100644
--- a/app/screens/channel_members/channel_members.js
+++ b/app/screens/channel_members/channel_members.js
@@ -335,7 +335,7 @@ export default class ChannelMembers extends PureComponent {
             return (
                 <View style={style.container}>
                     <StatusBar/>
-                    <Loading/>
+                    <Loading color={theme.centerChannelColor}/>
                 </View>
             );
         }
diff --git a/app/screens/edit_post/edit_post.js b/app/screens/edit_post/edit_post.js
index 4cd3791b6..888849ea5 100644
--- a/app/screens/edit_post/edit_post.js
+++ b/app/screens/edit_post/edit_post.js
@@ -173,7 +173,7 @@ export default class EditPost extends PureComponent {
             return (
                 <View style={style.container}>
                     <StatusBar/>
-                    <Loading/>
+                    <Loading color={theme.centerChannelColor}/>
                 </View>
             );
         }
diff --git a/app/screens/edit_profile/edit_profile.js b/app/screens/edit_profile/edit_profile.js
index 29dc6aa59..ed623ede3 100644
--- a/app/screens/edit_profile/edit_profile.js
+++ b/app/screens/edit_profile/edit_profile.js
@@ -560,7 +560,7 @@ export default class EditProfile extends PureComponent {
             return (
                 <View style={[style.container, style.flex]}>
                     <StatusBar/>
-                    <Loading/>
+                    <Loading color={theme.centerChannelColor}/>
                 </View>
             );
         }
diff --git a/app/screens/error_teams_list/error_teams_list.js b/app/screens/error_teams_list/error_teams_list.js
index 2c6d28ee9..7d401338b 100644
--- a/app/screens/error_teams_list/error_teams_list.js
+++ b/app/screens/error_teams_list/error_teams_list.js
@@ -78,7 +78,7 @@ export default class ErrorTeamsList extends PureComponent {
         const style = getStyleFromTheme(theme);
 
         if (this.state.loading) {
-            return <Loading/>;
+            return <Loading color={theme.centerChannelColor}/>;
         }
 
         return (
diff --git a/app/screens/more_channels/more_channels.js b/app/screens/more_channels/more_channels.js
index 38952d8c8..de0cfbbbd 100644
--- a/app/screens/more_channels/more_channels.js
+++ b/app/screens/more_channels/more_channels.js
@@ -327,7 +327,7 @@ export default class MoreChannels extends PureComponent {
 
         let content;
         if (adding) {
-            content = (<Loading/>);
+            content = (<Loading color={theme.centerChannelColor}/>);
         } else {
             const searchBarInput = {
                 backgroundColor: changeOpacity(theme.centerChannelColor, 0.2),
diff --git a/app/screens/more_dms/more_dms.js b/app/screens/more_dms/more_dms.js
index 327be408f..0a64765e0 100644
--- a/app/screens/more_dms/more_dms.js
+++ b/app/screens/more_dms/more_dms.js
@@ -420,7 +420,7 @@ export default class MoreDirectMessages extends PureComponent {
             return (
                 <View style={style.container}>
                     <StatusBar/>
-                    <Loading/>
+                    <Loading color={theme.centerChannelColor}/>
                 </View>
             );
         }
diff --git a/app/screens/permalink/__snapshots__/permalink.test.js.snap b/app/screens/permalink/__snapshots__/permalink.test.js.snap
index 2569bba47..9e7f3cc06 100644
--- a/app/screens/permalink/__snapshots__/permalink.test.js.snap
+++ b/app/screens/permalink/__snapshots__/permalink.test.js.snap
@@ -124,7 +124,7 @@ exports[`Permalink should match snapshot 1`] = `
         }
       >
         <Loading
-          color="grey"
+          color="#3d3c40"
           size="large"
           style={Object {}}
         />
diff --git a/app/screens/permalink/permalink.js b/app/screens/permalink/permalink.js
index 169ee0de8..9f8852337 100644
--- a/app/screens/permalink/permalink.js
+++ b/app/screens/permalink/permalink.js
@@ -370,7 +370,7 @@ export default class Permalink extends PureComponent {
                 </View>
             );
         } else if (loading) {
-            postList = <Loading/>;
+            postList = <Loading color={theme.centerChannelColor}/>;
         } else {
             postList = (
                 <PostList
diff --git a/app/screens/search/search.js b/app/screens/search/search.js
index 3fdfd0a3d..a9d596028 100644
--- a/app/screens/search/search.js
+++ b/app/screens/search/search.js
@@ -333,11 +333,13 @@ export default class Search extends PureComponent {
     });
 
     renderFooter = () => {
-        if (this.props.isSearchGettingMore) {
-            const style = getStyleFromTheme(this.props.theme);
+        const {isSearchGettingMore, theme} = this.props;
+
+        if (isSearchGettingMore) {
+            const style = getStyleFromTheme(theme);
             return (
                 <View style={style.loadingMore}>
-                    <Loading/>
+                    <Loading color={theme.centerChannelColor}/>
                 </View>
             );
         }
@@ -634,7 +636,7 @@ export default class Search extends PureComponent {
                     id: SEARCHING,
                     component: (
                         <View style={style.searching}>
-                            <Loading/>
+                            <Loading color={theme.centerChannelColor}/>
                         </View>
                     ),
                 }];
diff --git a/app/screens/select_team/__snapshots__/select_team.test.js.snap b/app/screens/select_team/__snapshots__/select_team.test.js.snap
index 449a83f73..df1241320 100644
--- a/app/screens/select_team/__snapshots__/select_team.test.js.snap
+++ b/app/screens/select_team/__snapshots__/select_team.test.js.snap
@@ -97,11 +97,19 @@ exports[`SelectTeam should match snapshot for teams 1`] = `
     listType="flat"
     loading={false}
     loadingComponent={
-      <Loading
-        color="grey"
-        size="large"
-        style={Object {}}
-      />
+      <View
+        style={
+          Object {
+            "marginVertical": 10,
+          }
+        }
+      >
+        <Loading
+          color="#3d3c40"
+          size="small"
+          style={Object {}}
+        />
+      </View>
     }
     onLoadMore={[Function]}
     onRefresh={[Function]}
diff --git a/app/screens/select_team/select_team.js b/app/screens/select_team/select_team.js
index 7d2c29703..9e34ac395 100644
--- a/app/screens/select_team/select_team.js
+++ b/app/screens/select_team/select_team.js
@@ -217,7 +217,7 @@ export default class SelectTeam extends PureComponent {
         const style = getStyleFromTheme(theme);
 
         if (this.state.joining) {
-            return <Loading/>;
+            return <Loading color={theme.centerChannelColor}/>;
         }
 
         if (this.props.teamsRequest.status === RequestStatus.FAILURE) {
@@ -262,7 +262,14 @@ export default class SelectTeam extends PureComponent {
                 <CustomList
                     data={teams}
                     loading={this.state.loading}
-                    loadingComponent={<Loading/>}
+                    loadingComponent={
+                        <View style={style.footer}>
+                            <Loading
+                                color={theme.centerChannelColor}
+                                size='small'
+                            />
+                        </View>
+                    }
                     refreshing={this.state.refreshing}
                     onRefresh={this.onRefresh}
                     onLoadMore={this.getTeams}
@@ -300,6 +307,9 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             width: '100%',
             height: 1,
         },
+        footer: {
+            marginVertical: 10,
+        },
         teamWrapper: {
             marginTop: 20,
         },
diff --git a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap
index b02f70ca2..3ac829734 100644
--- a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap
+++ b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap
@@ -272,7 +272,7 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB
 
 exports[`TermsOfService should match snapshot 1`] = `
 <Loading
-  color="grey"
+  color="#3d3c40"
   size="large"
   style={Object {}}
 />
@@ -329,7 +329,7 @@ exports[`TermsOfService should match snapshot for fail of get terms 1`] = `
 
 exports[`TermsOfService should match snapshot for get terms 1`] = `
 <Loading
-  color="grey"
+  color="#3d3c40"
   size="large"
   style={Object {}}
 />
diff --git a/app/screens/terms_of_service/terms_of_service.js b/app/screens/terms_of_service/terms_of_service.js
index db72b2192..beed535bb 100644
--- a/app/screens/terms_of_service/terms_of_service.js
+++ b/app/screens/terms_of_service/terms_of_service.js
@@ -231,7 +231,7 @@ export default class TermsOfService extends PureComponent {
         const textStyles = getMarkdownTextStyles(theme);
 
         if (this.state.loading) {
-            return <Loading/>;
+            return <Loading color={theme.centerChannelColor}/>;
         }
 
         if (this.state.getTermsError) {
diff --git a/app/screens/thread/__snapshots__/thread.ios.test.js.snap b/app/screens/thread/__snapshots__/thread.ios.test.js.snap
index 531bff0c7..dc90b29bd 100644
--- a/app/screens/thread/__snapshots__/thread.ios.test.js.snap
+++ b/app/screens/thread/__snapshots__/thread.ios.test.js.snap
@@ -32,7 +32,7 @@ exports[`thread should match snapshot, has root post 1`] = `
         }
         renderFooter={
           <Loading
-            color="grey"
+            color="#3d3c40"
             size="large"
             style={Object {}}
           />
@@ -87,7 +87,7 @@ exports[`thread should match snapshot, no root post, loading 1`] = `
     />
     <Connect(StatusBar) />
     <Loading
-      color="grey"
+      color="#3d3c40"
       size="large"
       style={Object {}}
     />
@@ -112,7 +112,7 @@ exports[`thread should match snapshot, render footer 1`] = `
   }
   renderFooter={
     <Loading
-      color="grey"
+      color="#3d3c40"
       size="large"
       style={Object {}}
     />
@@ -157,7 +157,7 @@ exports[`thread should match snapshot, render footer 3`] = `
     />
     <Connect(StatusBar) />
     <Loading
-      color="grey"
+      color="#3d3c40"
       size="large"
       style={Object {}}
     />
diff --git a/app/screens/thread/thread.android.js b/app/screens/thread/thread.android.js
index a2e60c209..d6f62d6fc 100644
--- a/app/screens/thread/thread.android.js
+++ b/app/screens/thread/thread.android.js
@@ -53,7 +53,7 @@ export default class ThreadAndroid extends ThreadBase {
             );
         } else {
             content = (
-                <Loading/>
+                <Loading color={theme.centerChannelColor}/>
             );
         }
 
diff --git a/app/screens/thread/thread.ios.js b/app/screens/thread/thread.ios.js
index 0d035bdd9..1470856c1 100644
--- a/app/screens/thread/thread.ios.js
+++ b/app/screens/thread/thread.ios.js
@@ -85,7 +85,7 @@ export default class ThreadIOS extends ThreadBase {
             );
         } else {
             content = (
-                <Loading/>
+                <Loading color={theme.centerChannelColor}/>
             );
         }
 
diff --git a/app/screens/thread/thread_base.js b/app/screens/thread/thread_base.js
index 0aa3c357d..c99683d5e 100644
--- a/app/screens/thread/thread_base.js
+++ b/app/screens/thread/thread_base.js
@@ -106,13 +106,15 @@ export default class ThreadBase extends PureComponent {
     };
 
     renderFooter = () => {
-        if (!this.hasRootPost() && this.props.threadLoadingStatus.status !== RequestStatus.STARTED) {
+        const {theme, threadLoadingStatus} = this.props;
+
+        if (!this.hasRootPost() && threadLoadingStatus.status !== RequestStatus.STARTED) {
             return (
-                <DeletedPost theme={this.props.theme}/>
+                <DeletedPost theme={theme}/>
             );
-        } else if (this.props.threadLoadingStatus.status === RequestStatus.STARTED) {
+        } else if (threadLoadingStatus.status === RequestStatus.STARTED) {
             return (
-                <Loading/>
+                <Loading color={theme.centerChannelColor}/>
             );
         }
 

From 759d1ce86d490abf10fbacd899908f9e40f1b88f Mon Sep 17 00:00:00 2001
From: Valentijn Nieman <valentijnnieman@gmail.com>
Date: Mon, 18 Nov 2019 09:38:30 -0500
Subject: [PATCH 12/16] MM-19337 Enable users to view archived channels (#3514)

* Archived channels dropdown in more channels modal

* Rename redux actions for archived channels

* Fixed tests and updated snapshots

* Unit test for search in more_channels

* Use translation for dropdown label

* Minimum server requirement for dropdown

* Use BottomSheet instead of Picker component

* loadPublicAndArchivedChannels action instead of separate channel get actions

* Add styles to StyleSheet

* Update mattermost-redux hash

* Update mattermost-redux hash

* Default case for switching channels dropdown

* Improve imports in more_channels.js component

* Fix typo in import

* Add padding to dropdown if landscape

* Update snapshot

* Page counter for public and archive channels

* Updated mattermost-redux commit hash

* Bottom sheet title for ios

* i18n-extract for new showArchived and showPublic strings

* Update mattermost-redux commit hash to latest master
---
 app/actions/views/channel.js                  |  22 +++
 .../channel_list_row/channel_list_row.js      |   3 +-
 .../__snapshots__/more_channels.test.js.snap  |  28 ++++
 app/screens/more_channels/index.js            |  22 ++-
 app/screens/more_channels/more_channels.js    | 125 +++++++++++++++---
 .../more_channels/more_channels.test.js       |  20 ++-
 assets/base/i18n/en.json                      |   5 +
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 9 files changed, 200 insertions(+), 31 deletions(-)

diff --git a/app/actions/views/channel.js b/app/actions/views/channel.js
index 4d89dcd77..fed9f0c7d 100644
--- a/app/actions/views/channel.js
+++ b/app/actions/views/channel.js
@@ -14,6 +14,8 @@ import {
     leaveChannel as serviceLeaveChannel,
     selectChannel,
     getChannelStats,
+    getChannels,
+    getArchivedChannels,
 } from 'mattermost-redux/actions/channels';
 import {
     getPosts,
@@ -73,6 +75,26 @@ export function loadChannelsByTeamName(teamName) {
     };
 }
 
+export function loadPublicAndArchivedChannels(teamId, publicPage, archivedPage, perPage, shouldLoadArchivedChannels) {
+    return async (dispatch) => {
+        return dispatch(getChannels(
+            teamId,
+            publicPage,
+            perPage
+        )).then(async (publicChannels) => {
+            if (shouldLoadArchivedChannels) {
+                const archivedChannels = await dispatch(getArchivedChannels(
+                    teamId,
+                    archivedPage,
+                    perPage
+                ));
+                return archivedChannels;
+            }
+            return publicChannels;
+        });
+    };
+}
+
 export function loadProfilesAndTeamMembersForDMSidebar(teamId) {
     return async (dispatch, getState) => {
         const state = getState();
diff --git a/app/components/custom_list/channel_list_row/channel_list_row.js b/app/components/custom_list/channel_list_row/channel_list_row.js
index 01feaf7a0..096339ae2 100644
--- a/app/components/custom_list/channel_list_row/channel_list_row.js
+++ b/app/components/custom_list/channel_list_row/channel_list_row.js
@@ -15,6 +15,7 @@ import CustomListRow from 'app/components/custom_list/custom_list_row';
 export default class ChannelListRow extends React.PureComponent {
     static propTypes = {
         id: PropTypes.string.isRequired,
+        isArchived: PropTypes.bool,
         theme: PropTypes.object.isRequired,
         channel: PropTypes.object.isRequired,
         ...CustomListRow.propTypes,
@@ -53,7 +54,7 @@ export default class ChannelListRow extends React.PureComponent {
                 <View style={style.container}>
                     <View style={style.titleContainer}>
                         <Icon
-                            name='globe'
+                            name={this.props.isArchived ? 'archive' : 'globe'}
                             style={style.icon}
                         />
                         <Text style={style.displayName}>
diff --git a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
index a0921f6cd..ef31e17bd 100644
--- a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
+++ b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
@@ -43,6 +43,34 @@ exports[`MoreChannels should match snapshot 1`] = `
         value=""
       />
     </View>
+    <View
+      style={
+        Array [
+          undefined,
+          null,
+        ]
+      }
+    >
+      <Text
+        accessibilityRole="button"
+        onPress={[Function]}
+        style={
+          Object {
+            "fontWeight": "bold",
+            "marginBottom": 10,
+            "marginLeft": 10,
+            "marginTop": 20,
+          }
+        }
+      >
+          
+        <Icon
+          allowFontScaling={false}
+          name="caret-down"
+          size={12}
+        />
+      </Text>
+    </View>
     <CustomList
       data={
         Array [
diff --git a/app/screens/more_channels/index.js b/app/screens/more_channels/index.js
index 9859af2ed..52a682b9d 100644
--- a/app/screens/more_channels/index.js
+++ b/app/screens/more_channels/index.js
@@ -6,7 +6,7 @@ import {connect} from 'react-redux';
 import {createSelector} from 'reselect';
 import {isLandscape} from 'app/selectors/device';
 import {General} from 'mattermost-redux/constants';
-import {getChannels, joinChannel, searchChannels} from 'mattermost-redux/actions/channels';
+import {joinChannel, searchChannels} from 'mattermost-redux/actions/channels';
 import {getChannelsInCurrentTeam, getMyChannelMemberships} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUserId, getCurrentUserRoles} from 'mattermost-redux/selectors/entities/users';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
@@ -15,11 +15,13 @@ import {isAdmin, isSystemAdmin} from 'mattermost-redux/utils/user_utils';
 import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
 
-import {handleSelectChannel, setChannelDisplayName} from 'app/actions/views/channel';
+import {handleSelectChannel, setChannelDisplayName, loadPublicAndArchivedChannels} from 'app/actions/views/channel';
 
 import MoreChannels from './more_channels';
 
-const joinableChannels = createSelector(
+import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
+
+const joinablePublicChannels = createSelector(
     getChannelsInCurrentTeam,
     getMyChannelMemberships,
     (channels, myMembers) => {
@@ -29,11 +31,19 @@ const joinableChannels = createSelector(
     }
 );
 
+const teamArchivedChannels = createSelector(
+    getChannelsInCurrentTeam,
+    (channels) => {
+        return channels.filter((c) => c.delete_at !== 0);
+    }
+);
+
 function mapStateToProps(state) {
     const config = getConfig(state);
     const license = getLicense(state);
     const roles = getCurrentUserRoles(state);
-    const channels = joinableChannels(state);
+    const channels = joinablePublicChannels(state);
+    const archivedChannels = teamArchivedChannels(state);
     const currentTeamId = getCurrentTeamId(state);
 
     return {
@@ -41,8 +51,10 @@ function mapStateToProps(state) {
         currentUserId: getCurrentUserId(state),
         currentTeamId,
         channels,
+        archivedChannels,
         theme: getTheme(state),
         isLandscape: isLandscape(state),
+        canShowArchivedChannels: isMinimumServerVersion(state.entities.general.serverVersion, 5, 18),
     };
 }
 
@@ -51,7 +63,7 @@ function mapDispatchToProps(dispatch) {
         actions: bindActionCreators({
             handleSelectChannel,
             joinChannel,
-            getChannels,
+            loadPublicAndArchivedChannels,
             searchChannels,
             setChannelDisplayName,
         }, dispatch),
diff --git a/app/screens/more_channels/more_channels.js b/app/screens/more_channels/more_channels.js
index de0cfbbbd..7f1c865e6 100644
--- a/app/screens/more_channels/more_channels.js
+++ b/app/screens/more_channels/more_channels.js
@@ -4,7 +4,8 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {intlShape} from 'react-intl';
-import {Platform, View} from 'react-native';
+import {Platform, View, Text} from 'react-native';
+import Icon from 'react-native-vector-icons/FontAwesome';
 import {Navigation} from 'react-native-navigation';
 
 import {debounce} from 'mattermost-redux/actions/helpers';
@@ -12,6 +13,7 @@ import {General} from 'mattermost-redux/constants';
 import EventEmitter from 'mattermost-redux/utils/event_emitter';
 
 import {paddingHorizontal as padding} from 'app/components/safe_area_view/iphone_x_spacing';
+import BottomSheet from 'app/utils/bottom_sheet';
 import CustomList from 'app/components/custom_list';
 import ChannelListRow from 'app/components/custom_list/channel_list_row';
 import FormattedText from 'app/components/formatted_text';
@@ -33,18 +35,20 @@ export default class MoreChannels extends PureComponent {
         actions: PropTypes.shape({
             handleSelectChannel: PropTypes.func.isRequired,
             joinChannel: PropTypes.func.isRequired,
-            getChannels: PropTypes.func.isRequired,
+            loadPublicAndArchivedChannels: PropTypes.func.isRequired,
             searchChannels: PropTypes.func.isRequired,
             setChannelDisplayName: PropTypes.func.isRequired,
         }).isRequired,
         componentId: PropTypes.string,
         canCreateChannels: PropTypes.bool.isRequired,
         channels: PropTypes.array,
+        archivedChannels: PropTypes.array,
         closeButton: PropTypes.object,
         currentUserId: PropTypes.string.isRequired,
         currentTeamId: PropTypes.string.isRequired,
         theme: PropTypes.object.isRequired,
         isLandscape: PropTypes.bool.isRequired,
+        canShowArchivedChannels: PropTypes.bool.isRequired,
     };
 
     static defaultProps = {
@@ -59,12 +63,15 @@ export default class MoreChannels extends PureComponent {
         super(props, context);
 
         this.searchTimeoutId = 0;
-        this.page = -1;
+        this.publicPage = -1;
+        this.archivedPage = -1;
         this.next = true;
         this.mounted = false;
 
         this.state = {
             channels: props.channels.slice(0, General.CHANNELS_CHUNK_SIZE),
+            archivedChannels: props.archivedChannels.slice(0, General.CHANNELS_CHUNK_SIZE),
+            typeOfChannels: 'public',
             loading: false,
             adding: false,
             term: '',
@@ -130,10 +137,11 @@ export default class MoreChannels extends PureComponent {
     }
 
     cancelSearch = () => {
-        const {channels} = this.props;
+        const {channels, archivedChannels} = this.props;
 
         this.setState({
             channels,
+            archivedChannels,
             term: '',
         });
     };
@@ -143,15 +151,17 @@ export default class MoreChannels extends PureComponent {
     };
 
     doGetChannels = () => {
-        const {actions, currentTeamId} = this.props;
+        const {actions, currentTeamId, canShowArchivedChannels} = this.props;
         const {loading, term} = this.state;
 
         if (this.next && !loading && !term && this.mounted) {
             this.setState({loading: true}, () => {
-                actions.getChannels(
+                actions.loadPublicAndArchivedChannels(
                     currentTeamId,
-                    this.page + 1,
-                    General.CHANNELS_CHUNK_SIZE
+                    this.publicPage + 1,
+                    this.archivedPage + 1,
+                    General.CHANNELS_CHUNK_SIZE,
+                    canShowArchivedChannels,
                 ).then(this.loadedChannels);
             });
         }
@@ -295,36 +305,77 @@ export default class MoreChannels extends PureComponent {
 
     renderItem = (props) => {
         return (
-            <ChannelListRow {...props}/>
+            <ChannelListRow
+                {...props}
+                isArchived={this.state.typeOfChannels === 'archived'}
+            />
         );
     }
 
     searchChannels = (text) => {
-        const {actions, channels, currentTeamId} = this.props;
+        const {actions, channels, archivedChannels, currentTeamId, canShowArchivedChannels} = this.props;
+        const {typeOfChannels} = this.state;
 
         if (text) {
-            const filtered = this.filterChannels(channels, text);
-            this.setState({
-                channels: filtered,
-                term: text,
-            });
-            clearTimeout(this.searchTimeoutId);
-
+            if (typeOfChannels === 'public') {
+                const filtered = this.filterChannels(channels, text);
+                this.setState({
+                    channels: filtered,
+                    term: text,
+                });
+                clearTimeout(this.searchTimeoutId);
+            } else if (typeOfChannels === 'archived' && canShowArchivedChannels) {
+                const filtered = this.filterChannels(archivedChannels, text);
+                this.setState({
+                    archivedChannels: filtered,
+                    term: text,
+                });
+                clearTimeout(this.searchTimeoutId);
+            }
             this.searchTimeoutId = setTimeout(() => {
-                actions.searchChannels(currentTeamId, text.toLowerCase());
+                actions.searchChannels(currentTeamId, text.toLowerCase(), typeOfChannels === 'archived');
             }, General.SEARCH_TIMEOUT_MILLISECONDS);
         } else {
             this.cancelSearch();
         }
     };
 
+    handleDropdownClick = () => {
+        const {formatMessage} = this.context.intl;
+        const publicChannelsText = formatMessage({id: 'more_channels.publicChannels', defaultMessage: 'Public Channels'});
+        const archivedChannelsText = formatMessage({id: 'more_channels.archivedChannels', defaultMessage: 'Archived Channels'});
+        const titleText = formatMessage({id: 'more_channels.dropdownTitle', defaultMessage: 'Show'});
+        const cancelText = 'Cancel';
+        BottomSheet.showBottomSheetWithOptions({
+            options: [publicChannelsText, archivedChannelsText, cancelText],
+            cancelButtonIndex: 2,
+            title: titleText,
+        }, (value) => {
+            let typeOfChannels;
+            switch (value) {
+            case 0:
+                typeOfChannels = 'public';
+                break;
+            case 1:
+                typeOfChannels = 'archived';
+                break;
+            default:
+                typeOfChannels = this.state.typeOfChannels;
+            }
+            this.setState({typeOfChannels});
+        });
+    }
+
     render() {
         const {formatMessage} = this.context.intl;
-        const {theme, isLandscape} = this.props;
-        const {adding, channels, loading, term} = this.state;
+        const {theme, isLandscape, canShowArchivedChannels} = this.props;
+        const {adding, channels, archivedChannels, loading, term, typeOfChannels} = this.state;
         const more = term ? () => true : this.getChannels;
         const style = getStyleFromTheme(theme);
 
+        const publicChannelsText = formatMessage({id: 'more_channels.showPublicChannels', defaultMessage: 'Show: Public Channels'});
+        const archivedChannelsText = formatMessage({id: 'more_channels.showArchivedChannels', defaultMessage: 'Show: Archived Channels'});
+
         let content;
         if (adding) {
             content = (<Loading color={theme.centerChannelColor}/>);
@@ -340,6 +391,31 @@ export default class MoreChannels extends PureComponent {
                 }),
             };
 
+            let activeChannels = channels;
+
+            if (canShowArchivedChannels && typeOfChannels === 'archived') {
+                activeChannels = archivedChannels;
+            }
+
+            let channelDropdown;
+            if (canShowArchivedChannels) {
+                channelDropdown = (
+                    <View style={[style.titleContainer, padding(isLandscape)]}>
+                        <Text
+                            accessibilityRole={'button'}
+                            style={style.channelDropdown}
+                            onPress={this.handleDropdownClick}
+                        >
+                            {typeOfChannels === 'public' ? publicChannelsText : archivedChannelsText}
+                            {'  '}
+                            <Icon
+                                name={'caret-down'}
+                            />
+                        </Text>
+                    </View>
+                );
+            }
+
             content = (
                 <React.Fragment>
                     <View style={[style.searchBar, padding(isLandscape)]}>
@@ -362,8 +438,9 @@ export default class MoreChannels extends PureComponent {
                             value={term}
                         />
                     </View>
+                    {channelDropdown}
                     <CustomList
-                        data={channels}
+                        data={activeChannels}
                         extraData={loading}
                         key='custom_list'
                         loading={loading}
@@ -411,5 +488,11 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             fontSize: 26,
             color: changeOpacity(theme.centerChannelColor, 0.5),
         },
+        channelDropdown: {
+            fontWeight: 'bold',
+            marginLeft: 10,
+            marginTop: 20,
+            marginBottom: 10,
+        },
     };
 });
diff --git a/app/screens/more_channels/more_channels.test.js b/app/screens/more_channels/more_channels.test.js
index c2ebd9628..300735e54 100644
--- a/app/screens/more_channels/more_channels.test.js
+++ b/app/screens/more_channels/more_channels.test.js
@@ -16,7 +16,7 @@ describe('MoreChannels', () => {
     const actions = {
         handleSelectChannel: jest.fn(),
         joinChannel: jest.fn(),
-        getChannels: jest.fn().mockResolvedValue({data: [{id: 'id2', name: 'name2', display_name: 'display_name2'}]}),
+        loadPublicAndArchivedChannels: jest.fn().mockResolvedValue({data: [{id: 'id2', name: 'name2', display_name: 'display_name2'}]}),
         searchChannels: jest.fn(),
         setChannelDisplayName: jest.fn(),
     };
@@ -25,12 +25,14 @@ describe('MoreChannels', () => {
         actions,
         canCreateChannels: true,
         channels: [{id: 'id', name: 'name', display_name: 'display_name'}],
+        archivedChannels: [{id: 'id2', name: 'archived', display_name: 'archived channel'}],
         closeButton: {},
         currentUserId: 'current_user_id',
         currentTeamId: 'current_team_id',
         theme: Preferences.THEMES.default,
         componentId: 'component-id',
         isLandscape: false,
+        canShowArchivedChannels: true,
     };
 
     test('should match snapshot', () => {
@@ -91,4 +93,20 @@ describe('MoreChannels', () => {
         expect(wrapper.state('term')).toEqual('');
         expect(wrapper.state('channels')).toEqual(baseProps.channels);
     });
+
+    test('should search correct channels', () => {
+        const wrapper = shallow(
+            <MoreChannels {...baseProps}/>,
+            {context: {intl: {formatMessage: jest.fn()}}},
+        );
+        const instance = wrapper.instance();
+
+        wrapper.setState({typeOfChannels: 'public'});
+        instance.searchChannels('display_name');
+        expect(wrapper.state('channels')).toEqual(baseProps.channels);
+
+        wrapper.setState({typeOfChannels: 'archived'});
+        instance.searchChannels('archived channel');
+        expect(wrapper.state('archivedChannels')).toEqual(baseProps.archivedChannels);
+    });
 });
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 061d6bc87..c75414a53 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -492,7 +492,12 @@
   "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...",
diff --git a/package-lock.json b/package-lock.json
index 9fe3dd749..68639aecd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7816,8 +7816,8 @@
       }
     },
     "mattermost-redux": {
-      "version": "github:mattermost/mattermost-redux#98a375cea54f78fb6c0ede01ee4e9aec009f9fa5",
-      "from": "github:mattermost/mattermost-redux#98a375cea54f78fb6c0ede01ee4e9aec009f9fa5",
+      "version": "github:mattermost/mattermost-redux#ebd4fd361e982bf2f9b5737642dc5fcf6e1fa3f7",
+      "from": "github:mattermost/mattermost-redux#ebd4fd361e982bf2f9b5737642dc5fcf6e1fa3f7",
       "requires": {
         "form-data": "2.5.1",
         "gfycat-sdk": "1.4.18",
diff --git a/package.json b/package.json
index e9e0f22c4..19e8001e0 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "intl": "1.2.5",
     "jail-monkey": "2.3.0",
     "jsc-android": "241213.1.0",
-    "mattermost-redux": "github:mattermost/mattermost-redux#98a375cea54f78fb6c0ede01ee4e9aec009f9fa5",
+    "mattermost-redux": "github:mattermost/mattermost-redux#ebd4fd361e982bf2f9b5737642dc5fcf6e1fa3f7",
     "mime-db": "1.42.0",
     "moment-timezone": "0.5.27",
     "prop-types": "15.7.2",

From c68138150e478acdc72022dba0e0435d8c2ad582 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 18 Nov 2019 12:16:30 -0300
Subject: [PATCH 13/16] Fix theme color for the more channel options (#3565)

---
 .../more_channels/__snapshots__/more_channels.test.js.snap       | 1 +
 app/screens/more_channels/more_channels.js                       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
index ef31e17bd..0a0b899b7 100644
--- a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
+++ b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
@@ -56,6 +56,7 @@ exports[`MoreChannels should match snapshot 1`] = `
         onPress={[Function]}
         style={
           Object {
+            "color": "#3d3c40",
             "fontWeight": "bold",
             "marginBottom": 10,
             "marginLeft": 10,
diff --git a/app/screens/more_channels/more_channels.js b/app/screens/more_channels/more_channels.js
index 7f1c865e6..f8f00b2d3 100644
--- a/app/screens/more_channels/more_channels.js
+++ b/app/screens/more_channels/more_channels.js
@@ -489,6 +489,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             color: changeOpacity(theme.centerChannelColor, 0.5),
         },
         channelDropdown: {
+            color: theme.centerChannelColor,
             fontWeight: 'bold',
             marginLeft: 10,
             marginTop: 20,

From 00874eb3ffccbd6b1f6f02ea0c5d1dea2d754993 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 18 Nov 2019 12:31:29 -0300
Subject: [PATCH 14/16] MM-20007 Fix app crashes when previewing some gif files
 (#3563)

---
 app/components/message_attachments/attachment_thumbnail.js | 5 +++--
 app/components/progressive_image/progressive_image.js      | 4 +++-
 app/screens/image_preview/image_preview.js                 | 4 ++--
 package-lock.json                                          | 5 +++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/components/message_attachments/attachment_thumbnail.js b/app/components/message_attachments/attachment_thumbnail.js
index fe7f443be..8f660e378 100644
--- a/app/components/message_attachments/attachment_thumbnail.js
+++ b/app/components/message_attachments/attachment_thumbnail.js
@@ -2,8 +2,9 @@
 // See LICENSE.txt for license information.
 
 import React, {PureComponent} from 'react';
-import {Image, StyleSheet, View} from 'react-native';
+import {StyleSheet, View} from 'react-native';
 import PropTypes from 'prop-types';
+import FastImage from 'react-native-fast-image';
 
 export default class AttachmentThumbnail extends PureComponent {
     static propTypes = {
@@ -19,7 +20,7 @@ export default class AttachmentThumbnail extends PureComponent {
 
         return (
             <View style={style.container}>
-                <Image
+                <FastImage
                     source={{uri}}
                     resizeMode='contain'
                     resizeMethod='scale'
diff --git a/app/components/progressive_image/progressive_image.js b/app/components/progressive_image/progressive_image.js
index 3f8ac7c18..7dead8f8a 100644
--- a/app/components/progressive_image/progressive_image.js
+++ b/app/components/progressive_image/progressive_image.js
@@ -4,12 +4,14 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {Animated, Image, ImageBackground, Platform, View, StyleSheet} from 'react-native';
+import FastImage from 'react-native-fast-image';
 
 import CustomPropTypes from 'app/constants/custom_prop_types';
 import ImageCacheManager from 'app/utils/image_cache_manager';
 import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
 
 const AnimatedImageBackground = Animated.createAnimatedComponent(ImageBackground);
+const AnimatedImage = Animated.createAnimatedComponent(FastImage);
 
 export default class ProgressiveImage extends PureComponent {
     static propTypes = {
@@ -131,7 +133,7 @@ export default class ProgressiveImage extends PureComponent {
             ImageComponent = AnimatedImageBackground;
         } else {
             DefaultComponent = Image;
-            ImageComponent = Animated.Image;
+            ImageComponent = AnimatedImage;
         }
 
         const styles = getStyleSheet(theme);
diff --git a/app/screens/image_preview/image_preview.js b/app/screens/image_preview/image_preview.js
index 150e8d879..68ff8f408 100644
--- a/app/screens/image_preview/image_preview.js
+++ b/app/screens/image_preview/image_preview.js
@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
 import {
     Alert,
     Animated,
-    Image,
     Platform,
     SafeAreaView,
     StatusBar,
@@ -22,6 +21,7 @@ import {intlShape} from 'react-intl';
 import Permissions from 'react-native-permissions';
 import Gallery from 'react-native-image-gallery';
 import DeviceInfo from 'react-native-device-info';
+import FastImage from 'react-native-fast-image';
 
 import EventEmitter from 'mattermost-redux/utils/event_emitter';
 
@@ -374,7 +374,7 @@ export default class ImagePreview extends PureComponent {
 
             return (
                 <View style={[style, {justifyContent: 'center', alignItems: 'center'}]}>
-                    <Image
+                    <FastImage
                         source={source}
                         style={imageStyle}
                     />
diff --git a/package-lock.json b/package-lock.json
index 68639aecd..9a885108c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1293,6 +1293,11 @@
       "resolved": "https://registry.npmjs.org/@react-native-community/async-storage/-/async-storage-1.6.2.tgz",
       "integrity": "sha512-EJGsbrHubK1mGxPjWB74AaHAd5m9I+Gg2RRPZzMK6org7QOU9WOBnIMFqoeVto3hKOaEPlk8NV74H6G34/2pZQ=="
     },
+    "@react-native-community/cameraroll": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cameraroll/-/cameraroll-1.3.0.tgz",
+      "integrity": "sha512-QJl9N34euvGU7s/Gn6jhsqi70O4SmxFxuy+yBnW7ehE8qtPYO91gyLLrtiWdTfYvuVCUNvX/G0LKJQLm8SojAA=="
+    },
     "@react-native-community/cli-platform-android": {
       "version": "3.0.0-alpha.7",
       "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-3.0.0-alpha.7.tgz",

From b2e657b159e1b65abf5ece44ca5a7a569c51ff34 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 18 Nov 2019 12:56:01 -0300
Subject: [PATCH 15/16] MM-19991 Filtering search by channel should also show
 the channel name and not only its ID (#3561)

---
 .../autocomplete/channel_mention_item/index.js |  6 +++---
 app/selectors/autocomplete.js                  | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/components/autocomplete/channel_mention_item/index.js b/app/components/autocomplete/channel_mention_item/index.js
index c70208684..1671fd391 100644
--- a/app/components/autocomplete/channel_mention_item/index.js
+++ b/app/components/autocomplete/channel_mention_item/index.js
@@ -20,7 +20,7 @@ function mapStateToProps(state, ownProps) {
 
     let isBot = false;
     let isGuest = false;
-    if (channel.type === General.DM_CHANNEL) {
+    if (channel?.type === General.DM_CHANNEL) {
         const teammate = getUser(state, channel.teammate_id);
         if (teammate) {
             displayName = teammate.username;
@@ -31,8 +31,8 @@ function mapStateToProps(state, ownProps) {
 
     return {
         displayName,
-        name: channel.name,
-        type: channel.type,
+        name: channel?.name,
+        type: channel?.type,
         isBot,
         isGuest,
         theme: getTheme(state),
diff --git a/app/selectors/autocomplete.js b/app/selectors/autocomplete.js
index 838202a11..926a44a48 100644
--- a/app/selectors/autocomplete.js
+++ b/app/selectors/autocomplete.js
@@ -48,11 +48,11 @@ export const getMatchTermForChannelMention = (() => {
             lastIsSearch = isSearch;
             if (match) {
                 if (isSearch) {
-                    lastMatchTerm = match[1];
+                    lastMatchTerm = match[1].toLowerCase();
                 } else if (match.index > 0 && value[match.index - 1] === '~') {
                     lastMatchTerm = null;
                 } else {
-                    lastMatchTerm = match[2];
+                    lastMatchTerm = match[2].toLowerCase();
                 }
             } else {
                 lastMatchTerm = null;
@@ -152,7 +152,7 @@ export const filterMyChannels = createSelector(
         if (matchTerm) {
             channels = myChannels.filter((c) => {
                 return (c.type === General.OPEN_CHANNEL || c.type === General.PRIVATE_CHANNEL) &&
-                    (c.name.startsWith(matchTerm) || c.display_name.startsWith(matchTerm));
+                    (c.name.toLowerCase().startsWith(matchTerm) || c.display_name.toLowerCase().startsWith(matchTerm));
             });
         } else {
             channels = myChannels.filter((c) => {
@@ -175,7 +175,7 @@ export const filterOtherChannels = createSelector(
         let channels;
         if (matchTerm) {
             channels = otherChannels.filter((c) => {
-                return (c.name.startsWith(matchTerm) || c.display_name.startsWith(matchTerm));
+                return (c.name.toLowerCase().startsWith(matchTerm) || c.display_name.toLowerCase().startsWith(matchTerm));
             });
         } else {
             channels = otherChannels;
@@ -200,9 +200,9 @@ export const filterPublicChannels = createSelector(
         if (matchTerm) {
             channels = myChannels.filter((c) => {
                 return c.type === General.OPEN_CHANNEL &&
-                    (c.name.startsWith(matchTerm) || c.display_name.startsWith(matchTerm));
+                    (c.name.toLowerCase().startsWith(matchTerm) || c.display_name.toLowerCase().startsWith(matchTerm));
             }).concat(
-                otherChannels.filter((c) => c.name.startsWith(matchTerm) || c.display_name.startsWith(matchTerm))
+                otherChannels.filter((c) => c.name.toLowerCase().startsWith(matchTerm) || c.display_name.toLowerCase().startsWith(matchTerm))
             );
         } else {
             channels = myChannels.filter((c) => {
@@ -232,7 +232,7 @@ export const filterPrivateChannels = createSelector(
         if (matchTerm) {
             channels = myChannels.filter((c) => {
                 return c.type === General.PRIVATE_CHANNEL &&
-                    (c.name.startsWith(matchTerm) || c.display_name.startsWith(matchTerm));
+                    (c.name.toLowerCase().startsWith(matchTerm) || c.display_name.toLowerCase().startsWith(matchTerm));
             });
         } else {
             channels = myChannels.filter((c) => {
@@ -261,10 +261,10 @@ export const filterDirectAndGroupMessages = createSelector(
         let channels;
         if (matchTerm) {
             channels = myChannels.filter((c) => {
-                if (c.type === General.DM_CHANNEL && (originalChannels[c.id].display_name.startsWith(matchTerm))) {
+                if (c.type === General.DM_CHANNEL && (originalChannels[c.id].display_name.toLowerCase().startsWith(matchTerm))) {
                     return true;
                 }
-                if (c.type === General.GM_CHANNEL && (c.name.startsWith(matchTerm) || c.display_name.replace(/ /g, '').startsWith(matchTerm))) {
+                if (c.type === General.GM_CHANNEL && (c.name.toLowerCase().startsWith(matchTerm) || c.display_name.toLowerCase().replace(/ /g, '').startsWith(matchTerm))) {
                     return true;
                 }
                 return false;

From 84a874918d6be0129440b00c4324b0ee17cc7ad8 Mon Sep 17 00:00:00 2001
From: Amy Blais <amy_blais@hotmail.com>
Date: Mon, 18 Nov 2019 13:15:04 -0500
Subject: [PATCH 16/16] v1.25 Changelog (#3440)

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b98e4f991..fad40dad6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Mattermost Mobile Apps Changelog
 
+## 1.25.0 Release
+- Release Date: November 16, 2019
+- Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device
+
+### Compatibility
+ - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).
+ - iPhone 5s devices and later with iOS 11+ is required.
+
+### Bug Fixes
+ - Fixed an issue where Mattermost monokai theme no longer worked properly on mobile apps.
+ - Fixed an issue on Android where the notification badge count didn't update when using multiple channels.
+ - Fixed an issue on Android where test notifications did not work properly.
+ - Fixed an issue where "In-app" notifications caused the app badge count to get out of sync.
+ - Fixed an issue on Android where email notification setting displayed was not updated when the setting was changed.
+ - Fixed an issue where Favorite channels list didn't update if the app was running in the background.
+ - Fixed an issue where the timezone setting did not update when changing it back to set automatically.
+ - Fixed an issue on iOS where clicking on a hashtag from "recent mentions" (or flagged posts) returned the user to the channel instead of displaying hashtag search results.
+ - Fixed an issue where tapping on a hashtag engaged a keyboard for a moment before displaying search results.
+ - Fixed an issue where posts of the same thread appeared to be from different threads if separated by a new message line.
+ - Fixed styling issues on iOS for Name, Purpose and Header information on the channel info screen.
+ - Fixed styling issues with bot posts timestamps in search results and pinned posts.
+ - Fixed styling issues on single sign-on screen in landscape view on iOS iPhone X and later.
+ - Fixed styling issues on iOS for the Helper text on Settings screens.
+ - Fixed an issue where the thread view header theme was inconsistent during transition back to main channel view.
+ - Fixed an issue on iOS where the navigation bar tucked under the phone's status bar when switching orientation.
+ - Fixed an issue on iOS where the keyboard flashed darker when Automatic Replies had been previously enabled.
+ - Fixed an issue on Android where uploading pictures from storage or camera required unwanted permissions.
+ - Fixed an issue where ``mobile.message_length.message`` did not match webapp's ``create_post.error_message``.
+ 
+### Known Issues
+ - App slows down when opening a channel with large number of animated emoji. [MM-15792](https://mattermost.atlassian.net/browse/MM-15792)
+
 ## 1.24.0 Release
 - Release Date: October 16, 2019
 - Server Versions Supported: Server v5.9+ is required, Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device