1b5ec1e00b
* update dev deps
* partial update dependencies
* update watermelondb
* update rn to 0.76.5, expo to 52.0.18 and others
* upgrade android firebase
* upgrade detox deps
* fix package-lock.json
* update emm and paste-input
* update turbo-log
* update network library
* fix tests
* review feedback
* fix Keyboard blocking signIn button
* Fall back to iphone 14 iOS 17.2 simulator as app crashes on iOS 17.4
* changes in deleteCredentialsForServer is causing a crash
* withOptions x2 clearly is wrong
* re-add cli-platform-apple fix
* fix: RN 0.76.5 issue with bottom sheet disappearing (#8478)
* experiment, using view vs BottomSheetView
* revert previous & try disabling enableDynamicSizing
* revert an unintended removal
---------
Co-authored-by: yasserfaraazkhan <attitude3cena.yf@gmail.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: Rahim Rahman <rahim.rahman@mattermost.com>
(cherry picked from commit 2f3dfbbbfa)
Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
55 lines
3.1 KiB
Diff
55 lines
3.1 KiB
Diff
diff --git a/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java b/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java
|
|
index 252d1e7..09328c5 100644
|
|
--- a/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java
|
|
+++ b/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java
|
|
@@ -91,14 +91,14 @@ public class NetworkCallbackConnectivityReceiver extends ConnectivityReceiver {
|
|
// Get the connection type
|
|
if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH)) {
|
|
connectionType = ConnectionType.BLUETOOTH;
|
|
+ } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
|
|
+ connectionType = ConnectionType.VPN;
|
|
} else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
|
|
connectionType = ConnectionType.CELLULAR;
|
|
} else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
|
|
connectionType = ConnectionType.ETHERNET;
|
|
} else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
|
|
connectionType = ConnectionType.WIFI;
|
|
- } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
|
|
- connectionType = ConnectionType.VPN;
|
|
}
|
|
|
|
if (network != null) {
|
|
diff --git a/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts b/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts
|
|
index 757d784..663abda 100644
|
|
--- a/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts
|
|
+++ b/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts
|
|
@@ -109,10 +109,10 @@ export default class InternetReachability {
|
|
const nextTimeoutInterval = this._isInternetReachable
|
|
? this._configuration.reachabilityLongTimeout
|
|
: this._configuration.reachabilityShortTimeout;
|
|
- this._currentTimeoutHandle = setTimeout(
|
|
- this._checkInternetReachability,
|
|
- nextTimeoutInterval,
|
|
- );
|
|
+ // this._currentTimeoutHandle = setTimeout(
|
|
+ // this._checkInternetReachability,
|
|
+ // nextTimeoutInterval,
|
|
+ // );
|
|
},
|
|
)
|
|
.catch(
|
|
@@ -125,10 +125,10 @@ export default class InternetReachability {
|
|
}
|
|
|
|
this._setIsInternetReachable(false);
|
|
- this._currentTimeoutHandle = setTimeout(
|
|
- this._checkInternetReachability,
|
|
- this._configuration.reachabilityShortTimeout,
|
|
- );
|
|
+ // this._currentTimeoutHandle = setTimeout(
|
|
+ // this._checkInternetReachability,
|
|
+ // this._configuration.reachabilityShortTimeout,
|
|
+ // );
|
|
}
|
|
},
|
|
)
|