Merge branch 'release/1.7.0'

.circleci/config.yml

@@ -5,7 +5,7 @@ orbs:
 jobs:
   build-and-test:
     docker:
-      - image: circleci/node:12.22.0
+      - image: circleci/node:14.15.0
     steps:
       - checkout
       - restore_cache:

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.js

@@ -5,7 +5,6 @@ module.exports = {
   rules: {
     'no-console': 2,
     'react/prop-types': 2,
-    'prettier/prettier': 'off',
     radix: 'off',
   },
 };

.gitignore

@@ -80,3 +80,5 @@ ios/GoogleService-Info.plist
 sentry.js
 ios/sentry.properties
 android/sentry.properties
+
+GoogleService-Info.plist

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint
+yarn test

.vscode/extensions.json

@@ -0,0 +1,25 @@
+{
+    "recommendations": [
+      // Spell check
+      "streetsidesoftware.code-spell-checker",
+      // Better Comments
+      "aaron-bond.better-comments",
+      // Path Autocomplete
+      "ionutvmi.path-autocomplete",
+      // Eslint
+      "dbaeumer.vscode-eslint",
+      // Auto Close Tag
+      "formulahendry.auto-close-tag",
+      // Auto Rename Tag
+      "formulahendry.auto-rename-tag",
+      // Hight light colors
+      "naumovs.color-highlight",
+      // GitLens
+      "eamodio.gitlens",
+      // Prettier
+      "esbenp.prettier-vscode",
+      // Dot Env
+      "mikestead.dotenv"
+    ]
+  }
+

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+  "cSpell.words": [
+    "Chatwoot",
+    "linkify",
+    "markdownit",
+    "middlewares",
+    "persistor",
+    "Pressable",
+    "reduxjs",
+    "Swipeable"
+  ]
+}

README.md

@@ -13,7 +13,7 @@
   <img src="https://img.shields.io/discord/647412545203994635" alt="Discord">
   <a href="https://discord.gg/cJXdrwS"><img src="https://img.shields.io/badge/chat-Discord-violet?logo=discord" alt="Chat on Discord"></a>
    <a href="http://makeapullrequest.com"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="Chat on Discord"></a>
- <img src="https://img.shields.io/github/license/chatwoot/chatwoot" alt="License">
+ <img src="https://img.shields.io/github/license/chatwoot/chatwoot-mobile-app" alt="License">
 </p>
 
 - **Supported Chatwoot version:** 2.0.0+

__mocks__/react-native-snackbar.js

@@ -0,0 +1,3 @@
+module.exports = {
+  show: jest.fn(),
+};

android/Gemfile.lock

@@ -133,7 +133,7 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     json (2.5.1)
     jwt (2.2.2)
     memoist (0.16.2)

android/app/build.gradle

@@ -136,8 +136,8 @@ android {
         applicationId "com.chatwoot.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5028
-        versionName "1.4.0"
+        versionCode 5064
+        versionName "1.7.0"
         multiDexEnabled true 
     }
     splits {

android/app/proguard-rules.pro

@@ -10,4 +10,7 @@
 # Add any project specific keep options here:
 -keep class com.facebook.jni.** { *; }
 -keep public class com.horcrux.svg.** {*;}
--keep class com.chatwoot.app.BuildConfig { *; }
+-keep class com.chatwoot.app.BuildConfig { *; }
+-keep class com.chatwoot.app.BuildConfig { *; }
+-keep class com.swmansion.reanimated.** { *; }
+-keep class com.facebook.react.turbomodule.** { *; }

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,8 @@
   <uses-permission android:name="android.permission.INTERNET" />
 
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity" android:label="@string/app_name" android:screenOrientation="portrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize">
+    <activity android:name=".MainActivity" android:label="@string/app_name" android:screenOrientation="portrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize"
+     android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />

android/build.gradle

@@ -1,11 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
 
 buildscript {
     ext {
         buildToolsVersion = "30.0.2"
         minSdkVersion = 21
         compileSdkVersion = 30
-        targetSdkVersion = 30
+        targetSdkVersion = 31
         ndkVersion = "21.4.7075529"
     }
     repositories {
@@ -21,6 +22,12 @@ buildscript {
 }
 
 allprojects {
+     configurations.all {
+        resolutionStrategy {
+            force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
+        }
+    }
+
     repositories {
         mavenLocal()
         maven {

android/fastlane/README.md

@@ -1,44 +1,56 @@
 fastlane documentation
-================
+----
+
 # Installation
 
 Make sure you have the latest version of the Xcode command line tools installed:
 
-```
+```sh
 xcode-select --install
 ```
 
-Install _fastlane_ using
-```
-[sudo] gem install fastlane -NV
-```
-or alternatively using `brew install fastlane`
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
 
 # Available Actions
+
 ## Android
+
 ### android test
+
+```sh
+[bundle exec] fastlane android test
 ```
-fastlane android test
-```
+
 Runs all the tests
+
 ### android beta_internal
+
+```sh
+[bundle exec] fastlane android beta_internal
 ```
-fastlane android beta_internal
-```
+
 Submit a new Beta Build to Beta(Internal)
+
 ### android beta_open
+
+```sh
+[bundle exec] fastlane android beta_open
 ```
-fastlane android beta_open
-```
+
 Submit a new Beta Build to Beta(Open)
+
 ### android deploy
+
+```sh
+[bundle exec] fastlane android deploy
 ```
-fastlane android deploy
-```
+
 Deploy a new version to the Google Play
 
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
-The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

babel.config.js

@@ -17,15 +17,18 @@ module.exports = {
           '.json',
         ],
         alias: {
+          src: './src',
           components: './src/components',
           actions: './src/actions',
           constants: './src/constants',
           helpers: './src/helpers',
           i18n: './src/i18n',
           reducer: './src/reducer',
           screens: './src/screens',
+          tests: './src/tests',
         },
       },
     ],
+    ['react-native-reanimated/plugin'],
   ],
 };

index.js

@@ -6,8 +6,16 @@ import { initAnalytics } from './src/helpers/Analytics';
 
 import App from './src/app';
 
-AppRegistry.registerComponent(appName, () => App);
-Sentry.init({
-  dsn: Config.SENTRY_DSN,
-});
+let RegisteredApp = App;
+// Comment this line if you don't want to use Storybook
+// RegisteredApp = __DEV__ ? require('./storybook').default : App;
+
+AppRegistry.registerComponent(appName, () => RegisteredApp);
+
+if (!__DEV__) {
+  Sentry.init({
+    dsn: Config.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+  });
+}
 initAnalytics();