mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-03-03 20:07:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6282 from BlueWallet/camera

Browse source 
FIX: wrong import for isDesktop
This commit is contained in:
GLaDOS 2024-03-17 19:31:08 +00:00 • committed by GitHub
commit 2cc575ceb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
class/camera.ts
View file

@ -1,8 +1,6 @@
import { Linking, Alert } from 'react-native'; import { Linking, Alert } from 'react-native';
import { getSystemName } from 'react-native-device-info';
import loc from '../loc'; import loc from '../loc';
import { isDesktop } from '../blue_modules/environment';
const isDesktop: boolean = getSystemName() === 'Mac OS X';
export const openPrivacyDesktopSettings = () => { export const openPrivacyDesktopSettings = () => {
if (isDesktop) { if (isDesktop) {

4
screen/send/psbtMultisigQRCode.js
View file

@ -1,6 +1,5 @@
import React, { useEffect, useRef, useState } from 'react'; import React, { useEffect, useRef, useState } from 'react';
import { ActivityIndicator, findNodeHandle, ScrollView, StyleSheet, View } from 'react-native'; import { ActivityIndicator, findNodeHandle, ScrollView, StyleSheet, View } from 'react-native';
import { getSystemName } from 'react-native-device-info';
import { useNavigation, useRoute, useIsFocused } from '@react-navigation/native'; import { useNavigation, useRoute, useIsFocused } from '@react-navigation/native';
import { BlueSpacing20 } from '../../BlueComponents'; import { BlueSpacing20 } from '../../BlueComponents';
@ -13,11 +12,10 @@ import presentAlert from '../../components/Alert';
import { requestCameraAuthorization } from '../../helpers/scan-qr'; import { requestCameraAuthorization } from '../../helpers/scan-qr';
import { useTheme } from '../../components/themes'; import { useTheme } from '../../components/themes';
import SafeArea from '../../components/SafeArea'; import SafeArea from '../../components/SafeArea';
import { isDesktop } from '../../blue_modules/environment';
const bitcoin = require('bitcoinjs-lib'); const bitcoin = require('bitcoinjs-lib');
const fs = require('../../blue_modules/fs'); const fs = require('../../blue_modules/fs');
const isDesktop = getSystemName() === 'Mac OS X';
const PsbtMultisigQRCode = () => { const PsbtMultisigQRCode = () => {
const { navigate } = useNavigation(); const { navigate } = useNavigation();
const { colors } = useTheme(); const { colors } = useTheme();

3
screen/wallets/addMultisigStep2.js
View file

@ -17,7 +17,6 @@ import {
} from 'react-native'; } from 'react-native';
import { Icon } from 'react-native-elements'; import { Icon } from 'react-native-elements';
import { useFocusEffect, useNavigation, useRoute } from '@react-navigation/native'; import { useFocusEffect, useNavigation, useRoute } from '@react-navigation/native';
import { getSystemName } from 'react-native-device-info';
import { BlueButtonLink, BlueFormMultiInput, BlueSpacing10, BlueSpacing20, BlueText, BlueTextCentered } from '../../BlueComponents'; import { BlueButtonLink, BlueFormMultiInput, BlueSpacing10, BlueSpacing20, BlueText, BlueTextCentered } from '../../BlueComponents';
import navigationStyle from '../../components/navigationStyle'; import navigationStyle from '../../components/navigationStyle';
import { HDSegwitBech32Wallet, MultisigCosigner, MultisigHDWallet } from '../../class'; import { HDSegwitBech32Wallet, MultisigCosigner, MultisigHDWallet } from '../../class';
@ -38,11 +37,11 @@ import { useTheme } from '../../components/themes';
import Button from '../../components/Button'; import Button from '../../components/Button';
import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback';
import usePrivacy from '../../hooks/usePrivacy'; import usePrivacy from '../../hooks/usePrivacy';
import { isDesktop } from '../../blue_modules/environment';
const prompt = require('../../helpers/prompt'); const prompt = require('../../helpers/prompt');
const A = require('../../blue_modules/analytics'); const A = require('../../blue_modules/analytics');
const fs = require('../../blue_modules/fs'); const fs = require('../../blue_modules/fs');
const isDesktop = getSystemName() === 'Mac OS X';
const staticCache = {}; const staticCache = {};
const WalletsAddMultisigStep2 = () => { const WalletsAddMultisigStep2 = () => {