mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-01-19 05:45:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into drawertsx

Browse Source
This commit is contained in:
Marcos Rodriguez Velez 2024-03-18 18:03:04 -04:00
commit 6edc9d699f
No known key found for this signature in database
GPG Key ID: 6030B2F48CCE86D7
4 changed files with 7 additions and 10 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 { getSystemName } from 'react-native-device-info';
import loc from '../loc';
const isDesktop: boolean = getSystemName() === 'Mac OS X';
import { isDesktop } from '../blue_modules/environment';
export const openPrivacyDesktopSettings = () => {
if (isDesktop) {

6
ios/BlueWallet/AppDelegate.mm
View File

@ -144,8 +144,10 @@
[builder removeMenuForIdentifier:UIMenuToolbar];
// File -> Add Wallet (Command + A)
UIKeyCommand *addWalletCommand = [UIKeyCommand keyCommandWithInput:@"A" modifierFlags:UIKeyModifierCommand action:@selector(addWalletAction:)];
[addWalletCommand setTitle:@"Add Wallet"];
UIKeyCommand *addWalletCommand = [UIKeyCommand keyCommandWithInput:@"A"
modifierFlags:UIKeyModifierCommand | UIKeyModifierShift
action:@selector(addWalletAction:)];
[addWalletCommand setTitle:@"Add Wallet"];
// File -> Import Wallet
UIKeyCommand *importWalletCommand = [UIKeyCommand keyCommandWithInput:@"I" modifierFlags:UIKeyModifierCommand action:@selector(importWalletAction:)];

4
screen/send/psbtMultisigQRCode.js
View File

@ -1,6 +1,5 @@
import React, { useEffect, useRef, useState } from 'react';
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 { BlueSpacing20 } from '../../BlueComponents';
@ -13,11 +12,10 @@ import presentAlert from '../../components/Alert';
import { requestCameraAuthorization } from '../../helpers/scan-qr';
import { useTheme } from '../../components/themes';
import SafeArea from '../../components/SafeArea';
import { isDesktop } from '../../blue_modules/environment';
const bitcoin = require('bitcoinjs-lib');
const fs = require('../../blue_modules/fs');
const isDesktop = getSystemName() === 'Mac OS X';
const PsbtMultisigQRCode = () => {
const { navigate } = useNavigation();
const { colors } = useTheme();

3
screen/wallets/addMultisigStep2.js
View File

@ -17,7 +17,6 @@ import {
} from 'react-native';
import { Icon } from 'react-native-elements';
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 navigationStyle from '../../components/navigationStyle';
import { HDSegwitBech32Wallet, MultisigCosigner, MultisigHDWallet } from '../../class';
@ -38,11 +37,11 @@ import { useTheme } from '../../components/themes';
import Button from '../../components/Button';
import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback';
import usePrivacy from '../../hooks/usePrivacy';
import { isDesktop } from '../../blue_modules/environment';
const prompt = require('../../helpers/prompt');
const A = require('../../blue_modules/analytics');
const fs = require('../../blue_modules/fs');
const isDesktop = getSystemName() === 'Mac OS X';
const staticCache = {};
const WalletsAddMultisigStep2 = () => {