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

Merge pull request #6596 from BlueWallet/unlockd

Browse source 
FIX: Wrong unlock was called
This commit is contained in:
GLaDOS 2024-05-21 22:41:16 +00:00 • committed by GitHub
commit 294fa4e930
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
App.tsx
View file

@ -8,7 +8,6 @@ import { SafeAreaProvider } from 'react-native-safe-area-context';
import { BlueStorageProvider } from './blue_modules/storage-context';
import { LargeScreenProvider } from './components/Context/LargeScreenProvider';
import { SettingsProvider } from './components/Context/SettingsContext';
import { NavigationProvider } from './components/NavigationProvider';
import { BlueDarkTheme, BlueDefaultTheme } from './components/themes';
import MasterView from './navigation/MasterView';
import { navigationRef } from './NavigationService';
@ -19,15 +18,13 @@ const App = () => {
return (
<LargeScreenProvider>
<NavigationContainer ref={navigationRef} theme={colorScheme === 'dark' ? BlueDarkTheme : BlueDefaultTheme}>
<NavigationProvider>
<SafeAreaProvider>
<BlueStorageProvider>
<SettingsProvider>
<MasterView />
</SettingsProvider>
</BlueStorageProvider>
</SafeAreaProvider>
</NavigationProvider>
<SafeAreaProvider>
<BlueStorageProvider>
<SettingsProvider>
<MasterView />
</SettingsProvider>
</BlueStorageProvider>
</SafeAreaProvider>
</NavigationContainer>
</LargeScreenProvider>
);

17
components/HandOffComponent.ios.tsx
View file

@ -25,21 +25,26 @@ interface HandOffComponentWithActivityTypes extends React.FC<HandOffComponentPro
export const setIsHandOffUseEnabled = async (value: boolean) => {
await DefaultPreference.setName(GROUP_IO_BLUEWALLET);
await DefaultPreference.set(BlueApp.HANDOFF_STORAGE_KEY, value.toString());
console.log('setIsHandOffUseEnabledAsyncStorage', value);
console.debug('setIsHandOffUseEnabledAsyncStorage', value);
};
export const getIsHandOffUseEnabled = async (): Promise<boolean> => {
await DefaultPreference.setName(GROUP_IO_BLUEWALLET);
const isEnabledValue = await DefaultPreference.get(BlueApp.HANDOFF_STORAGE_KEY);
console.log('getIsHandOffUseEnabledV', isEnabledValue);
return isEnabledValue === 'true';
try {
await DefaultPreference.setName(GROUP_IO_BLUEWALLET);
const isEnabledValue = (await DefaultPreference.get(BlueApp.HANDOFF_STORAGE_KEY)) ?? false;
console.debug('getIsHandOffUseEnabled', isEnabledValue);
return isEnabledValue === 'true';
} catch (e) {
console.debug('getIsHandOffUseEnabled error', e);
}
return false;
};
const HandOffComponent: HandOffComponentWithActivityTypes = props => {
const { isHandOffUseEnabled } = useSettings();
if (process.env.NODE_ENV === 'development') {
console.log('HandOffComponent: props', props);
console.debug('HandOffComponent: props', props);
}
if (isHandOffUseEnabled) {
return <Handoff {...props} />;

9
components/NavigationProvider.tsx
View file

@ -1,9 +0,0 @@
import React, { ReactNode } from 'react';
interface NavigationProviderProps {
children: ReactNode;
}
export const NavigationProvider: React.FC<NavigationProviderProps> = ({ children }) => {
return <>{children}</>;
};

3
screen/UnlockWith.tsx
View file

@ -1,6 +1,5 @@
import React, { useCallback, useEffect, useReducer, useRef } from 'react';
import { ActivityIndicator, Image, StyleSheet, View } from 'react-native';
import triggerHapticFeedback, { HapticFeedbackTypes } from '../blue_modules/hapticFeedback';
import { useStorage } from '../blue_modules/storage-context';
import { BlueTextCentered } from '../BlueComponents';
@ -103,7 +102,7 @@ const UnlockWith: React.FC = () => {
unlockWithKey();
} else if (biometricUseCapableAndEnabled) {
dispatch({ type: SET_AUTH, payload: { type: AuthType.Biometrics, detail: biometricType } });
unlockWithBiometrics();
unlockUsingBiometrics();
} else if (biometricsUseEnabled && biometricType === undefined) {
triggerHapticFeedback(HapticFeedbackTypes.NotificationError);
dispatch({ type: SET_AUTH, payload: { type: AuthType.BiometricsUnavailable, detail: undefined } });