Updated to expo 46

2022-08-06 22:05:26 +02:00 · 2022-08-06 22:05:26 +02:00 · 33d8a97efb
parent b9cf0ceb6b
commit 33d8a97efb
8 changed files with 1822 additions and 1705 deletions
--- a/.gitignore
+++ b/.gitignore
@ -31,6 +31,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+ios/.xcode.env.local

 # Android/IntelliJ
 #
--- a/ios/.xcode.env
+++ b/ios/.xcode.env
@ -0,0 +1,10 @@
+# This `.xcode.env` file is versioned and is used to source the environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an `.xcode.env.local`
+# file that is not versioned.
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY=$(command -v node)
--- a/ios/Podfile
+++ b/ios/Podfile
@ -2,22 +2,16 @@ require File.join(File.dirname(`node --print "require.resolve('expo/package.json
 require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
 require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")

-platform :ios, '12.0'
+platform :ios, '12.4'
 install! 'cocoapods', :deterministic_uuids => false

+production = ENV["PRODUCTION"] == "1"
+
 require 'json'
 podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}

 target 'tooot' do
  use_expo_modules!
-  post_integrate do |installer|
-    begin
-      expo_patch_react_imports!(installer)
-    rescue => e
-      Pod::UI.warn e
-    end
-  end
-
  config = use_native_modules!

  # Flags change depending on the env values.
@ -25,28 +19,34 @@ target 'tooot' do

  use_react_native!(
    :path => config[:reactNativePath],
+    :production => production,
    :hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes',
    :fabric_enabled => flags[:fabric_enabled],
+    :flipper_configuration => FlipperConfiguration.enabled,
    # An absolute path to your application root.
    :app_path => "#{Pod::Config.instance.installation_root}/.."
  )

-  # Enables Flipper.
-  #
-  # Note that if you have use_frameworks! enabled, Flipper will not work and
-  # you should disable the next line.
-  # use_flipper!()
-
  post_install do |installer|
    react_native_post_install(installer)
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)

+    # For share extension
    installer.pods_project.targets.each do |target|
      target.build_configurations.each do |config|
-        config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
-        config.build_settings["ONLY_ACTIVE_ARCH"] = "NO"
+        config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'No'
+        # config.build_settings["ONLY_ACTIVE_ARCH"] = "YES"
      end
    end
  end
+
+  post_integrate do |installer|
+    begin
+      expo_patch_react_imports!(installer)
+    rescue => e
+      Pod::UI.warn e
+    end
+  end
 end

 target 'ShareExtension' do
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
--- a/ios/tooot.xcodeproj/project.pbxproj
+++ b/ios/tooot.xcodeproj/project.pbxproj
@ -333,13 +333,15 @@
 			files = (
 			);
 			inputPaths = (
+				"$(SRCROOT)/.xcode.env.local",
+				"$(SRCROOT)/.xcode.env",
 			);
 			name = "Bundle React Native code and images";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n../node_modules/expo-constants/scripts/get-app-config-ios.sh\n";
+			shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
 		08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@ -370,10 +372,16 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-tooot/Pods-tooot-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@ -390,17 +398,13 @@
 				"${PODS_ROOT}/Target Support Files/Pods-tooot/Pods-tooot-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@ -524,7 +528,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6C2E3173556A471DD304B334 /* Pods-tooot.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = tooot/tooot.entitlements;
@ -533,13 +536,12 @@
 				CURRENT_PROJECT_VERSION = 2102022230;
 				DEVELOPMENT_TEAM = 8EGBLQ2MA6;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					"FB_SONARKIT_ENABLED=1",
 				);
 				INFOPLIST_FILE = tooot/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@ -564,7 +566,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7A4D352CD337FB3A3BF06240 /* Pods-tooot.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = tooot/tooot.entitlements;
@ -572,9 +573,8 @@
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 2102022230;
 				DEVELOPMENT_TEAM = 8EGBLQ2MA6;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = tooot/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@ -599,7 +599,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@ -644,15 +644,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
-				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
-					"\"$(inherited)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "\"\"";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@ -662,7 +659,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@ -691,7 +688,6 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
@ -701,14 +697,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
-				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
-					"\"$(inherited)\"",
-				);
+				LIBRARY_SEARCH_PATHS = "\"\"";
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = NO;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				VALIDATE_PRODUCT = YES;
@ -737,7 +731,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				MARKETING_VERSION = 1.0;
@ -782,7 +776,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				MARKETING_VERSION = 1.0;
--- a/ios/tooot/AppDelegate.mm
+++ b/ios/tooot/AppDelegate.mm
@ -19,6 +19,8 @@

 #import <react/config/ReactNativeConfig.h>

+static NSString *const kRNConcurrentRoot = @"concurrentRoot";
+
@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
  RCTTurboModuleManager *_turboModuleManager;
  RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
@ -46,6 +48,9 @@

  UIView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];

+  // NSDictionary *initProps = [self prepareInitialProps];
+  // UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"tooot", initProps);
+
  if (@available(iOS 13.0, *)) {
    rootView.backgroundColor = [UIColor colorNamed:@"SplashScreenBackgroundColor"];
  } else {
@ -61,6 +66,25 @@
  return YES;
 }

+/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
+- (BOOL)concurrentRootEnabled
+{
+  // Switch this bool to turn on and off the concurrent root
+  return false;
+}
+- (NSDictionary *)prepareInitialProps
+{
+  NSMutableDictionary *initProps = [NSMutableDictionary new];
+#ifdef RCT_NEW_ARCH_ENABLED
+  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
+#endif
+  return initProps;
+}
+
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
--- a/package.json
+++ b/package.json
@ -1,11 +1,11 @@
 {
  "name": "tooot",
  "versions": {
-    "native": "220709",
+    "native": "220806",
    "major": 4,
-    "minor": 2,
+    "minor": 3,
    "patch": 0,
-    "expo": "45.0.0"
+    "expo": "46.0.0"
  },
  "description": "tooot app for Mastodon",
  "author": "xmflsct <me@xmflsct.com>",
@ -25,7 +25,7 @@
    "postinstall": "patch-package"
  },
  "dependencies": {
-    "@expo/react-native-action-sheet": "3.13.0",
+    "@expo/react-native-action-sheet": "^3.13.0",
    "@formatjs/intl-datetimeformat": "^6.0.3",
    "@formatjs/intl-getcanonicallocales": "^2.0.2",
    "@formatjs/intl-locale": "^3.0.3",
@ -33,104 +33,99 @@
    "@formatjs/intl-pluralrules": "^5.0.3",
    "@formatjs/intl-relativetimeformat": "^11.0.3",
    "@mattermost/react-native-paste-input": "^0.4.2",
-    "@neverdull-agency/expo-unlimited-secure-store": "1.0.10",
-    "@react-native-async-storage/async-storage": "1.17.7",
-    "@react-native-community/blur": "3.6.0",
-    "@react-native-community/cameraroll": "4.1.2",
-    "@react-native-community/netinfo": "9.3.0",
-    "@react-native-community/segmented-control": "2.2.2",
-    "@react-navigation/bottom-tabs": "6.3.2",
-    "@react-navigation/native": "6.0.11",
-    "@react-navigation/native-stack": "6.7.0",
-    "@react-navigation/stack": "6.2.2",
-    "@reduxjs/toolkit": "1.8.3",
-    "@sentry/react-native": "4.1.1",
-    "@sharcoux/slider": "6.0.3",
-    "axios": "0.27.2",
-    "expo": "45.0.6",
-    "expo-auth-session": "3.6.1",
-    "expo-av": "11.2.3",
-    "expo-constants": "^13.1.1",
-    "expo-crypto": "10.2.0",
-    "expo-device": "4.2.0",
-    "expo-file-system": "14.0.0",
-    "expo-firebase-analytics": "7.0.0",
-    "expo-haptics": "11.2.0",
-    "expo-image-manipulator": "^10.3.1",
-    "expo-image-picker": "13.1.1",
-    "expo-linking": "3.1.0",
-    "expo-localization": "13.0.0",
-    "expo-notifications": "0.15.4",
-    "expo-random": "12.2.0",
-    "expo-screen-capture": "4.2.0",
-    "expo-secure-store": "11.2.0",
-    "expo-splash-screen": "0.15.1",
-    "expo-store-review": "5.2.0",
-    "expo-updates": "0.13.3",
-    "expo-video-thumbnails": "6.3.0",
-    "expo-web-browser": "10.2.1",
-    "i18next": "21.8.13",
-    "li": "1.3.0",
-    "lodash": "4.17.21",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "react-i18next": "11.18.0",
+    "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10",
+    "@react-native-async-storage/async-storage": "^1.17.7",
+    "@react-native-community/blur": "^4.2.0",
+    "@react-native-community/cameraroll": "^4.1.2",
+    "@react-native-community/netinfo": "^9.3.0",
+    "@react-native-community/segmented-control": "^2.2.2",
+    "@react-navigation/bottom-tabs": "^6.3.2",
+    "@react-navigation/native": "^6.0.11",
+    "@react-navigation/native-stack": "^6.7.0",
+    "@react-navigation/stack": "^6.2.2",
+    "@reduxjs/toolkit": "^1.8.3",
+    "@sentry/react-native": "^4.1.1",
+    "@sharcoux/slider": "^6.0.3",
+    "axios": "^0.27.2",
+    "deprecated-react-native-prop-types": "^2.3.0",
+    "expo": "^46.0.2",
+    "expo-auth-session": "^3.7.1",
+    "expo-av": "^12.0.3",
+    "expo-constants": "^13.2.3",
+    "expo-crypto": "^11.0.0",
+    "expo-device": "^4.3.0",
+    "expo-file-system": "^14.1.0",
+    "expo-firebase-analytics": "^7.1.1",
+    "expo-haptics": "^11.3.0",
+    "expo-linking": "^3.2.2",
+    "expo-localization": "^13.1.0",
+    "expo-notifications": "^0.16.1",
+    "expo-random": "^12.3.0",
+    "expo-screen-capture": "^4.3.0",
+    "expo-secure-store": "^11.3.0",
+    "expo-splash-screen": "^0.16.1",
+    "expo-store-review": "^5.3.0",
+    "expo-updates": "^0.14.3",
+    "expo-video-thumbnails": "^6.4.0",
+    "expo-web-browser": "^11.0.0",
+    "i18next": "^21.8.13",
+    "li": "^1.3.0",
+    "lodash": "^4.17.21",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-i18next": "^11.18.0",
    "react-intl": "^6.0.5",
-    "react-native": "0.68.2",
-    "react-native-animated-spinkit": "1.5.2",
+    "react-native": "^0.69.3",
+    "react-native-animated-spinkit": "^1.5.2",
    "react-native-base64": "^0.2.1",
-    "react-native-blurhash": "1.1.10",
+    "react-native-blurhash": "^1.1.10",
    "react-native-context-menu-view": "xmflsct/react-native-context-menu-view",
-    "react-native-fast-image": "8.5.11",
-    "react-native-feather": "1.1.2",
-    "react-native-flash-message": "0.2.1",
-    "react-native-gesture-handler": "2.5.0",
-    "react-native-htmlview": "0.16.0",
-    "react-native-image-crop-picker": "^0.38.0",
+    "react-native-fast-image": "^8.5.11",
+    "react-native-feather": "^1.1.2",
+    "react-native-flash-message": "^0.2.1",
+    "react-native-gesture-handler": "^2.5.0",
+    "react-native-htmlview": "^0.16.0",
+    "react-native-image-picker": "^4.8.4",
    "react-native-language-detection": "^0.1.0",
-    "react-native-pager-view": "5.4.11",
-    "react-native-reanimated": "2.9.1",
-    "react-native-safe-area-context": "4.3.1",
-    "react-native-screens": "3.15.0",
+    "react-native-pager-view": "^5.4.11",
+    "react-native-reanimated": "^2.9.1",
+    "react-native-safe-area-context": "^4.3.1",
+    "react-native-screens": "^3.15.0",
    "react-native-share-menu": "^5.0.5",
-    "react-native-svg": "12.3.0",
-    "react-native-swipe-list-view": "3.2.9",
-    "react-native-tab-view": "3.1.1",
-    "react-query": "3.39.1",
-    "react-redux": "8.0.2",
-    "redux-persist": "6.0.0",
-    "rn-placeholder": "3.0.3",
-    "sentry-expo": "4.2.0",
-    "tslib": "2.4.0",
-    "valid-url": "1.0.9"
+    "react-native-svg": "^12.3.0",
+    "react-native-swipe-list-view": "^3.2.9",
+    "react-native-tab-view": "^3.1.1",
+    "react-query": "^3.39.1",
+    "react-redux": "^8.0.2",
+    "redux-persist": "^6.0.0",
+    "rn-placeholder": "^3.0.3",
+    "sentry-expo": "^4.2.0",
+    "tslib": "^2.4.0",
+    "valid-url": "^1.0.9"
  },
  "devDependencies": {
-    "@babel/core": "7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "7.18.6",
+    "@babel/core": "^7.18.10",
+    "@babel/plugin-proposal-optional-chaining": "^7.18.9",
    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "7.18.6",
-    "@expo/config": "6.0.24",
-    "@types/lodash": "4.14.182",
-    "@types/react": "17.0.43",
-    "@types/react-dom": "17.0.14",
-    "@types/react-native": "0.67.8",
+    "@babel/preset-typescript": "^7.18.6",
+    "@expo/config": "^7.0.0",
+    "@types/lodash": "^4.14.182",
+    "@types/react": "^18.0.15",
+    "@types/react-dom": "^18.0.6",
+    "@types/react-native": "^0.69.5",
    "@types/react-native-base64": "^0.2.0",
    "@types/react-native-share-menu": "^5.0.2",
-    "@types/react-timeago": "4.1.3",
-    "@types/valid-url": "1.0.3",
-    "@welldone-software/why-did-you-render": "7.0.1",
-    "babel-plugin-module-resolver": "4.1.0",
-    "babel-plugin-transform-remove-console": "6.9.4",
-    "chalk": "4.1.2",
-    "dotenv": "16.0.1",
-    "patch-package": "6.4.7",
-    "postinstall-postinstall": "2.1.0",
-    "react-native-clean-project": "4.0.1",
-    "typescript": "4.7.4"
-  },
-  "resolutions": {
-    "@types/react": "17.0.43",
-    "@types/react-dom": "17.0.14"
+    "@types/react-timeago": "^4.1.3",
+    "@types/valid-url": "^1.0.3",
+    "@welldone-software/why-did-you-render": "^7.0.1",
+    "babel-plugin-module-resolver": "^4.1.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "chalk": "^4.1.2",
+    "dotenv": "^16.0.1",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
+    "react-native-clean-project": "^4.0.1",
+    "typescript": "^4.7.4"
  },
  "expo": {
    "autolinking": {
--- a/yarn.lock
+++ b/yarn.lock