Skip to content

Commit 50c5c44

Browse files
muhsin-kmuhsin-k
committed
merge develop
2 parents a214f9c + 8a394a9 commit 50c5c44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+994
-647
lines changed

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SENTRY_DSN=

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@ And install dependencies
4242

4343
Create a new project in [Sentry](https://sentry.io/for/react-native/)
4444

45-
Create file sentry under `sentry.js` in root of the project.
4645

47-
Add the following contents.
48-
49-
```
50-
export const SENTRY_TOKEN_URL =<SENTRY_TOKEN_URL>;
51-
```
46+
Add `SENTRY_DSN` value in `.env` file.
5247

5348
If you want to supports native crashes, link the sentry SDK to your native projects.
5449
Run the command

‎LICENSE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017-2020 ThoughtWoot Inc.
3+
Copyright (c) 2017-2021 Chatwoot Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
99
copies of the Software, and to permit persons to whom the Software is
1010
furnished to do so, subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1717
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ If you want to self deploy the Chatwoot mobile app, please take a look at the [C
6161

6262
If there's anything you'd like to chat about, please feel free to join our [Discord](https://discord.gg/cJXdrwS) chat!
6363

64-
_Chatwoot_ &copy; 2017-2020, ThoughtWoot Inc - Released under the MIT License.
64+
_Chatwoot_ &copy; 2017-2020, Chatwoot Inc - Released under the MIT License.

‎android/app/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ android {
134134
applicationId "com.chatwoot.app"
135135
minSdkVersion rootProject.ext.minSdkVersion
136136
targetSdkVersion rootProject.ext.targetSdkVersion
137-
versionCode 111
138-
versionName "1.0.11"
137+
versionCode 113
138+
versionName "1.0.13"
139139
multiDexEnabled true
140140
}
141141
splits {
@@ -235,3 +235,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
235235
}
236236

237237
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
238+
apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"

‎babel.config.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
11
module.exports = {
22
presets: ['module:metro-react-native-babel-preset'],
3+
plugins: [
4+
[
5+
'module-resolver',
6+
{
7+
root: ['.'],
8+
extensions: [
9+
'.ios.ts',
10+
'.android.ts',
11+
'.ts',
12+
'.ios.tsx',
13+
'.android.tsx',
14+
'.tsx',
15+
'.jsx',
16+
'.js',
17+
'.json',
18+
],
19+
alias: {
20+
components: './src/components',
21+
actions: './src/actions',
22+
constants: './src/constants',
23+
helpers: './src/helpers',
24+
i18n: './src/i18n',
25+
reducer: './src/reducer',
26+
},
27+
},
28+
],
29+
],
330
};

‎index.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import { AppRegistry } from 'react-native';
22
import * as Sentry from '@sentry/react-native';
3-
3+
import Config from 'react-native-config';
44
import { name as appName } from './app.json';
55

6-
import { SENTRY_TOKEN_URL } from './sentry';
7-
86
import App from './src/app';
97

108
AppRegistry.registerComponent(appName, () => App);
11-
129
Sentry.init({
13-
dsn: SENTRY_TOKEN_URL,
10+
dsn: Config.SENTRY_DSN,
1411
});

‎ios/Chatwoot.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -724,13 +724,13 @@
724724
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
725725
CLANG_ENABLE_MODULES = YES;
726726
CODE_SIGN_ENTITLEMENTS = Chatwoot/Chatwoot.entitlements;
727-
CURRENT_PROJECT_VERSION = 112;
727+
CURRENT_PROJECT_VERSION = 113;
728728
DEVELOPMENT_TEAM = 6C953F3RX2;
729729
ENABLE_BITCODE = NO;
730730
INFOPLIST_FILE = Chatwoot/Info.plist;
731731
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
732732
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
733-
MARKETING_VERSION = 1.0.12;
733+
MARKETING_VERSION = 1.0.13;
734734
OTHER_LDFLAGS = (
735735
"$(inherited)",
736736
"-ObjC",
@@ -751,12 +751,12 @@
751751
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
752752
CLANG_ENABLE_MODULES = YES;
753753
CODE_SIGN_ENTITLEMENTS = Chatwoot/Chatwoot.entitlements;
754-
CURRENT_PROJECT_VERSION = 112;
754+
CURRENT_PROJECT_VERSION = 113;
755755
DEVELOPMENT_TEAM = 6C953F3RX2;
756756
INFOPLIST_FILE = Chatwoot/Info.plist;
757757
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
758758
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
759-
MARKETING_VERSION = 1.0.12;
759+
MARKETING_VERSION = 1.0.13;
760760
OTHER_LDFLAGS = (
761761
"$(inherited)",
762762
"-ObjC",

‎ios/Podfile.lock‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,12 @@ PODS:
296296
- React-cxxreact (= 0.63.3)
297297
- React-jsi (= 0.63.3)
298298
- React-jsinspector (0.63.3)
299+
- react-native-config (1.4.2):
300+
- react-native-config/App (= 1.4.2)
301+
- react-native-config/App (1.4.2):
302+
- React-Core
303+
- react-native-document-picker (5.0.0):
304+
- React-Core
299305
- react-native-image-picker (3.1.4):
300306
- React-Core
301307
- react-native-netinfo (5.9.10):
@@ -443,6 +449,8 @@ DEPENDENCIES:
443449
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
444450
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
445451
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
452+
- react-native-config (from `../node_modules/react-native-config`)
453+
- react-native-document-picker (from `../node_modules/react-native-document-picker`)
446454
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
447455
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
448456
- react-native-safari-view (from `../node_modules/react-native-safari-view`)
@@ -534,6 +542,10 @@ EXTERNAL SOURCES:
534542
:path: "../node_modules/react-native/ReactCommon/jsiexecutor"
535543
React-jsinspector:
536544
:path: "../node_modules/react-native/ReactCommon/jsinspector"
545+
react-native-config:
546+
:path: "../node_modules/react-native-config"
547+
react-native-document-picker:
548+
:path: "../node_modules/react-native-document-picker"
537549
react-native-image-picker:
538550
:path: "../node_modules/react-native-image-picker"
539551
react-native-netinfo:
@@ -634,6 +646,8 @@ SPEC CHECKSUMS:
634646
React-jsi: df07aa95b39c5be3e41199921509bfa929ed2b9d
635647
React-jsiexecutor: b56c03e61c0dd5f5801255f2160a815f4a53d451
636648
React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
649+
react-native-config: c98128a72bc2c3a1ca72caec0b021f0fa944aa29
650+
react-native-document-picker: ca0c8769c3848866970dc9164e809c6ea45cb5d6
637651
react-native-image-picker: 28d8d1f5a643119876b8b2c7d4d1dcfb2b232dd4
638652
react-native-netinfo: 30fb89fa913c342be82a887b56e96be6d71201dd
639653
react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
@@ -669,4 +683,4 @@ SPEC CHECKSUMS:
669683

670684
PODFILE CHECKSUM: 359eeed31941826235cdc4a3c6b998cb2e176764
671685

672-
COCOAPODS: 1.10.0
686+
COCOAPODS: 1.10.1

‎package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chatwoot/mobile-app",
3-
"version": "1.0.12",
3+
"version": "1.0.13",
44
"private": true,
55
"scripts": {
66
"clean": "rm -rf $TMPDIR/react-* && watchman watch-del-all && npm cache clean --force",
@@ -42,7 +42,9 @@
4242
"react-native-actions-sheet": "^0.4.2",
4343
"react-native-animatable": "^1.3.3",
4444
"react-native-background-color": "^0.0.8",
45+
"react-native-config": "^1.4.2",
4546
"react-native-device-info": "^5.6.5",
47+
"react-native-document-picker": "^5.0.0",
4648
"react-native-exception-handler": "^2.10.9",
4749
"react-native-gesture-handler": "^1.9.0",
4850
"react-native-hyperlink": "^0.0.19",
@@ -63,14 +65,16 @@
6365
"redux-persist": "^6.0.0",
6466
"redux-thunk": "^2.3.0",
6567
"tcomb-form-native": "^0.6.20",
66-
"validator": "^13.5.2"
68+
"validator": "^13.5.2",
69+
"yarn": "^1.22.10"
6770
},
6871
"devDependencies": {
6972
"@babel/core": "^7.8.4",
7073
"@babel/runtime": "^7.8.4",
7174
"@bam.tech/react-native-make": "^3.0.0",
7275
"@react-native-community/eslint-config": "^1.1.0",
7376
"babel-jest": "^25.1.0",
77+
"babel-plugin-module-resolver": "^4.1.0",
7478
"detox": "^17.4.6",
7579
"eslint": "^6.5.1",
7680
"eslint-plugin-detox": "^1.0.0",

0 commit comments

Comments
 (0)