+
+
+
+
+
+ Hide QR scanner
+
+
+
diff --git a/web/cashtab/src/components/Send/Send.js b/web/cashtab/src/components/Send/Send.js
--- a/web/cashtab/src/components/Send/Send.js
+++ b/web/cashtab/src/components/Send/Send.js
@@ -142,7 +142,12 @@
// If this is less than 769, the page will open with QR scanner open
const { width } = useWindowDimensions();
// Load with QR code open if device is mobile and NOT iOS + anything but safari
- const scannerSupported = width < 769 && isMobile && !(isIOS && !isSafari);
+ const scannerSupported =
+ cashtabSettings &&
+ cashtabSettings.autoCameraOff === false &&
+ width < 769 &&
+ isMobile &&
+ !(isIOS && !isSafari);
const [formData, setFormData] = useState({
value: '',
diff --git a/web/cashtab/src/components/Send/SendToken.js b/web/cashtab/src/components/Send/SendToken.js
--- a/web/cashtab/src/components/Send/SendToken.js
+++ b/web/cashtab/src/components/Send/SendToken.js
@@ -113,7 +113,12 @@
// If this is less than 769, the page will open with QR scanner open
const { width } = useWindowDimensions();
// Load with QR code open if device is mobile and NOT iOS + anything but safari
- const scannerSupported = width < 769 && isMobile && !(isIOS && !isSafari);
+ const scannerSupported =
+ cashtabSettings &&
+ cashtabSettings.autoCameraOff === false &&
+ width < 769 &&
+ isMobile &&
+ !(isIOS && !isSafari);
const [isModalVisible, setIsModalVisible] = useState(false);
const [formData, setFormData] = useState({
diff --git a/web/cashtab/src/utils/__tests__/validation.test.js b/web/cashtab/src/utils/__tests__/validation.test.js
--- a/web/cashtab/src/utils/__tests__/validation.test.js
+++ b/web/cashtab/src/utils/__tests__/validation.test.js
@@ -263,7 +263,11 @@
});
it(`Recognizes a valid cashtab settings object`, () => {
expect(
- isValidCashtabSettings({ fiatCurrency: 'usd', sendModal: false }),
+ isValidCashtabSettings({
+ fiatCurrency: 'usd',
+ sendModal: false,
+ autoCameraOff: false,
+ }),
).toBe(true);
});
it(`Rejects a cashtab settings object for an unsupported currency`, () => {