diff --git a/.tool-versions b/.tool-versions index ba756b576..0b505b593 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -nodejs 18.18.0 +nodejs 20.9.0 java openjdk-11.0.2 diff --git a/dev-client/Gemfile.lock b/dev-client/Gemfile.lock index 4bce17bf4..ee89d7007 100644 --- a/dev-client/Gemfile.lock +++ b/dev-client/Gemfile.lock @@ -3,10 +3,15 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.8) + activesupport (7.1.1) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) @@ -14,13 +19,15 @@ GEM httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.1.1) + bigdecimal (3.1.4) claide (1.1.0) - cocoapods (1.13.0) + cocoapods (1.14.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) + cocoapods-core (= 1.14.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -33,7 +40,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) + cocoapods-core (1.14.0) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -44,7 +51,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -54,10 +61,13 @@ GEM cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.2.2) + connection_pool (2.4.1) + drb (2.1.1) + ruby2_keywords escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.16.1) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -67,12 +77,14 @@ GEM json (2.6.3) minitest (5.20.0) molinillo (0.8.0) + mutex_m (0.1.2) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) rexml (3.2.6) ruby-macho (2.5.1) + ruby2_keywords (0.0.5) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) diff --git a/dev-client/android/app/build.gradle b/dev-client/android/app/build.gradle index afc47fef8..ff9042be6 100644 --- a/dev-client/android/app/build.gradle +++ b/dev-client/android/app/build.gradle @@ -99,8 +99,8 @@ android { applicationId "org.terraso.landpks" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 47 - versionName '1.0.47' + versionCode 48 + versionName '1.0.48' manifestPlaceholders = [ appAuthRedirectScheme: "org.terraso.landpks" ] diff --git a/dev-client/ios/Podfile.lock b/dev-client/ios/Podfile.lock index 9477c4efd..78bff250a 100644 --- a/dev-client/ios/Podfile.lock +++ b/dev-client/ios/Podfile.lock @@ -7,19 +7,19 @@ PODS: - AppAuth/Core - boost (1.76.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.72.5) - - FBReactNativeSpec (0.72.5): - - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.72.5) - - RCTTypeSafety (= 0.72.5) - - React-Core (= 0.72.5) - - React-jsi (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) + - FBLazyVector (0.72.6) + - FBReactNativeSpec (0.72.6): + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.72.6) + - RCTTypeSafety (= 0.72.6) + - React-Core (= 0.72.6) + - React-jsi (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.72.5): - - hermes-engine/Pre-built (= 0.72.5) - - hermes-engine/Pre-built (0.72.5) + - hermes-engine (0.72.6): + - hermes-engine/Pre-built (= 0.72.6) + - hermes-engine/Pre-built (0.72.6) - libevent (2.1.12) - MapboxCommon (23.8.0) - MapboxCoreMaps (10.16.0): @@ -50,26 +50,26 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.72.5) - - RCTTypeSafety (0.72.5): - - FBLazyVector (= 0.72.5) - - RCTRequired (= 0.72.5) - - React-Core (= 0.72.5) - - React (0.72.5): - - React-Core (= 0.72.5) - - React-Core/DevSupport (= 0.72.5) - - React-Core/RCTWebSocket (= 0.72.5) - - React-RCTActionSheet (= 0.72.5) - - React-RCTAnimation (= 0.72.5) - - React-RCTBlob (= 0.72.5) - - React-RCTImage (= 0.72.5) - - React-RCTLinking (= 0.72.5) - - React-RCTNetwork (= 0.72.5) - - React-RCTSettings (= 0.72.5) - - React-RCTText (= 0.72.5) - - React-RCTVibration (= 0.72.5) - - React-callinvoker (0.72.5) - - React-Codegen (0.72.5): + - RCTRequired (0.72.6) + - RCTTypeSafety (0.72.6): + - FBLazyVector (= 0.72.6) + - RCTRequired (= 0.72.6) + - React-Core (= 0.72.6) + - React (0.72.6): + - React-Core (= 0.72.6) + - React-Core/DevSupport (= 0.72.6) + - React-Core/RCTWebSocket (= 0.72.6) + - React-RCTActionSheet (= 0.72.6) + - React-RCTAnimation (= 0.72.6) + - React-RCTBlob (= 0.72.6) + - React-RCTImage (= 0.72.6) + - React-RCTLinking (= 0.72.6) + - React-RCTNetwork (= 0.72.6) + - React-RCTSettings (= 0.72.6) + - React-RCTText (= 0.72.6) + - React-RCTVibration (= 0.72.6) + - React-callinvoker (0.72.6) + - React-Codegen (0.72.6): - DoubleConversion - FBReactNativeSpec - glog @@ -84,11 +84,11 @@ PODS: - React-rncore - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.72.5): + - React-Core (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.72.5) + - React-Core/Default (= 0.72.6) - React-cxxreact - React-hermes - React-jsi @@ -98,7 +98,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/CoreModulesHeaders (0.72.5): + - React-Core/CoreModulesHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -112,7 +112,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/Default (0.72.5): + - React-Core/Default (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -125,23 +125,23 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/DevSupport (0.72.5): + - React-Core/DevSupport (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.72.5) - - React-Core/RCTWebSocket (= 0.72.5) + - React-Core/Default (= 0.72.6) + - React-Core/RCTWebSocket (= 0.72.6) - React-cxxreact - React-hermes - React-jsi - React-jsiexecutor - - React-jsinspector (= 0.72.5) + - React-jsinspector (= 0.72.6) - React-perflogger - React-runtimeexecutor - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTActionSheetHeaders (0.72.5): + - React-Core/RCTActionSheetHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -155,7 +155,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTAnimationHeaders (0.72.5): + - React-Core/RCTAnimationHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -169,7 +169,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTBlobHeaders (0.72.5): + - React-Core/RCTBlobHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -183,7 +183,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTImageHeaders (0.72.5): + - React-Core/RCTImageHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -197,7 +197,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTLinkingHeaders (0.72.5): + - React-Core/RCTLinkingHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -211,7 +211,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTNetworkHeaders (0.72.5): + - React-Core/RCTNetworkHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -225,7 +225,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTSettingsHeaders (0.72.5): + - React-Core/RCTSettingsHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -239,7 +239,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTTextHeaders (0.72.5): + - React-Core/RCTTextHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -253,7 +253,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTVibrationHeaders (0.72.5): + - React-Core/RCTVibrationHeaders (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -267,11 +267,11 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTWebSocket (0.72.5): + - React-Core/RCTWebSocket (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.72.5) + - React-Core/Default (= 0.72.6) - React-cxxreact - React-hermes - React-jsi @@ -281,57 +281,57 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-CoreModules (0.72.5): + - React-CoreModules (0.72.6): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.72.5) - - React-Codegen (= 0.72.5) - - React-Core/CoreModulesHeaders (= 0.72.5) - - React-jsi (= 0.72.5) + - RCTTypeSafety (= 0.72.6) + - React-Codegen (= 0.72.6) + - React-Core/CoreModulesHeaders (= 0.72.6) + - React-jsi (= 0.72.6) - React-RCTBlob - - React-RCTImage (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) + - React-RCTImage (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) - SocketRocket (= 0.6.1) - - React-cxxreact (0.72.5): + - React-cxxreact (0.72.6): - boost (= 1.76.0) - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.72.5) - - React-debug (= 0.72.5) - - React-jsi (= 0.72.5) - - React-jsinspector (= 0.72.5) - - React-logger (= 0.72.5) - - React-perflogger (= 0.72.5) - - React-runtimeexecutor (= 0.72.5) - - React-debug (0.72.5) - - React-hermes (0.72.5): + - React-callinvoker (= 0.72.6) + - React-debug (= 0.72.6) + - React-jsi (= 0.72.6) + - React-jsinspector (= 0.72.6) + - React-logger (= 0.72.6) + - React-perflogger (= 0.72.6) + - React-runtimeexecutor (= 0.72.6) + - React-debug (0.72.6) + - React-hermes (0.72.6): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.72.5) + - React-cxxreact (= 0.72.6) - React-jsi - - React-jsiexecutor (= 0.72.5) - - React-jsinspector (= 0.72.5) - - React-perflogger (= 0.72.5) - - React-jsi (0.72.5): + - React-jsiexecutor (= 0.72.6) + - React-jsinspector (= 0.72.6) + - React-perflogger (= 0.72.6) + - React-jsi (0.72.6): - boost (= 1.76.0) - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.72.5): + - React-jsiexecutor (0.72.6): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.72.5) - - React-jsi (= 0.72.5) - - React-perflogger (= 0.72.5) - - React-jsinspector (0.72.5) - - React-logger (0.72.5): + - React-cxxreact (= 0.72.6) + - React-jsi (= 0.72.6) + - React-perflogger (= 0.72.6) + - React-jsinspector (0.72.6) + - React-logger (0.72.6): - glog - react-native-app-auth (7.1.0): - AppAuth (~> 1.6) @@ -345,11 +345,11 @@ PODS: - react-native-mmkv-storage (0.9.1): - MMKV (= 1.2.13) - React-Core - - react-native-pager-view (6.2.1): + - react-native-pager-view (6.2.2): - React-Core - - react-native-safe-area-context (4.7.2): + - react-native-safe-area-context (4.7.4): - React-Core - - React-NativeModulesApple (0.72.5): + - React-NativeModulesApple (0.72.6): - hermes-engine - React-callinvoker - React-Core @@ -358,17 +358,17 @@ PODS: - React-runtimeexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-perflogger (0.72.5) - - React-RCTActionSheet (0.72.5): - - React-Core/RCTActionSheetHeaders (= 0.72.5) - - React-RCTAnimation (0.72.5): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.72.5) - - React-Codegen (= 0.72.5) - - React-Core/RCTAnimationHeaders (= 0.72.5) - - React-jsi (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) - - React-RCTAppDelegate (0.72.5): + - React-perflogger (0.72.6) + - React-RCTActionSheet (0.72.6): + - React-Core/RCTActionSheetHeaders (= 0.72.6) + - React-RCTAnimation (0.72.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.72.6) + - React-Codegen (= 0.72.6) + - React-Core/RCTAnimationHeaders (= 0.72.6) + - React-jsi (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) + - React-RCTAppDelegate (0.72.6): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -380,54 +380,54 @@ PODS: - React-RCTNetwork - React-runtimescheduler - ReactCommon/turbomodule/core - - React-RCTBlob (0.72.5): + - React-RCTBlob (0.72.6): - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.72.5) - - React-Core/RCTBlobHeaders (= 0.72.5) - - React-Core/RCTWebSocket (= 0.72.5) - - React-jsi (= 0.72.5) - - React-RCTNetwork (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) - - React-RCTImage (0.72.5): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.72.5) - - React-Codegen (= 0.72.5) - - React-Core/RCTImageHeaders (= 0.72.5) - - React-jsi (= 0.72.5) - - React-RCTNetwork (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) - - React-RCTLinking (0.72.5): - - React-Codegen (= 0.72.5) - - React-Core/RCTLinkingHeaders (= 0.72.5) - - React-jsi (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) - - React-RCTNetwork (0.72.5): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.72.5) - - React-Codegen (= 0.72.5) - - React-Core/RCTNetworkHeaders (= 0.72.5) - - React-jsi (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) - - React-RCTSettings (0.72.5): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.72.5) - - React-Codegen (= 0.72.5) - - React-Core/RCTSettingsHeaders (= 0.72.5) - - React-jsi (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) - - React-RCTText (0.72.5): - - React-Core/RCTTextHeaders (= 0.72.5) - - React-RCTVibration (0.72.5): - - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.72.5) - - React-Core/RCTVibrationHeaders (= 0.72.5) - - React-jsi (= 0.72.5) - - ReactCommon/turbomodule/core (= 0.72.5) - - React-rncore (0.72.5) - - React-runtimeexecutor (0.72.5): - - React-jsi (= 0.72.5) - - React-runtimescheduler (0.72.5): + - React-Codegen (= 0.72.6) + - React-Core/RCTBlobHeaders (= 0.72.6) + - React-Core/RCTWebSocket (= 0.72.6) + - React-jsi (= 0.72.6) + - React-RCTNetwork (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) + - React-RCTImage (0.72.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.72.6) + - React-Codegen (= 0.72.6) + - React-Core/RCTImageHeaders (= 0.72.6) + - React-jsi (= 0.72.6) + - React-RCTNetwork (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) + - React-RCTLinking (0.72.6): + - React-Codegen (= 0.72.6) + - React-Core/RCTLinkingHeaders (= 0.72.6) + - React-jsi (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) + - React-RCTNetwork (0.72.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.72.6) + - React-Codegen (= 0.72.6) + - React-Core/RCTNetworkHeaders (= 0.72.6) + - React-jsi (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) + - React-RCTSettings (0.72.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.72.6) + - React-Codegen (= 0.72.6) + - React-Core/RCTSettingsHeaders (= 0.72.6) + - React-jsi (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) + - React-RCTText (0.72.6): + - React-Core/RCTTextHeaders (= 0.72.6) + - React-RCTVibration (0.72.6): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.72.6) + - React-Core/RCTVibrationHeaders (= 0.72.6) + - React-jsi (= 0.72.6) + - ReactCommon/turbomodule/core (= 0.72.6) + - React-rncore (0.72.6) + - React-runtimeexecutor (0.72.6): + - React-jsi (= 0.72.6) + - React-runtimescheduler (0.72.6): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) @@ -435,30 +435,30 @@ PODS: - React-debug - React-jsi - React-runtimeexecutor - - React-utils (0.72.5): + - React-utils (0.72.6): - glog - RCT-Folly (= 2021.07.22.00) - React-debug - - ReactCommon/turbomodule/bridging (0.72.5): + - ReactCommon/turbomodule/bridging (0.72.6): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.72.5) - - React-cxxreact (= 0.72.5) - - React-jsi (= 0.72.5) - - React-logger (= 0.72.5) - - React-perflogger (= 0.72.5) - - ReactCommon/turbomodule/core (0.72.5): + - React-callinvoker (= 0.72.6) + - React-cxxreact (= 0.72.6) + - React-jsi (= 0.72.6) + - React-logger (= 0.72.6) + - React-perflogger (= 0.72.6) + - ReactCommon/turbomodule/core (0.72.6): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.72.5) - - React-cxxreact (= 0.72.5) - - React-jsi (= 0.72.5) - - React-logger (= 0.72.5) - - React-perflogger (= 0.72.5) + - React-callinvoker (= 0.72.6) + - React-cxxreact (= 0.72.6) + - React-jsi (= 0.72.6) + - React-logger (= 0.72.6) + - React-perflogger (= 0.72.6) - RNGestureHandler (2.12.0): - React-Core - rnmapbox-maps (10.0.15): @@ -501,12 +501,13 @@ PODS: - React-RCTText - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.25.0): + - RNScreens (3.27.0): + - RCT-Folly (= 2021.07.22.00) - React-Core - - React-RCTImage - RNSVG (13.14.0): - React-Core - - RNVectorIcons (10.0.0): + - RNVectorIcons (10.0.1): + - RCT-Folly (= 2021.07.22.00) - React-Core - SocketRocket (0.6.1) - Turf (2.7.0) @@ -691,11 +692,11 @@ SPEC CHECKSUMS: AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570 boost: 57d2868c099736d80fcd648bf211b4431e51a558 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 71803c074f6325f10b5ec891c443b6bbabef0ca7 - FBReactNativeSpec: 448e08a759d29a96e15725ae532445bf4343567c + FBLazyVector: 748c0ef74f2bf4b36cfcccf37916806940a64c32 + FBReactNativeSpec: 966f29e4e697de53a3b366355e8f57375c856ad9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: f6cf92a471053245614d9d8097736f6337d5b86c + hermes-engine: 8057e75cfc1437b178ac86c8654b24e7fead7f60 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 MapboxCommon: 8592a003eae487508461d452d62cfc5906a9682a MapboxCoreMaps: faa14a797417dc32088c98019a3ce72e46cda5cd @@ -704,53 +705,53 @@ SPEC CHECKSUMS: MMKV: aac95d817a100479445633f2b3ed8961b4ac5043 MMKVCore: 9cfef4c48c6c46f66226fc2e4634d78490206a48 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: df81ab637d35fac9e6eb94611cfd20f0feb05455 - RCTTypeSafety: 4636e4a36c7c2df332bda6d59b19b41c443d4287 - React: e0cc5197a804031a6c53fb38483c3485fcb9d6f3 - React-callinvoker: 1a635856fe0c3d8b13fccd4ed7e76283b99b0868 - React-Codegen: 8169df63a7d5731337aad8f3c911a349a55932d3 - React-Core: cb6fb2637b5828a0944d4afc1c8678ffff570dcc - React-CoreModules: c39f9ef5cf812b2b266c63364a8969b29d30ba2a - React-cxxreact: 70284b32dcd367439d7dae84d9f72660544181b5 - React-debug: 93d183299eb4bd7b0bf8cb6e376f608e2a95b64f - React-hermes: 91f97ea2669dc5847e1f26c243aaad913319c570 - React-jsi: bd68b7779746014f01ea72d1b738809e132d7f1e - React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a - React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba - React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4 + RCTRequired: 28469809442eb4eb5528462705f7d852948c8a74 + RCTTypeSafety: e9c6c409fca2cc584e5b086862d562540cb38d29 + React: 769f469909b18edfe934f0539fffb319c4c61043 + React-callinvoker: e48ce12c83706401251921896576710d81e54763 + React-Codegen: 8cb364505beec45713ac224bcbb6bb41c3fc1a85 + React-Core: 56221b0ea21a0934aa1fbc4aef924e9007d60f26 + React-CoreModules: 9748a6fe4404323a3280ad3c5311d28d6f4f813b + React-cxxreact: 44a3560510ead6633b6e02f9fbbdd1772fb40f92 + React-debug: 0a068b2ff5e6d2575d64303b37b554573d758e76 + React-hermes: 46e66dc854124d7645c20bfec0a6be9542826ecd + React-jsi: fbdaf4166bae60524b591b18c851b530c8cdb90c + React-jsiexecutor: 3bf18ff7cb03cd8dfdce08fbbc0d15058c1d71ae + React-jsinspector: 194e32c6aab382d88713ad3dd0025c5f5c4ee072 + React-logger: cebf22b6cf43434e471dc561e5911b40ac01d289 react-native-app-auth: 1da4b0ec30756ae1f4df8e96d2505b1ce5fbcc1f react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8 react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb react-native-mmkv-storage: cfb6854594cfdc5f7383a9e464bb025417d1721c - react-native-pager-view: d211379f61895b6349bd7e571b44a26d005c2975 - react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284 - React-NativeModulesApple: 54adc761c7a6fa5f183ca62ad0cb94f4f1cdce4a - React-perflogger: cd8886513f68e1c135a1e79d20575c6489641597 - React-RCTActionSheet: 726d2615ca62a77ce3e2c13d87f65379cdc73498 - React-RCTAnimation: 0dcffbaab5acd05334d1d3b157f9275291e3a15b - React-RCTAppDelegate: 48df00f9da9e3019fa0759d1ca900e9f586ef1b1 - React-RCTBlob: 5ccfb7a8353fad6edaf9a2456e184ceca8c77150 - React-RCTImage: a80cc7170c7cd07b7b109353c605930b24d14bcf - React-RCTLinking: fb1add50b83dc4f3d39526d4ff5127f171cdad86 - React-RCTNetwork: 6acdb13f8df6cff487f87ac799a3839ce1d45dac - React-RCTSettings: 0b8b7c2ebb78c540f7b0c0bbe46ab5481023f8a8 - React-RCTText: ce4499e4f2d8f85dc4b93ff0559313a016c4f3e2 - React-RCTVibration: abb9c73984f4f0052cf50efe0ae6d6f877a74843 - React-rncore: 3775c85216adc845837e5420c823a689aeaae630 - React-runtimeexecutor: 7e31e2bc6d0ecc83d4ba05eadc98401007abc10c - React-runtimescheduler: f248b96bdf61c5e078d3fa689adce6894c900659 - React-utils: 40cdd9acee23230df5b78bf78a64ce8a2084c2d0 - ReactCommon: 4ec7cc40d091eed0a510755619940b6a03cb507b + react-native-pager-view: 02a5c4962530f7efc10dd51ee9cdabeff5e6c631 + react-native-safe-area-context: 2cd91d532de12acdb0a9cbc8d43ac72a8e4c897c + React-NativeModulesApple: 1802a680a4cd891d2ab97780771bcb2ff11fdc0b + React-perflogger: e3596db7e753f51766bceadc061936ef1472edc3 + React-RCTActionSheet: 17ab132c748b4471012abbcdcf5befe860660485 + React-RCTAnimation: 3fe720d2c172de51de8dc19ba091c559d22ebd9b + React-RCTAppDelegate: c64ab148e0c8139be28c76d4f159acd87560359d + React-RCTBlob: fd752f54ae335c93a36650be8129b352b852185f + React-RCTImage: a99cc31f93f72fe17d0448fd45d7a812fd50388e + React-RCTLinking: c56c6c36b85cebf1f4fa61a3493c9f01551afaab + React-RCTNetwork: 01167794715ec8ae4854caca36d4009b5e257257 + React-RCTSettings: 52790fef45f5a0655cad22ab9b9a87e675d84d8c + React-RCTText: adde32164a243103aaba0b1dc7b0a2599733873e + React-RCTVibration: 1c047e1d9b21992f91c21f221f360640a4a288ec + React-rncore: 87d117a5b3854f0c9c3b08d46fa83fa98a7b9f1c + React-runtimeexecutor: 57d85d942862b08f6d15441a0badff2542fd233c + React-runtimescheduler: 76eb364c37e6c20845cfe0cb049f883021bdfccf + React-utils: 1dc03e6e55f56388b6fdde3768a66c885bacb627 + ReactCommon: cfe086d2e2ec9f2907c66666c856082608fba822 RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5 rnmapbox-maps: b6219b7432508ae2cea169365116a811f822612e RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87 - RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa + RNScreens: 3e56c56bd35436215a56f48a753e30e8ce018a09 RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396 - RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9 + RNVectorIcons: c5452003f0231f8604718da523a6bd0dd08f9809 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 - Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6 + Yoga: b76f1acfda8212aa16b7e26bcce3983230c82603 PODFILE CHECKSUM: 5bfe69800113589b4233de684e12504afbf360ab -COCOAPODS: 1.13.0 +COCOAPODS: 1.14.0 diff --git a/dev-client/ios/Terraso LandPKS.xcodeproj/project.pbxproj b/dev-client/ios/Terraso LandPKS.xcodeproj/project.pbxproj index b2f147465..ff762deeb 100644 --- a/dev-client/ios/Terraso LandPKS.xcodeproj/project.pbxproj +++ b/dev-client/ios/Terraso LandPKS.xcodeproj/project.pbxproj @@ -521,7 +521,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 47; + CURRENT_PROJECT_VERSION = 48; DEVELOPMENT_TEAM = 2A8W5MT5NL; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2A8W5MT5NL; ENABLE_BITCODE = NO; @@ -562,7 +562,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 47; + CURRENT_PROJECT_VERSION = 48; DEVELOPMENT_TEAM = 2A8W5MT5NL; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2A8W5MT5NL; INFOPLIST_FILE = "Terraso LandPKS/Info.plist"; diff --git a/dev-client/ios/Terraso LandPKS/Info.plist b/dev-client/ios/Terraso LandPKS/Info.plist index e5be606f6..08c93b9f5 100644 --- a/dev-client/ios/Terraso LandPKS/Info.plist +++ b/dev-client/ios/Terraso LandPKS/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 47 + 48 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/dev-client/package-lock.json b/dev-client/package-lock.json index 3b90addbf..b157fe632 100644 --- a/dev-client/package-lock.json +++ b/dev-client/package-lock.json @@ -12,15 +12,15 @@ "@react-native-community/checkbox": "^0.5.16", "@react-native/metro-config": "^0.74.0", "@react-navigation/material-top-tabs": "^6.6.5", - "@react-navigation/native": "^6.1.7", - "@react-navigation/native-stack": "^6.9.13", - "@rnmapbox/maps": "^10.0.12", - "formik": "^2.4.3", - "i18next": "^23.4.2", + "@react-navigation/native": "^6.1.9", + "@react-navigation/native-stack": "^6.9.16", + "@rnmapbox/maps": "^10.0.15", + "formik": "^2.4.5", + "i18next": "^23.6.0", "lodash": "^4.17.21", "native-base": "^3.4.28", "react": "18.2.0", - "react-i18next": "^13.3.0", + "react-i18next": "^13.3.1", "react-native": "^0.72.6", "react-native-app-auth": "^7.1.0", "react-native-autocomplete-input": "^5.4.0", @@ -30,32 +30,32 @@ "react-native-gradle-plugin": "^0.71.19", "react-native-mmkv-storage": "^0.9.1", "react-native-pager-view": "^6.2.2", - "react-native-reanimated": "^3.4.2", - "react-native-safe-area-context": "^4.7.2", - "react-native-screens": "^3.25.0", - "react-native-svg": "^13.13.0", + "react-native-reanimated": "^3.5.4", + "react-native-safe-area-context": "^4.7.4", + "react-native-screens": "^3.27.0", + "react-native-svg": "^13.14.0", "react-native-tab-view": "^3.5.2", - "react-native-vector-icons": "^10.0.0", - "terraso-client-shared": "github:techmatters/terraso-client-shared#2bbb0d0", + "react-native-vector-icons": "^10.0.1", + "terraso-client-shared": "github:techmatters/terraso-client-shared#3e2683f", "uuid": "^9.0.1", "yup": "^1.3.2" }, "devDependencies": { - "@babel/core": "^7.22.20", - "@babel/preset-env": "^7.22.14", + "@babel/core": "^7.23.2", + "@babel/preset-env": "^7.23.2", "@babel/runtime": "^7.23.2", "@react-native-community/eslint-config": "^3.2.0", "@tsconfig/react-native": "^3.0.2", "@types/jest": "^29.5.6", - "@types/react": "^18.2.28", - "@types/react-native-vector-icons": "^6.4.14", - "@types/react-test-renderer": "^18.0.1", - "@types/uuid": "^9.0.5", - "babel-jest": "^29.6.2", + "@types/react": "^18.2.33", + "@types/react-native-vector-icons": "^6.4.16", + "@types/react-test-renderer": "^18.0.5", + "@types/uuid": "^9.0.6", + "babel-jest": "^29.7.0", "babel-plugin-root-import": "^6.6.0", "depcheck": "^1.4.7", "eslint": "^8.52.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.0.1", "jest": "^29.7.0", "metro-react-native-babel-preset": "^0.77.0", "prettier": "^3.0.3", @@ -98,27 +98,27 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", - "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz", - "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.23.0", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-module-transforms": "^7.23.0", - "@babel/helpers": "^7.23.0", + "@babel/helpers": "^7.23.2", "@babel/parser": "^7.23.0", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", + "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -242,9 +242,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz", - "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz", + "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==", "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", "@babel/helper-plugin-utils": "^7.22.5", @@ -449,12 +449,12 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz", - "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", "dependencies": { "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.0", + "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0" }, "engines": { @@ -959,13 +959,13 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz", - "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz", + "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.9", + "@babel/helper-remap-async-to-generator": "^7.22.20", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -1794,11 +1794,11 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz", - "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz", + "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==", "dependencies": { - "@babel/compat-data": "^7.22.20", + "@babel/compat-data": "^7.23.2", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-option": "^7.22.15", @@ -1824,15 +1824,15 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.22.5", - "@babel/plugin-transform-async-generator-functions": "^7.22.15", + "@babel/plugin-transform-async-generator-functions": "^7.23.2", "@babel/plugin-transform-async-to-generator": "^7.22.5", "@babel/plugin-transform-block-scoped-functions": "^7.22.5", - "@babel/plugin-transform-block-scoping": "^7.22.15", + "@babel/plugin-transform-block-scoping": "^7.23.0", "@babel/plugin-transform-class-properties": "^7.22.5", "@babel/plugin-transform-class-static-block": "^7.22.11", "@babel/plugin-transform-classes": "^7.22.15", "@babel/plugin-transform-computed-properties": "^7.22.5", - "@babel/plugin-transform-destructuring": "^7.22.15", + "@babel/plugin-transform-destructuring": "^7.23.0", "@babel/plugin-transform-dotall-regex": "^7.22.5", "@babel/plugin-transform-duplicate-keys": "^7.22.5", "@babel/plugin-transform-dynamic-import": "^7.22.11", @@ -1844,9 +1844,9 @@ "@babel/plugin-transform-literals": "^7.22.5", "@babel/plugin-transform-logical-assignment-operators": "^7.22.11", "@babel/plugin-transform-member-expression-literals": "^7.22.5", - "@babel/plugin-transform-modules-amd": "^7.22.5", - "@babel/plugin-transform-modules-commonjs": "^7.22.15", - "@babel/plugin-transform-modules-systemjs": "^7.22.11", + "@babel/plugin-transform-modules-amd": "^7.23.0", + "@babel/plugin-transform-modules-commonjs": "^7.23.0", + "@babel/plugin-transform-modules-systemjs": "^7.23.0", "@babel/plugin-transform-modules-umd": "^7.22.5", "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", "@babel/plugin-transform-new-target": "^7.22.5", @@ -1855,7 +1855,7 @@ "@babel/plugin-transform-object-rest-spread": "^7.22.15", "@babel/plugin-transform-object-super": "^7.22.5", "@babel/plugin-transform-optional-catch-binding": "^7.22.11", - "@babel/plugin-transform-optional-chaining": "^7.22.15", + "@babel/plugin-transform-optional-chaining": "^7.23.0", "@babel/plugin-transform-parameters": "^7.22.15", "@babel/plugin-transform-private-methods": "^7.22.5", "@babel/plugin-transform-private-property-in-object": "^7.22.11", @@ -1872,10 +1872,10 @@ "@babel/plugin-transform-unicode-regex": "^7.22.5", "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "0.1.6-no-external-plugins", - "@babel/types": "^7.22.19", - "babel-plugin-polyfill-corejs2": "^0.4.5", - "babel-plugin-polyfill-corejs3": "^0.8.3", - "babel-plugin-polyfill-regenerator": "^0.5.2", + "@babel/types": "^7.23.0", + "babel-plugin-polyfill-corejs2": "^0.4.6", + "babel-plugin-polyfill-corejs3": "^0.8.5", + "babel-plugin-polyfill-regenerator": "^0.5.3", "core-js-compat": "^3.31.0", "semver": "^6.3.1" }, @@ -6105,25 +6105,25 @@ } }, "node_modules/@react-navigation/core": { - "version": "6.4.9", - "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.9.tgz", - "integrity": "sha512-G9GH7bP9x0qqupxZnkSftnkn4JoXancElTvFc8FVGfEvxnxP+gBo3wqcknyBi7M5Vad4qecsYjCOa9wqsftv9g==", + "version": "6.4.10", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.10.tgz", + "integrity": "sha512-oYhqxETRHNHKsipm/BtGL0LI43Hs2VSFoWMbBdHK9OqgQPjTVUitslgLcPpo4zApCcmBWoOLX2qPxhsBda644A==", "dependencies": { "@react-navigation/routers": "^6.1.9", "escape-string-regexp": "^4.0.0", "nanoid": "^3.1.23", "query-string": "^7.1.3", "react-is": "^16.13.0", - "use-latest-callback": "^0.1.5" + "use-latest-callback": "^0.1.7" }, "peerDependencies": { "react": "*" } }, "node_modules/@react-navigation/elements": { - "version": "1.3.19", - "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.19.tgz", - "integrity": "sha512-7hLvSYKPuDS070pza5gd43WDX7QgfuEmuTWNbCJhKdWlLudYmq3qzxGCBwCfO2dEI6+p8tla5wruaWiGKAbTYw==", + "version": "1.3.21", + "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.21.tgz", + "integrity": "sha512-eyS2C6McNR8ihUoYfc166O1D8VYVh9KIl0UQPI8/ZJVsStlfSTgeEEh+WXge6+7SFPnZ4ewzEJdSAHH+jzcEfg==", "peerDependencies": { "@react-navigation/native": "^6.0.0", "react": "*", @@ -6148,11 +6148,11 @@ } }, "node_modules/@react-navigation/native": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.8.tgz", - "integrity": "sha512-0alti852nV+8oCVm9H80G6kZvrHoy51+rXBvVCRUs2rNDDozC/xPZs8tyeCJkqdw3cpxZDK8ndXF22uWq28+0Q==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.9.tgz", + "integrity": "sha512-AMuJDpwXE7UlfyhIXaUCCynXmv69Kb8NzKgKJO7v0k0L+u6xUTbt6xvshmJ79vsvaFyaEH9Jg5FMzek5/S5qNw==", "dependencies": { - "@react-navigation/core": "^6.4.9", + "@react-navigation/core": "^6.4.10", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.1.23" @@ -6163,11 +6163,11 @@ } }, "node_modules/@react-navigation/native-stack": { - "version": "6.9.14", - "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.14.tgz", - "integrity": "sha512-7RiZkvMFN6f0kmANc63B/0m9ttQ2JpDIPWQwPU93FP698s19KTOyu7uxgl7Oi3bvsqHFO5JfiR7B+4h8lh9dxw==", + "version": "6.9.16", + "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.16.tgz", + "integrity": "sha512-SrmBGr5YvRxDtdTacOkA/wvqwpt9kt+AsYpmt82hKMPKpu0v98WONedTXDzi6whhY3jeT2GZkwF8hyrJ+wDbTA==", "dependencies": { - "@react-navigation/elements": "^1.3.19", + "@react-navigation/elements": "^1.3.21", "warn-once": "^0.1.0" }, "peerDependencies": { @@ -7376,9 +7376,9 @@ "integrity": "sha512-FbtmBWCcSa2J4zL781Zf1p5YUBXQomPEcep9QZCfRfQgTxz3pJWiDFLebohZ9fFntX5ibzOkSsrJ0TEew8cAog==" }, "node_modules/@types/react": { - "version": "18.2.28", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.28.tgz", - "integrity": "sha512-ad4aa/RaaJS3hyGz0BGegdnSRXQBkd1CCYDCdNjBPg90UUpLgo+WlJqb9fMYUxtehmzF3PJaTWqRZjko6BRzBg==", + "version": "18.2.33", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.33.tgz", + "integrity": "sha512-v+I7S+hu3PIBoVkKGpSYYpiBT1ijqEzWpzQD62/jm4K74hPpSP7FF9BnKG6+fg2+62weJYkkBWDJlZt5JO/9hg==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -7396,9 +7396,9 @@ } }, "node_modules/@types/react-native-vector-icons": { - "version": "6.4.15", - "resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.15.tgz", - "integrity": "sha512-gmyVIANMFQXzpzejg4uMpYZ6KffrItkeb2F9LgcLnZz8RVrtbF8I3wbkRafHJoDJ2U0p8QiRui+BghD11ae8Gg==", + "version": "6.4.16", + "resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.16.tgz", + "integrity": "sha512-27p1tItacE/0yYKCs+nmGxtO5hiA9nhUSg9W+ipnq9PFS1NMQ+Cjf6Y+tFQgE4u0wF412xkgA40MIGLuocgqCg==", "dev": true, "dependencies": { "@types/react": "*", @@ -7415,9 +7415,9 @@ } }, "node_modules/@types/react-test-renderer": { - "version": "18.0.3", - "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-18.0.3.tgz", - "integrity": "sha512-4wcNLnY6nIT+L6g94CpzL4CXX2P18JvKPU9CDlaHr3DnbP3GiaQLhDotJqjWlVqOcE4UhLRjp0MtxqwuNKONnA==", + "version": "18.0.5", + "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-18.0.5.tgz", + "integrity": "sha512-PsnmF4Hpi61PTRX+dTxkjgDdtZ09kFFgPXczoF+yBfOVxn7xBLPvKP1BUrSasYHmerj33rhoJuvpIMsJuyRqHw==", "dev": true, "dependencies": { "@types/react": "*" @@ -7444,9 +7444,9 @@ "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" }, "node_modules/@types/uuid": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.5.tgz", - "integrity": "sha512-xfHdwa1FMJ082prjSJpoEI57GZITiQz10r3vEJCHa2khEFQjKy91aWKz6+zybzssCvXUwE1LQWgWVwZ4nYUvHQ==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.6.tgz", + "integrity": "sha512-BT2Krtx4xaO6iwzwMFUYvWBWkV2pr37zD68Vmp1CDV196MzczBRxuEpD6Pr395HAgebC/co7hOphs53r8V7jew==", "dev": true }, "node_modules/@types/yargs": { @@ -8306,12 +8306,12 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz", - "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz", + "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==", "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.4.2", + "@babel/helper-define-polyfill-provider": "^0.4.3", "semver": "^6.3.1" }, "peerDependencies": { @@ -8319,23 +8319,23 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz", - "integrity": "sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz", + "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.2", - "core-js-compat": "^3.32.2" + "@babel/helper-define-polyfill-provider": "^0.4.3", + "core-js-compat": "^3.33.1" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz", - "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz", + "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.2" + "@babel/helper-define-polyfill-provider": "^0.4.3" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -9015,11 +9015,11 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/core-js-compat": { - "version": "3.32.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.2.tgz", - "integrity": "sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==", + "version": "3.33.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz", + "integrity": "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ==", "dependencies": { - "browserslist": "^4.21.10" + "browserslist": "^4.22.1" }, "funding": { "type": "opencollective", @@ -10194,9 +10194,9 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz", - "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz", + "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==", "dev": true, "dependencies": { "prettier-linter-helpers": "^1.0.0", @@ -11557,9 +11557,9 @@ "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==" }, "node_modules/i18next": { - "version": "23.5.1", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.5.1.tgz", - "integrity": "sha512-JelYzcaCoFDaa+Ysbfz2JsGAKkrHiMG6S61+HLBUEIPaF40WMwW9hCPymlQGrP+wWawKxKPuSuD71WZscCsWHg==", + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.6.0.tgz", + "integrity": "sha512-z0Cxr0MGkt+kli306WS4nNNM++9cgt2b2VCMprY92j+AIab/oclgPxdwtTZVLP1zn5t5uo8M6uLsZmYrcjr3HA==", "funding": [ { "type": "individual", @@ -16871,9 +16871,9 @@ } }, "node_modules/react-i18next": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.3.0.tgz", - "integrity": "sha512-FlR9xjYHSPIJfQspEmkN0yOlxgRyNuiJKJ8gCaZH08UJ7SZHG+VrptEPcpEMEchjNoCOZdKcvJ3PnmHEZhkeXg==", + "version": "13.3.1", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.3.1.tgz", + "integrity": "sha512-JAtYREK879JXaN9GdzfBI4yJeo/XyLeXWUsRABvYXiFUakhZJ40l+kaTo+i+A/3cKIED41kS/HAbZ5BzFtq/Og==", "dependencies": { "@babel/runtime": "^7.22.5", "html-parse-stringify": "^3.0.1" @@ -17071,18 +17071,18 @@ } }, "node_modules/react-native-safe-area-context": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.7.2.tgz", - "integrity": "sha512-5fy/hRNJ7bI/U2SliOeKf0D80J4lXPc1NsRiNS7Xaz8YTnqlzWib1ViItkwKPfufe54YKzVBMmM32RpdzvO2gg==", + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.7.4.tgz", + "integrity": "sha512-3LR3DCq9pdzlbq6vsHGWBFehXAKDh2Ljug6jWhLWs1QFuJHM6AS2+mH2JfKlB2LqiSFZOBcZfHQFz0sGaA3uqg==", "peerDependencies": { "react": "*", "react-native": "*" } }, "node_modules/react-native-screens": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.25.0.tgz", - "integrity": "sha512-TSC2Ad0hh763I8QT6XxMsPXAagQ+RawDSdFtKRvIz9fCYr96AjRwwaqmYivbqlDywOgcRBkIVynkFtp0ThmlYw==", + "version": "3.27.0", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.27.0.tgz", + "integrity": "sha512-FzSUygZ7yLQyhDJZsl7wU68LwRpVtVdqOPWribmEU3Tf26FohFGGcfJx1D8lf2V2Teb8tI+IaLnXCKbyh2xffA==", "dependencies": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" @@ -17135,9 +17135,9 @@ } }, "node_modules/react-native-vector-icons": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-10.0.0.tgz", - "integrity": "sha512-efMOVbZIebY8RszZPzPBoXi9pvD/NFYmjIDYxRoc9LYSzV8rMJtT8FfcO2hPu85Rn2x9xktha0+qn0B7EqMAcQ==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-10.0.1.tgz", + "integrity": "sha512-oqVyhSgK1wLm7JuN5yep+BCWb4F4C6qi2/mHGsdNqneGWn3MI9VVMX+AIkw0q9GsbY6QjhNd5sUanjRyDJfuUg==", "dependencies": { "prop-types": "^15.7.2", "yargs": "^16.1.1" @@ -19288,9 +19288,9 @@ } }, "node_modules/use-latest-callback": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.6.tgz", - "integrity": "sha512-VO/P91A/PmKH9bcN9a7O3duSuxe6M14ZoYXgA6a8dab8doWNdhiIHzEkX/jFeTTRBsX0Ubk6nG4q2NIjNsj+bg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.7.tgz", + "integrity": "sha512-Hlrl0lskgZZpo2vIpZ4rA7qA/rAGn2PcDvDH1M47AogqMPB0qlGEdsa66AVkIUiEEDpfxA9/N6hY6MqtaNoqWA==", "peerDependencies": { "react": ">=16.8" } diff --git a/dev-client/package.json b/dev-client/package.json index 6b567261a..60c516d35 100644 --- a/dev-client/package.json +++ b/dev-client/package.json @@ -17,15 +17,15 @@ "@react-native-community/checkbox": "^0.5.16", "@react-native/metro-config": "^0.74.0", "@react-navigation/material-top-tabs": "^6.6.5", - "@react-navigation/native": "^6.1.7", - "@react-navigation/native-stack": "^6.9.13", - "@rnmapbox/maps": "^10.0.12", - "formik": "^2.4.3", - "i18next": "^23.4.2", + "@react-navigation/native": "^6.1.9", + "@react-navigation/native-stack": "^6.9.16", + "@rnmapbox/maps": "^10.0.15", + "formik": "^2.4.5", + "i18next": "^23.6.0", "lodash": "^4.17.21", "native-base": "^3.4.28", "react": "18.2.0", - "react-i18next": "^13.3.0", + "react-i18next": "^13.3.1", "react-native": "^0.72.6", "react-native-app-auth": "^7.1.0", "react-native-autocomplete-input": "^5.4.0", @@ -35,32 +35,32 @@ "react-native-gradle-plugin": "^0.71.19", "react-native-mmkv-storage": "^0.9.1", "react-native-pager-view": "^6.2.2", - "react-native-reanimated": "^3.4.2", - "react-native-safe-area-context": "^4.7.2", - "react-native-screens": "^3.25.0", - "react-native-svg": "^13.13.0", + "react-native-reanimated": "^3.5.4", + "react-native-safe-area-context": "^4.7.4", + "react-native-screens": "^3.27.0", + "react-native-svg": "^13.14.0", "react-native-tab-view": "^3.5.2", - "react-native-vector-icons": "^10.0.0", - "terraso-client-shared": "github:techmatters/terraso-client-shared#2bbb0d0", + "react-native-vector-icons": "^10.0.1", + "terraso-client-shared": "github:techmatters/terraso-client-shared#3e2683f", "uuid": "^9.0.1", "yup": "^1.3.2" }, "devDependencies": { - "@babel/core": "^7.22.20", - "@babel/preset-env": "^7.22.14", + "@babel/core": "^7.23.2", + "@babel/preset-env": "^7.23.2", "@babel/runtime": "^7.23.2", "@react-native-community/eslint-config": "^3.2.0", "@tsconfig/react-native": "^3.0.2", "@types/jest": "^29.5.6", - "@types/react": "^18.2.28", - "@types/react-native-vector-icons": "^6.4.14", - "@types/react-test-renderer": "^18.0.1", - "@types/uuid": "^9.0.5", - "babel-jest": "^29.6.2", + "@types/react": "^18.2.33", + "@types/react-native-vector-icons": "^6.4.16", + "@types/react-test-renderer": "^18.0.5", + "@types/uuid": "^9.0.6", + "babel-jest": "^29.7.0", "babel-plugin-root-import": "^6.6.0", "depcheck": "^1.4.7", "eslint": "^8.52.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.0.1", "jest": "^29.7.0", "metro-react-native-babel-preset": "^0.77.0", "prettier": "^3.0.3", diff --git a/dev-client/src/components/home/BottomSheet.tsx b/dev-client/src/components/home/BottomSheet.tsx index 7f5d52365..e25720e1a 100644 --- a/dev-client/src/components/home/BottomSheet.tsx +++ b/dev-client/src/components/home/BottomSheet.tsx @@ -10,6 +10,7 @@ import { Column, FormControl, Select, + Spinner, } from 'native-base'; import { Dispatch, @@ -19,6 +20,7 @@ import { useMemo, useState, } from 'react'; +import {useSelector} from 'terraso-mobile-client/model/store'; import {Site} from 'terraso-client-shared/site/siteSlice'; import {useTranslation} from 'react-i18next'; import {Icon} from 'terraso-mobile-client/components/common/Icons'; @@ -55,6 +57,7 @@ export const SiteListBottomSheet = forwardRef( ref, ) => { const {t} = useTranslation(); + const isLoadingData = useSelector(state => state.soilId.loading); const renderSite = useCallback( ({item}: {item: Site}) => ( @@ -97,7 +100,9 @@ export const SiteListBottomSheet = forwardRef( {sites.length >= 0 && } - {sites.length === 0 ? ( + {isLoadingData ? ( + + ) : sites.length === 0 ? ( ) : ( { () => navigation.navigate('CREATE_PROJECT'), [navigation], ); + const isLoadingData = useSelector(state => state.soilId.loading); return ( { /> }> - {activeProjects.length === 0 && ( - <> - {t('projects.none.header')} - {t('projects.none.info')} - - - {t('projects.learn_more')} - - - )} { /> + {isLoadingData ? ( + + ) : ( + activeProjects.length === 0 && ( + <> + {t('projects.none.header')} + {t('projects.none.info')} + + + {t('projects.learn_more')} + + + ) + )} + {activeProjects.length > 0 && ( <>