Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix playing Shutter Sound in Scan Receipt #39400

Merged
merged 11 commits into from
Apr 4, 2024
Merged

fix: Fix playing Shutter Sound in Scan Receipt #39400

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8948d41
fix: Upgrade VisionCamera V4 to latest beta to fix shutter sound on s…
mrousavy Apr 2, 2024
9f50769
fix: Only play shutter sound when not explicitly disabled through set…
mrousavy Apr 2, 2024
d7a50d4
chore: Install Pods/Gems
mrousavy Apr 2, 2024
d552ea0
use withOnyx HOC instead of useOnyx
chrispader Apr 3, 2024
9a5814b
Merge branch 'main' into fix/fix-shutter-sound-on-silent
chrispader Apr 3, 2024
8cc9a9c
Merge branch 'main' into fix/fix-shutter-sound-on-silent
chrispader Apr 4, 2024
6c7fadc
update react-native-vision-camera
chrispader Apr 4, 2024
e126fbf
update package-lock.json
chrispader Apr 4, 2024
042a637
update Podfile.lock
chrispader Apr 4, 2024
1c8614c
fix: wrong defaultprops and description
chrispader Apr 4, 2024
c368e4e
fix: comment
chrispader Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"react-native-tab-view": "^3.5.2",
"react-native-url-polyfill": "^2.0.0",
"react-native-view-shot": "3.8.0",
"react-native-vision-camera": "^4.0.0-beta.11",
"react-native-vision-camera": "^4.0.0-beta.12",
"react-native-web": "^0.19.9",
"react-native-web-linear-gradient": "^1.1.2",
"react-native-web-sound": "^0.1.3",
Expand Down
8 changes: 6 additions & 2 deletions src/pages/iou/request/step/IOURequestStepScan/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {useFocusEffect} from '@react-navigation/core';
import lodashGet from 'lodash/get';
import React, {useCallback, useRef, useState} from 'react';
import React, {useCallback, useEffect, useRef, useState} from 'react';
import {ActivityIndicator, Alert, AppState, InteractionManager, View} from 'react-native';
import {Gesture, GestureDetector} from 'react-native-gesture-handler';
import {RESULTS} from 'react-native-permissions';
Expand Down Expand Up @@ -31,6 +31,8 @@ import reportPropTypes from '@pages/reportPropTypes';
import * as IOU from '@userActions/IOU';
import CONST from '@src/CONST';
import ROUTES from '@src/ROUTES';
import Onyx, {useOnyx} from 'react-native-onyx';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import Onyx, {useOnyx} from 'react-native-onyx';
import {withOnyx} from 'react-native-onyx';

import ONYXKEYS from '@src/ONYXKEYS';
import * as CameraPermission from './CameraPermission';
import NavigationAwareCamera from './NavigationAwareCamera';

Expand Down Expand Up @@ -63,6 +65,7 @@ function IOURequestStepScan({
const device = useCameraDevice('back', {
physicalDevices: ['wide-angle-camera'],
});
const [user] = useOnyx(ONYXKEYS.USER)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I use a selector for only isMutedAllSounds here, or is this fine?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think we can use useOnyx yet, please use selector

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How would that look like then? Onyx.connect(...)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mountiny what is the reason we shouldn't use `useOnyx yet?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const [user] = useOnyx(ONYXKEYS.USER)


const hasFlash = device != null && device.hasFlash;
const camera = useRef(null);
Expand Down Expand Up @@ -239,6 +242,7 @@ function IOURequestStepScan({
return camera.current
.takePhoto({
flash: flash && hasFlash ? 'on' : 'off',
enableShutterSound: !user.isMutedAllSounds
})
.then((photo) => {
// Store the receipt on the transaction object in Onyx
Expand All @@ -258,7 +262,7 @@ function IOURequestStepScan({
showCameraAlert();
Log.warn('Error taking photo', error);
});
}, [flash, hasFlash, action, translate, transactionID, updateScanAndNavigate, navigateToConfirmationStep, cameraPermissionStatus]);
}, [cameraPermissionStatus, flash, hasFlash, user.isMutedAllSounds, translate, transactionID, action, navigateToConfirmationStep, updateScanAndNavigate]);

// Wait for camera permission status to render
if (cameraPermissionStatus == null) {
Expand Down
Loading