Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…

…eactNative into chore.update-xcode-image
RocketChat · Nov 30, 2019 · 2b032a6 · 2b032a6
2 parents 3ce32af + cbd812c
commit 2b032a6
Show file tree

Hide file tree

Showing 236 changed files with 17,269 additions and 15,360 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -257,7 +257,8 @@ jobs:
       - run:
           name: Update Fastlane
           command: |
-            sudo bundle install
+            echo "ruby-2.4" > ~/.ruby-version
+            bundle install
           working_directory: ios
 
       - run:
@@ -334,7 +335,8 @@ jobs:
       - run:
           name: Update Fastlane
           command: |
-            sudo bundle install
+            echo "ruby-2.4" > ~/.ruby-version
+            bundle install
           working_directory: ios
 
       - run:

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,7 +2,7 @@ module.exports = {
 	"settings": {
     "import/resolver": {
       "node": {
-        "extensions": [".js", ".ios.js", ".android.js"]
+        "extensions": [".js", ".ios.js", ".android.js", ".native.js"]
       }
     }
   },

diff --git a/__mocks__/react-native-device-info.js b/__mocks__/react-native-device-info.js
@@ -1,5 +1,6 @@
 export default {
 	getModel: () => '',
 	getReadableVersion: () => '',
-	getBundleId: () => ''
+	getBundleId: () => '',
+	isTablet: () => false
 };
diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap
@@ -6012,13 +6012,7 @@ exports[`Storyshots Message list 1`] = `
                           "fontWeight": "400",
                         },
                         Array [
-                          Object {
-                            "backgroundColor": "transparent",
-                            "color": "#2F343D",
-                            "fontFamily": "System",
-                            "fontSize": 30,
-                            "fontWeight": "400",
-                          },
+                          Object {},
                           Object {
                             "alignItems": "flex-start",
                             "flexDirection": "row",
@@ -6040,8 +6034,8 @@ exports[`Storyshots Message list 1`] = `
                           "overflow": "hidden",
                         },
                         Object {
-                          "height": 30,
-                          "width": 30,
+                          "height": 20,
+                          "width": 20,
                         },
                       ]
                     }
@@ -6077,13 +6071,7 @@ exports[`Storyshots Message list 1`] = `
                           "fontWeight": "400",
                         },
                         Array [
-                          Object {
-                            "backgroundColor": "transparent",
-                            "color": "#2F343D",
-                            "fontFamily": "System",
-                            "fontSize": 30,
-                            "fontWeight": "400",
-                          },
+                          Object {},
                           Object {
                             "alignItems": "flex-start",
                             "flexDirection": "row",
@@ -9953,7 +9941,6 @@ exports[`Storyshots Message list 1`] = `
                           "borderColor": "#e1e5e8",
                           "borderRadius": 4,
                           "borderWidth": 1,
-                          "maxWidth": 400,
                           "minHeight": 200,
                           "width": "100%",
                         },
@@ -10211,7 +10198,6 @@ exports[`Storyshots Message list 1`] = `
                           "borderColor": "#e1e5e8",
                           "borderRadius": 4,
                           "borderWidth": 1,
-                          "maxWidth": 400,
                           "minHeight": 200,
                           "width": "100%",
                         },
@@ -11009,17 +10995,20 @@ exports[`Storyshots Message list 1`] = `
               <View />
               <View
                 style={
-                  Object {
-                    "alignItems": "center",
-                    "backgroundColor": "#f3f4f5",
-                    "borderColor": "#e1e5e8",
-                    "borderRadius": 4,
-                    "borderWidth": 1,
-                    "flex": 1,
-                    "flexDirection": "row",
-                    "height": 56,
-                    "marginBottom": 6,
-                  }
+                  Array [
+                    Object {
+                      "alignItems": "center",
+                      "backgroundColor": "#f3f4f5",
+                      "borderColor": "#e1e5e8",
+                      "borderRadius": 4,
+                      "borderWidth": 1,
+                      "flex": 1,
+                      "flexDirection": "row",
+                      "height": 56,
+                      "marginBottom": 6,
+                    },
+                    undefined,
+                  ]
                 }
               >
                 View
@@ -11334,17 +11323,20 @@ exports[`Storyshots Message list 1`] = `
               <View />
               <View
                 style={
-                  Object {
-                    "alignItems": "center",
-                    "backgroundColor": "#f3f4f5",
-                    "borderColor": "#e1e5e8",
-                    "borderRadius": 4,
-                    "borderWidth": 1,
-                    "flex": 1,
-                    "flexDirection": "row",
-                    "height": 56,
-                    "marginBottom": 6,
-                  }
+                  Array [
+                    Object {
+                      "alignItems": "center",
+                      "backgroundColor": "#f3f4f5",
+                      "borderColor": "#e1e5e8",
+                      "borderRadius": 4,
+                      "borderWidth": 1,
+                      "flex": 1,
+                      "flexDirection": "row",
+                      "height": 56,
+                      "marginBottom": 6,
+                    },
+                    undefined,
+                  ]
                 }
               >
                 View
@@ -11540,17 +11532,20 @@ exports[`Storyshots Message list 1`] = `
               <View />
               <View
                 style={
-                  Object {
-                    "alignItems": "center",
-                    "backgroundColor": "#f3f4f5",
-                    "borderColor": "#e1e5e8",
-                    "borderRadius": 4,
-                    "borderWidth": 1,
-                    "flex": 1,
-                    "flexDirection": "row",
-                    "height": 56,
-                    "marginBottom": 6,
-                  }
+                  Array [
+                    Object {
+                      "alignItems": "center",
+                      "backgroundColor": "#f3f4f5",
+                      "borderColor": "#e1e5e8",
+                      "borderRadius": 4,
+                      "borderWidth": 1,
+                      "flex": 1,
+                      "flexDirection": "row",
+                      "height": 56,
+                      "marginBottom": 6,
+                    },
+                    undefined,
+                  ]
                 }
               >
                 View
@@ -11718,17 +11713,20 @@ exports[`Storyshots Message list 1`] = `
               <View />
               <View
                 style={
-                  Object {
-                    "alignItems": "center",
-                    "backgroundColor": "#f3f4f5",
-                    "borderColor": "#e1e5e8",
-                    "borderRadius": 4,
-                    "borderWidth": 1,
-                    "flex": 1,
-                    "flexDirection": "row",
-                    "height": 56,
-                    "marginBottom": 6,
-                  }
+                  Array [
+                    Object {
+                      "alignItems": "center",
+                      "backgroundColor": "#f3f4f5",
+                      "borderColor": "#e1e5e8",
+                      "borderRadius": 4,
+                      "borderWidth": 1,
+                      "flex": 1,
+                      "flexDirection": "row",
+                      "height": 56,
+                      "marginBottom": 6,
+                    },
+                    undefined,
+                  ]
                 }
               >
                 View
@@ -12130,7 +12128,7 @@ exports[`Storyshots Message list 1`] = `
                 style={
                   Object {
                     "alignItems": "center",
-                    "alignSelf": "flex-end",
+                    "alignSelf": "flex-start",
                     "backgroundColor": "#f3f4f5",
                     "borderColor": "#e1e5e8",
                     "borderRadius": 4,
@@ -12493,7 +12491,7 @@ exports[`Storyshots Message list 1`] = `
                 style={
                   Object {
                     "alignItems": "center",
-                    "alignSelf": "flex-end",
+                    "alignSelf": "flex-start",
                     "backgroundColor": "#f3f4f5",
                     "borderColor": "#e1e5e8",
                     "borderRadius": 4,
@@ -19491,7 +19489,7 @@ exports[`Storyshots Message list 1`] = `
                 style={
                   Object {
                     "alignItems": "center",
-                    "alignSelf": "flex-end",
+                    "alignSelf": "flex-start",
                     "backgroundColor": "#f3f4f5",
                     "borderColor": "#e1e5e8",
                     "borderRadius": 4,
@@ -20028,7 +20026,7 @@ exports[`Storyshots Message list 1`] = `
                 style={
                   Object {
                     "alignItems": "center",
-                    "alignSelf": "flex-end",
+                    "alignSelf": "flex-start",
                     "backgroundColor": "#f3f4f5",
                     "borderColor": "#e1e5e8",
                     "borderRadius": 4,
@@ -20222,7 +20220,7 @@ exports[`Storyshots Message list 1`] = `
                 style={
                   Object {
                     "alignItems": "center",
-                    "alignSelf": "flex-end",
+                    "alignSelf": "flex-start",
                     "backgroundColor": "#f3f4f5",
                     "borderColor": "#e1e5e8",
                     "borderRadius": 4,

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -138,7 +138,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "1.20.2"
+        versionName "1.25.0"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
     }

diff --git a/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:background="@color/splashBackground"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/launch_screen" android:scaleType="centerCrop" />
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/launch_screen"
+        android:scaleType="fitCenter"
+    />
 </RelativeLayout>
diff --git a/app/actions/login.js b/app/actions/login.js
@@ -1,9 +1,10 @@
 import * as types from './actionsTypes';
 
-export function loginRequest(credentials) {
+export function loginRequest(credentials, logoutOnError) {
 	return {
 		type: types.LOGIN.REQUEST,
-		credentials
+		credentials,
+		logoutOnError
 	};
 }