Skip to content

Commit 187f21a

Browse files
muhsin-kiamsivindependabot[bot]chatwoot-botsojan-official
authored
Merge branch 'release/1.26.0' (#753)
* chore: Bump version to 1.10.0 (#714) * build: Version 1.10.1 (#715) * chore: Bump semver from 5.7.1 to 5.7.2 (#717) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](npm/node-semver@v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: Bump word-wrap from 1.2.3 to 1.2.4 (#718) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: Bump tough-cookie from 4.1.2 to 4.1.3 (#716) Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Muhsin Keloth <[email protected]> * feat: Refresh conversations and messages when the app start from the b.g (#720) * fix: Attachment cropping in full screen (#721) * fix: Sort messages by created date (#722) * chore: enable herms in android (#724) * chore: Stability improvements (#725) * chore: Release iOS v1.10.7 * fix: Auto height issues in email messages (#727) * chore: Translation updates (#729) * chore: Bump activesupport from 6.1.7.3 to 6.1.7.6 (#728) Bumps [activesupport](https://github.com/rails/rails) from 6.1.7.3 to 6.1.7.6. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.0.7.2/activesupport/CHANGELOG.md) - [Commits](rails/rails@v6.1.7.3...v6.1.7.6) --- updated-dependencies: - dependency-name: activesupport dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: Upgrade react native from `0.70.x` to `0.72.x` (#730) * chore: upgrade all the packages to latest version * chore: bumps node to 16.17.1 * chore: android/ios 1.10.13 * Update AndroidManifest.xml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * fix: change notification permission flow for android>32 * chore: add analytics event for FORGOT_PASSWORD * chore: fix warnings * fix: android share issues * chore: fix attachment issues * chore: android/ios 1.10.14 * fix: file upload issues in android * fix: file upload issues in android * chore: android/ios 1.10.15 * chore: android v1.10.16 * chore: bump node * chore: Android v1.10.17 --------- Co-authored-by: Sojan Jose <[email protected]> * chore: Upgrade minor packages (#733) * fix: Non-serializable value update in auth slice (#735) * chore: Bump `react-native-webview` (#736) * chore: Upgrade rn web view * Update Podfile.lock * fix: Email message full body width (#737) * fix: App is crashing when the label is added first time (#738) * chore: Android/iOS v1.10.19 * chore: Bump react-devtools-core from 4.28.0 to 4.28.4 (#742) Bumps [react-devtools-core](https://github.com/facebook/react/tree/HEAD/packages/react-devtools-core) from 4.28.0 to 4.28.4. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/HEAD/packages/react-devtools-core) --- updated-dependencies: - dependency-name: react-devtools-core dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: Changes to include delivery reports for all channels (#745) * feat: Add changes to include delivery reports for all channels * chore: fixes * chore: Bump @babel/traverse from 7.22.10 to 7.23.2 (#740) Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.10 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Muhsin Keloth <[email protected]> * fix: package.json & yarn.lock to reduce vulnerabilities (#743) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AXIOS-6032459 Co-authored-by: snyk-bot <[email protected]> Co-authored-by: Muhsin Keloth <[email protected]> * chore: Bump sharp from 0.32.5 to 0.32.6 (#746) Bumps [sharp](https://github.com/lovell/sharp) from 0.32.5 to 0.32.6. - [Release notes](https://github.com/lovell/sharp/releases) - [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md) - [Commits](lovell/sharp@v0.32.5...v0.32.6) --- updated-dependencies: - dependency-name: sharp dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Muhsin Keloth <[email protected]> * core: Translation updates (#739) * feat: Replace SectionList with Flashlist in chat screen (#747) * chore: Replace SectionList with FlashList * Update MessageList.js * More cleanup * Update conversationSlice.selector.js * chore: fix padding issue * Update MessageDeliveryStatus.js * chore: Android/iOS v1.10.20 --------- Co-authored-by: iamsivin <[email protected]> * feat: Add contact slice (#748) * feat: Add contact slice * minor fixes * Android/iOS v1.10.21 * feat: Fix last message id logic in chat screen (#749) * feat: Add contact slice * minor fixes * Android/iOS v1.10.21 * Android/iOS v1.10.22 * chore: Android/iOS v1.10.23 * chore: Android/iOS v1.10.25 * chore: Android/iOS v1.10.26 * fix: Moved fonts to main assets folder (#750) * Moved fonts to main assets folder * added for android linking * added for ios manifest as well * Revert "fix: Moved fonts to main assets folder (#750)" This reverts commit 175e029. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Sivin Varghese <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chatwoot Bot <[email protected]> Co-authored-by: Sojan Jose <[email protected]> Co-authored-by: snyk-bot <[email protected]> Co-authored-by: iamsivin <[email protected]> Co-authored-by: Zach Aronwald <[email protected]>
1 parent c54450a commit 187f21a

File tree

139 files changed

+7661
-12364
lines changed

Some content is hidden

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

139 files changed

+7661
-12364
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: '2.1'
22
orbs:
3-
node: circleci/node@2.0.2
3+
node: circleci/node@5.1.0
44

55
jobs:
66
build-and-test:
77
docker:
8-
- image: circleci/node:14.15.0
8+
- image: cimg/node:20.6.0
99
steps:
1010
- checkout
1111
- restore_cache:

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module.exports = {
22
root: true,
33
extends: '@react-native-community',
4-
plugins: ['detox'],
54
rules: {
65
'no-console': 2,
76
'react/prop-types': 2,

.gitignore

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#
33
.DS_Store
44
.env
5-
65
# Xcode
76
#
87
build/
@@ -22,6 +21,7 @@ DerivedData
2221
*.hmap
2322
*.ipa
2423
*.xcuserstate
24+
ios/.xcode.env.local
2525

2626
# Android/IntelliJ
2727
#
@@ -30,46 +30,48 @@ build/
3030
.gradle
3131
local.properties
3232
*.iml
33-
android/.project
34-
android/.settings
35-
android/app/.settings
36-
android/app/bin
37-
android/app/.project
38-
android/app/.classpath
39-
android/app/gradle.properties
33+
34+
*.hprof
35+
.cxx/
36+
*.keystore
37+
!debug.keystore
4038

4139
# node.js
4240
#
4341
node_modules/
4442
npm-debug.log
4543
yarn-error.log
4644

47-
# BUCK
48-
buck-out/
49-
\.buckd/
50-
*.keystore
51-
!debug.keystore
52-
5345
# fastlane
5446
#
5547
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
5648
# screenshots whenever they are needed.
5749
# For more information about the recommended setup visit:
5850
# https://docs.fastlane.tools/best-practices/source-control/
5951

60-
*/fastlane/report.xml
61-
*/fastlane/Preview.html
62-
*/fastlane/screenshots
52+
**/fastlane/report.xml
53+
**/fastlane/Preview.html
54+
**/fastlane/screenshots
55+
**/fastlane/test_output
6356

6457
# Bundle artifact
6558
*.jsbundle
6659

67-
# CocoaPods
60+
# Ruby / CocoaPods
6861
/ios/Pods/
62+
/vendor/bundle/
63+
64+
# Temporary files created by Metro to check the health of the file watcher
65+
.metro-health-check*
66+
67+
# testing
68+
/coverage
69+
6970

7071
# Android release configuration
7172
android/api-fastlane.json
7273
android/gradle.properties
74+
android/app/gradle.properties
7375
# Firebase
7476
android/app/google-services.json
7577
ios/GoogleService-Info.plist

.watchmanconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{}
1+
{}

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby '2.7.5'
4+
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
6+
gem 'cocoapods', '~> 1.12'

Gemfile.lock

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (6.1.7.3)
6+
activesupport (7.0.7.1)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
12-
addressable (2.8.1)
11+
addressable (2.8.5)
1312
public_suffix (>= 2.0.2, < 6.0)
1413
algoliasearch (1.27.5)
1514
httpclient (~> 2.8, >= 2.8.3)
1615
json (>= 1.5.1)
1716
atomos (0.1.3)
1817
claide (1.1.0)
19-
cocoapods (1.11.3)
18+
cocoapods (1.12.1)
2019
addressable (~> 2.8)
2120
claide (>= 1.0.2, < 2.0)
22-
cocoapods-core (= 1.11.3)
21+
cocoapods-core (= 1.12.1)
2322
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24-
cocoapods-downloader (>= 1.4.0, < 2.0)
23+
cocoapods-downloader (>= 1.6.0, < 2.0)
2524
cocoapods-plugins (>= 1.0.0, < 2.0)
2625
cocoapods-search (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.4.0, < 2.0)
26+
cocoapods-trunk (>= 1.6.0, < 2.0)
2827
cocoapods-try (>= 1.1.0, < 2.0)
2928
colored2 (~> 3.1)
3029
escape (~> 0.0.4)
3130
fourflusher (>= 2.3.0, < 3.0)
3231
gh_inspector (~> 1.0)
3332
molinillo (~> 0.8.0)
3433
nap (~> 1.0)
35-
ruby-macho (>= 1.0, < 3.0)
34+
ruby-macho (>= 2.3.0, < 3.0)
3635
xcodeproj (>= 1.21.0, < 2.0)
37-
cocoapods-core (1.11.3)
38-
activesupport (>= 5.0, < 7)
36+
cocoapods-core (1.12.1)
37+
activesupport (>= 5.0, < 8)
3938
addressable (~> 2.8)
4039
algoliasearch (~> 1.0)
4140
concurrent-ruby (~> 1.1)
@@ -56,23 +55,23 @@ GEM
5655
colored2 (3.1.2)
5756
concurrent-ruby (1.2.2)
5857
escape (0.0.4)
59-
ethon (0.15.0)
58+
ethon (0.16.0)
6059
ffi (>= 1.15.0)
6160
ffi (1.15.5)
6261
fourflusher (2.3.1)
6362
fuzzy_match (2.0.4)
6463
gh_inspector (1.1.3)
6564
httpclient (2.8.3)
66-
i18n (1.12.0)
65+
i18n (1.14.1)
6766
concurrent-ruby (~> 1.0)
68-
json (2.6.2)
69-
minitest (5.18.0)
67+
json (2.6.3)
68+
minitest (5.19.0)
7069
molinillo (0.8.0)
7170
nanaimo (0.3.0)
7271
nap (1.1.0)
7372
netrc (0.11.0)
7473
public_suffix (4.0.7)
75-
rexml (3.2.5)
74+
rexml (3.2.6)
7675
ruby-macho (2.5.1)
7776
typhoeus (1.4.0)
7877
ethon (>= 0.9.0)
@@ -85,16 +84,16 @@ GEM
8584
colored2 (~> 3.1)
8685
nanaimo (~> 0.3.0)
8786
rexml (~> 3.2.4)
88-
zeitwerk (2.6.7)
87+
zeitwerk (2.6.11)
8988

9089
PLATFORMS
9190
ruby
9291

9392
DEPENDENCIES
94-
cocoapods (~> 1.11, >= 1.11.2)
93+
cocoapods (~> 1.12)
9594

9695
RUBY VERSION
97-
ruby 2.7.5p203
96+
ruby 3.0.4p208
9897

9998
BUNDLED WITH
100-
2.1.4
99+
2.4.8

0 commit comments

Comments
 (0)