Skip to content

Commit d3c00a5

Browse files
authored
Merge pull request Expensify#81509 from victoreronmosele/fix/camera-focus-on-flash-tap
refactor: move flash button out of camera focus gesture detector
2 parents 4d6df42 + 378423c commit d3c00a5

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -655,30 +655,30 @@ function IOURequestStepScan({
655655
forceInactive={isAttachmentPickerActive}
656656
/>
657657
<Animated.View style={[styles.cameraFocusIndicator, cameraFocusIndicatorAnimatedStyle]} />
658-
{canUseMultiScan ? (
659-
<View style={[styles.flashButtonContainer, styles.primaryMediumIcon, flash && styles.bgGreenSuccess, !hasFlash && styles.opacity0]}>
660-
<PressableWithFeedback
661-
role={CONST.ROLE.BUTTON}
662-
accessibilityLabel={translate('receipt.flash')}
663-
sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
664-
disabled={cameraPermissionStatus !== RESULTS.GRANTED || !hasFlash}
665-
onPress={() => setFlash((prevFlash) => !prevFlash)}
666-
>
667-
<Icon
668-
height={16}
669-
width={16}
670-
src={lazyIcons.Bolt}
671-
fill={flash ? theme.white : theme.icon}
672-
/>
673-
</PressableWithFeedback>
674-
</View>
675-
) : null}
676658
<Animated.View
677659
pointerEvents="none"
678660
style={[StyleSheet.absoluteFillObject, styles.backgroundWhite, blinkStyle, styles.zIndex10]}
679661
/>
680662
</View>
681663
</GestureDetector>
664+
{canUseMultiScan ? (
665+
<View style={[styles.flashButtonContainer, styles.primaryMediumIcon, flash && styles.bgGreenSuccess, !hasFlash && styles.opacity0]}>
666+
<PressableWithFeedback
667+
role={CONST.ROLE.BUTTON}
668+
accessibilityLabel={translate('receipt.flash')}
669+
sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
670+
disabled={cameraPermissionStatus !== RESULTS.GRANTED || !hasFlash}
671+
onPress={() => setFlash((prevFlash) => !prevFlash)}
672+
>
673+
<Icon
674+
height={16}
675+
width={16}
676+
src={lazyIcons.Bolt}
677+
fill={flash ? theme.white : theme.icon}
678+
/>
679+
</PressableWithFeedback>
680+
</View>
681+
) : null}
682682
</View>
683683
)}
684684
</View>

0 commit comments

Comments
 (0)