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

FIX: Keyboaard listeners were not being properly removed

Browse source
This commit is contained in:
Marcos Rodriguez Velez 2024-07-06 20:06:19 -04:00
parent b94f809da1
commit c0d4e63757
No known key found for this signature in database
GPG key ID: 6030B2F48CCE86D7
5 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
screen/lnd/lndCreateInvoice.js
View file

@ -76,16 +76,20 @@ const LNDCreateInvoice = () => {
}, },
}); });
useEffect(() => { useEffect(() => {
// console.log(params) const showSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', _keyboardDidShow,
Keyboard.addListener('keyboardDidShow', _keyboardDidShow); );
Keyboard.addListener('keyboardDidHide', _keyboardDidHide); const hideSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', _keyboardDidHide,
);
return () => { return () => {
Keyboard.removeAllListeners('keyboardDidShow'); showSubscription.remove();
Keyboard.removeAllListeners('keyboardDidHide'); hideSubscription.remove();
}; };
}, []); }, []);
const renderReceiveDetails = async () => { const renderReceiveDetails = async () => {
try { try {
wallet.current.setUserHasSavedExport(true); wallet.current.setUserHasSavedExport(true);

13
screen/lnd/scanLndInvoice.js
View file

@ -5,6 +5,7 @@ import {
I18nManager, I18nManager,
Keyboard, Keyboard,
KeyboardAvoidingView, KeyboardAvoidingView,
Platform,
ScrollView, ScrollView,
StyleSheet, StyleSheet,
Text, Text,
@ -63,15 +64,17 @@ const ScanLndInvoice = () => {
}); });
useEffect(() => { useEffect(() => {
console.log('scanLndInvoice useEffect'); const showSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', _keyboardDidShow,
Keyboard.addListener('keyboardDidShow', _keyboardDidShow); );
Keyboard.addListener('keyboardDidHide', _keyboardDidHide); const hideSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', _keyboardDidHide,
);
return () => { return () => {
Keyboard.removeAllListeners('keyboardDidShow'); showSubscription.remove();
Keyboard.removeAllListeners('keyboardDidHide'); hideSubscription.remove();
}; };
}, []); }, []);
useEffect(() => { useEffect(() => {
if (walletID && wallet?.getID() !== walletID) { if (walletID && wallet?.getID() !== walletID) {
setWallet(wallets.find(w => w.getID() === walletID)); setWallet(wallets.find(w => w.getID() === walletID));

8
screen/send/SendDetails.tsx
View file

@ -151,11 +151,11 @@ const SendDetails = () => {
setIsAmountToolbarVisibleForAndroid(false); setIsAmountToolbarVisibleForAndroid(false);
}; };
Keyboard.addListener('keyboardDidShow', _keyboardDidShow); const showSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', _keyboardDidShow);
Keyboard.addListener('keyboardDidHide', _keyboardDidHide); const hideSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', _keyboardDidHide);
return () => { return () => {
Keyboard.removeAllListeners('keyboardDidShow'); showSubscription.remove();
Keyboard.removeAllListeners('keyboardDidHide'); hideSubscription.remove();
}; };
}, []); }, []);

13
screen/wallets/import.js
View file

@ -59,15 +59,20 @@ const WalletsImport = () => {
useEffect(() => { useEffect(() => {
enableBlur(); enableBlur();
Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', () => setIsToolbarVisibleForAndroid(true));
Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', () => setIsToolbarVisibleForAndroid(false)); const showSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', () => setIsToolbarVisibleForAndroid(true),
);
const hideSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', () => setIsToolbarVisibleForAndroid(false),
);
return () => { return () => {
Keyboard.removeAllListeners(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow'); showSubscription.remove();
Keyboard.removeAllListeners(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide'); hideSubscription.remove();
disableBlur(); disableBlur();
}; };
}, [disableBlur, enableBlur]); }, [disableBlur, enableBlur]);
useEffect(() => { useEffect(() => {
if (triggerImport) importButtonPressed(); if (triggerImport) importButtonPressed();
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps

12
screen/wallets/signVerify.js
View file

@ -38,11 +38,15 @@ const SignVerify = () => {
const isToolbarVisibleForAndroid = Platform.OS === 'android' && messageHasFocus && isKeyboardVisible; const isToolbarVisibleForAndroid = Platform.OS === 'android' && messageHasFocus && isKeyboardVisible;
useEffect(() => { useEffect(() => {
Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', () => setIsKeyboardVisible(true)); const showSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', () =>
Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', () => setIsKeyboardVisible(false)); setIsKeyboardVisible(true),
);
const hideSubscription = Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', () =>
setIsKeyboardVisible(false),
);
return () => { return () => {
Keyboard.removeAllListeners(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow'); showSubscription.remove();
Keyboard.removeAllListeners(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide'); hideSubscription.remove();
}; };
}, []); }, []);