Merge pull request #39282 from software-mansion-labs/@Skalakid/fix-ap…

…p-crashing-after-entering-emoji

Fix app crashing when selecting an emoji

(cherry picked from commit 7de6f2e)

ios/Podfile.lock

@@ -1363,7 +1363,11 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
+<<<<<<< HEAD
   - RNLiveMarkdown (0.1.33):
+=======
+  - RNLiveMarkdown (0.1.35):
+>>>>>>> 7de6f2e (Merge pull request #39282 from software-mansion-labs/@Skalakid/fix-app-crashing-after-entering-emoji)
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1904,7 +1908,11 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 25b969a1ffc806b9f9ad2e170d4a3b049c6af85e
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
+<<<<<<< HEAD
   RNLiveMarkdown: aaf75630fb2129db43fb5a873d33125e7173f3a0
+=======
+  RNLiveMarkdown: aaf5afb231515d8ddfdef5f2928581e8ff606ad4
+>>>>>>> 7de6f2e (Merge pull request #39282 from software-mansion-labs/@Skalakid/fix-app-crashing-after-entering-emoji)
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: fcf7f1cbdc8bd7569c267d07284e8a5c7bee06ed
   RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa

package.json

@@ -62,7 +62,11 @@
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",
+<<<<<<< HEAD
     "@expensify/react-native-live-markdown": "0.1.33",
+=======
+    "@expensify/react-native-live-markdown": "0.1.35",
+>>>>>>> 7de6f2e (Merge pull request #39282 from software-mansion-labs/@Skalakid/fix-app-crashing-after-entering-emoji)
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",