Merge branch 'master' into renovate/lodev09-react-native-true-sheet-digest

This commit is contained in:
Marcos Rodriguez Vélez 2025-02-20 08:45:42 -04:00 committed by GitHub
commit 5fb3991cb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 10 deletions

View file

@ -1819,7 +1819,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (4.6.0):
- RNScreens (4.7.0):
- DoubleConversion
- glog
- hermes-engine
@ -2312,7 +2312,7 @@ SPEC CHECKSUMS:
RNRate: 7641919330e0d6688ad885a985b4bd697ed7d14c
RNReactNativeHapticFeedback: 00ba111b82aa266bb3ee1aa576831c2ea9a9dfad
RNReanimated: 66cf0f600a26d2b5e74c6e0b1c77c1ab1f62fc05
RNScreens: b05d3b8e716e68d9e2f1364d440d23de5b6885f1
RNScreens: 9a7346d6ce564a948e9d61cf9ec10950093e34df
RNShare: 6204e6a1987ba3e7c47071ef703e5449a0e3548a
RNSVG: 86fecdfc637614ba9def63f7f3f2e7795e018356
RNVectorIcons: 182892e7d1a2f27b52d3c627eca5d2665a22ee28

View file

@ -375,6 +375,7 @@ const DetailViewStackScreensStack = () => {
options={navigationStyle({
headerShown: false,
statusBarHidden: true,
autoHideHomeIndicator: true,
presentation: 'fullScreenModal',
headerShadowVisible: false,
})(theme)}

8
package-lock.json generated
View file

@ -91,7 +91,7 @@
"react-native-reanimated": "3.16.7",
"react-native-safe-area-context": "5.2.0",
"react-native-screen-capture": "github:BlueWallet/react-native-screen-capture#18cb79f",
"react-native-screens": "4.6.0",
"react-native-screens": "4.7.0",
"react-native-secure-key-store": "github:BlueWallet/react-native-secure-key-store#2076b4849e88aa0a78e08bfbb4ce3923e0925cbc",
"react-native-share": "11.1.0",
"react-native-svg": "15.11.1",
@ -22102,9 +22102,9 @@
}
},
"node_modules/react-native-screens": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.6.0.tgz",
"integrity": "sha512-PqGtR/moJLiTMSavhfo5spKXNHZrlxffq3g5UUVPmyuu7MmazFlPvYqiAYnR2iB9tkJYgvZO6sbjYAE7619M0A==",
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.7.0.tgz",
"integrity": "sha512-PKBwBIKasBuaR6otU7GsUb9t5pb2eG1G9uHMHOivst/Iw1tXK+DDz1HSDQFjwcj2pUjrKSkXmwUtbY/oAvsCUA==",
"license": "MIT",
"dependencies": {
"react-freeze": "^1.0.0",

View file

@ -17,6 +17,7 @@
"@react-navigation/devtools": "7.0.15",
"@react-native/metro-babel-transformer": "^0.76.7",
"@react-native/typescript-config": "0.76.7",
"@react-navigation/devtools": "7.0.15",
"@testing-library/react-native": "^13.0.1",
"@types/bip38": "^3.1.2",
"@types/bs58check": "^2.1.0",
@ -160,7 +161,7 @@
"react-native-reanimated": "3.16.7",
"react-native-safe-area-context": "5.2.0",
"react-native-screen-capture": "github:BlueWallet/react-native-screen-capture#18cb79f",
"react-native-screens": "4.6.0",
"react-native-screens": "4.7.0",
"react-native-secure-key-store": "github:BlueWallet/react-native-secure-key-store#2076b4849e88aa0a78e08bfbb4ce3923e0925cbc",
"react-native-share": "11.1.0",
"react-native-svg": "15.11.1",

View file

@ -29,6 +29,7 @@ const styles = StyleSheet.create({
justifyContent: 'center',
alignContent: 'center',
alignItems: 'center',
height: '100%',
},
backdoorButton: {
width: 60,
@ -70,7 +71,7 @@ const ScanQRCode = () => {
const [backdoorText, setBackdoorText] = useState('');
const [backdoorVisible, setBackdoorVisible] = useState(false);
const [animatedQRCodeData, setAnimatedQRCodeData] = useState({});
const [cameraStatusGranted, setCameraStatusGranted] = useState(false);
const [cameraStatusGranted, setCameraStatusGranted] = useState(undefined);
const stylesHook = StyleSheet.create({
openSettingsContainer: {
backgroundColor: colors.brandingColor,
@ -280,7 +281,7 @@ const ScanQRCode = () => {
<BlueLoading />
) : (
<View>
{!cameraStatusGranted ? (
{cameraStatusGranted === false ? (
<View style={[styles.openSettingsContainer, stylesHook.openSettingsContainer]}>
<BlueText>{loc.send.permission_camera_message}</BlueText>
<BlueSpacing40 />
@ -292,7 +293,7 @@ const ScanQRCode = () => {
<BlueSpacing40 />
<Button title={loc._.cancel} onPress={dismiss} />
</View>
) : isFocused ? (
) : isFocused && cameraStatusGranted ? (
<CameraScreen
onReadCode={handleReadCode}
showFrame={false}