🔀 Merge branch 'main' into develop

.env

@@ -15,7 +15,7 @@ ROOT_STATE_STORAGE_KEY=root
 APP_MARKETING_VERSION=0.32.1
 
 # Same as CURRENT_PROJECT_VERSION in iOS / version code in Android
-APP_VERSION=338
+APP_VERSION=339
 
 # APP_VERSION must be greater or equal to the this value
 # without forcing user to update the app

android/app/build.gradle

@@ -138,7 +138,7 @@ android {
         applicationId "com.oice"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 338
+        versionCode 339
         versionName "0.32.1"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'

app/app.tsx

@@ -14,7 +14,7 @@ import RNExitApp from "react-native-exit-app"
 import { INIT_APP_TIMEOUT } from "react-native-dotenv"
 
 import { Provider } from "mobx-react"
-import { contains } from "ramda"
+import { includes } from "ramda"
 import { ThemeProvider } from "styled-components/native"
 
 import { translate } from "./i18n"
@@ -121,7 +121,7 @@ export class App extends React.Component<{}, AppState> {
    * @param routeName The currently active route name.
    */
   canExit(routeName: string) {
-    return contains(routeName, DEFAULT_NAVIGATION_CONFIG.exitRoutes)
+    return includes(routeName, DEFAULT_NAVIGATION_CONFIG.exitRoutes)
   }
 
   _onOpenURL = (event: { url: string }) => {

ios/LikeCoinApp.xcodeproj/project.pbxproj

@@ -577,7 +577,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = LikeCoinApp/LikeCoinApp.entitlements;
-				CURRENT_PROJECT_VERSION = 338;
+				CURRENT_PROJECT_VERSION = 339;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 6VG4638588;
 				HEADER_SEARCH_PATHS = (
@@ -666,7 +666,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = LikeCoinApp/LikeCoinApp.entitlements;
-				CURRENT_PROJECT_VERSION = 338;
+				CURRENT_PROJECT_VERSION = 339;
 				DEVELOPMENT_TEAM = 6VG4638588;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

ios/LikerLandShare/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.32.1</string>
 	<key>CFBundleVersion</key>
-	<string>338</string>
+	<string>339</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

yarn.lock

@@ -4052,10 +4052,12 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
   integrity sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==
 
-"@types/[email protected]":
-  version "0.26.18"
-  resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.26.18.tgz#a80f02b046edd5ff777e863732591bd50c53236e"
-  integrity sha512-wK3NLaAkL/ht7Nw4IZsOagJuYqzZgoboFvILolOPtmoKyy25gTdz/uvB/bXsv6vdWENYv+ml5ph873P2d/+9HA==
+"@types/[email protected]":
+  version "0.28.23"
+  resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.28.23.tgz#d04279865a86c330c03c99ac61161d9905f276f5"
+  integrity sha512-9TYWiwkew+mCMsL7jZ+kkzy6QXn8PL5/SKmBPmjgUlTpkokZWTBr+OhiIUDztpAEbslWyt24NNfEmZUBFmnXig==
+  dependencies:
+    ts-toolbelt "^6.15.1"
 
 "@types/reach__router@^1.2.3":
   version "1.3.11"
@@ -17200,6 +17202,11 @@ ts-pnp@^1.1.2:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
+ts-toolbelt@^6.15.1:
+  version "6.15.5"
+  resolved "https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-6.15.5.tgz#cb3b43ed725cb63644782c64fbcad7d8f28c0a83"
+  integrity sha512-FZIXf1ksVyLcfr7M317jbB67XFJhOO1YqdTcuGaq9q5jLUoTikukZ+98TPjKiP2jC5CgmYdWWYs0s2nLSU0/1A==
+
 [email protected]:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"