Skip to content

Commit 743cb3a

Browse files
authored
Merge branch 'develop' into 19188
2 parents 668033c + 68402ae commit 743cb3a

File tree

41 files changed

+566
-1086
lines changed

Some content is hidden

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

41 files changed

+566
-1086
lines changed

doc/dependencies.md

+1-15
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ required by bignumber.js otherwise there is a compilation error
2020

2121
used to generate guids and random values in `status-im.utils.random`
2222

23-
## "create-react-class": "15.6.2"
24-
25-
fixed version because even bugfix update causes compilation error with current version of react-native (0.59)
26-
27-
internal react library, used by figwheel for instance but also probably react
28-
2923
## "emojilib": "^2.4.0"
3024

3125
used for emojis
@@ -113,11 +107,6 @@ used for profile picture
113107
used for storing password when user saves password
114108
TODO: check if fork is necessary, merge with upstream?
115109

116-
## "react-native-languages": "^3.0.2"
117-
118-
TODO DEPRECATED, should be replaced with https://github.com/react-native-community/react-native-localize
119-
used to get user language and interact with i18n.js
120-
121110
## "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#v3.0.8_status"
122111

123112
used to send email to support when phone is shaked
@@ -131,6 +120,7 @@ TODO: update once bug is fixed for Android that causes crash when app is back fr
131120
## "react-native-shake": "^3.3.1"
132121

133122
used to send email to support when phone is shaked
123+
134124
## "react-native-lottie-splash-screen": "^1.0.1"
135125

136126
used to make splash screen with lottie animation during initial loading for android, also used as replacement of "react-native-splash-screen" for iOS
@@ -157,10 +147,6 @@ used for browser
157147
used for native navigation
158148
fixed because even bugfix version upgrade causes runtime errors with current version of react-native
159149

160-
## "rn-emoji-keyboard": "https://github.com/status-im/rn-emoji-keyboard"
161-
162-
Used for taking emoji input, for custom emoji thumbnails for community channels
163-
164150
## "react-native-draggable-flatlist": "https://github.com/computerjazz/react-native-draggable-flatlist"
165151

166152
A drag-and-drop-enabled FlatList component for React Native

ios/Podfile.lock

+2-20
Original file line numberDiff line numberDiff line change
@@ -891,16 +891,14 @@ PODS:
891891
- React-Core
892892
- react-native-image-resizer (1.2.3):
893893
- React
894-
- react-native-lottie-splash-screen (1.0.1):
894+
- react-native-lottie-splash-screen (1.1.2):
895895
- React
896896
- react-native-mail (6.1.1):
897897
- React-Core
898898
- react-native-netinfo (4.7.0):
899899
- React
900900
- react-native-orientation-locker (1.5.0):
901901
- React-Core
902-
- react-native-randombytes (3.6.1):
903-
- React-Core
904902
- react-native-shake (3.4.0):
905903
- React
906904
- react-native-slider (3.0.0):
@@ -1123,12 +1121,8 @@ PODS:
11231121
- TOCropViewController
11241122
- RNKeychain (8.1.2):
11251123
- React-Core
1126-
- RNLanguages (3.0.2):
1127-
- React
11281124
- RNPermissions (3.8.0):
11291125
- React-Core
1130-
- RNReactNativeHapticFeedback (1.9.0):
1131-
- React
11321126
- RNReanimated (3.6.1):
11331127
- glog
11341128
- RCT-Folly (= 2022.05.16.00)
@@ -1197,7 +1191,6 @@ DEPENDENCIES:
11971191
- react-native-mail (from `../node_modules/react-native-mail`)
11981192
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
11991193
- react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
1200-
- react-native-randombytes (from `../node_modules/react-native-randombytes`)
12011194
- react-native-shake (from `../node_modules/react-native-shake`)
12021195
- "react-native-slider (from `../node_modules/@react-native-community/slider`)"
12031196
- react-native-status (from `../modules/react-native-status`)
@@ -1236,9 +1229,7 @@ DEPENDENCIES:
12361229
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
12371230
- RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
12381231
- RNKeychain (from `../node_modules/react-native-keychain`)
1239-
- RNLanguages (from `../node_modules/react-native-languages`)
12401232
- RNPermissions (from `../node_modules/react-native-permissions`)
1241-
- RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
12421233
- RNReanimated (from `../node_modules/react-native-reanimated`)
12431234
- RNShare (from `../node_modules/react-native-share`)
12441235
- RNStaticSafeAreaInsets (from `../node_modules/react-native-static-safe-area-insets`)
@@ -1344,8 +1335,6 @@ EXTERNAL SOURCES:
13441335
:path: "../node_modules/@react-native-community/netinfo"
13451336
react-native-orientation-locker:
13461337
:path: "../node_modules/react-native-orientation-locker"
1347-
react-native-randombytes:
1348-
:path: "../node_modules/react-native-randombytes"
13491338
react-native-shake:
13501339
:path: "../node_modules/react-native-shake"
13511340
react-native-slider:
@@ -1422,12 +1411,8 @@ EXTERNAL SOURCES:
14221411
:path: "../node_modules/react-native-image-crop-picker"
14231412
RNKeychain:
14241413
:path: "../node_modules/react-native-keychain"
1425-
RNLanguages:
1426-
:path: "../node_modules/react-native-languages"
14271414
RNPermissions:
14281415
:path: "../node_modules/react-native-permissions"
1429-
RNReactNativeHapticFeedback:
1430-
:path: "../node_modules/react-native-haptic-feedback"
14311416
RNReanimated:
14321417
:path: "../node_modules/react-native-reanimated"
14331418
RNShare:
@@ -1494,11 +1479,10 @@ SPEC CHECKSUMS:
14941479
react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
14951480
react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
14961481
react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
1497-
react-native-lottie-splash-screen: 068688c15dd478301fda00f8d87d7fb7d5b9a93e
1482+
react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
14981483
react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
14991484
react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
15001485
react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
1501-
react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
15021486
react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
15031487
react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
15041488
react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
@@ -1537,9 +1521,7 @@ SPEC CHECKSUMS:
15371521
RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
15381522
RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
15391523
RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
1540-
RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
15411524
RNPermissions: 215c54462104b3925b412b0fb3c9c497b21c358b
1542-
RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
15431525
RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b
15441526
RNShare: 859ff710211285676b0bcedd156c12437ea1d564
15451527
RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8

0 commit comments

Comments
 (0)