From ebe03bf961f6a095917b45f064a5dd5c690009f5 Mon Sep 17 00:00:00 2001 From: Yauheni Date: Tue, 27 Feb 2024 19:56:29 +0100 Subject: [PATCH 1/3] Fix bug with Selected bank account is not checked in bank account selection step --- src/components/AddPlaidBankAccount.js | 1 + src/components/RadioButtons.tsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js index b6fc639546a8..1bb696d09ed1 100644 --- a/src/components/AddPlaidBankAccount.js +++ b/src/components/AddPlaidBankAccount.js @@ -301,6 +301,7 @@ function AddPlaidBankAccount({ defaultCheckedValue={defaultSelectedPlaidAccountID} onPress={handleSelectingPlaidAccount} radioButtonStyle={[styles.mb6]} + value={selectedPlaidAccountID} /> diff --git a/src/components/RadioButtons.tsx b/src/components/RadioButtons.tsx index 90c7d8580b5c..c9ebf712072e 100644 --- a/src/components/RadioButtons.tsx +++ b/src/components/RadioButtons.tsx @@ -40,10 +40,10 @@ function RadioButtons({items, onPress, defaultCheckedValue = '', radioButtonStyl const styles = useThemeStyles(); const [checkedValue, setCheckedValue] = useState(defaultCheckedValue); useEffect(() => { - if (value === checkedValue) { + if (value === checkedValue || value === undefined) { return; } - setCheckedValue(value ?? ''); + setCheckedValue(value); }, [checkedValue, value]); return ( From 87f2848b1f79f24fd56b43a88931187f1447d007 Mon Sep 17 00:00:00 2001 From: Yauheni Date: Tue, 27 Feb 2024 20:06:29 +0100 Subject: [PATCH 2/3] Reverte passing value for RadioButtons inside AddPlaidBankAccount --- src/components/AddPlaidBankAccount.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js index 1bb696d09ed1..b6fc639546a8 100644 --- a/src/components/AddPlaidBankAccount.js +++ b/src/components/AddPlaidBankAccount.js @@ -301,7 +301,6 @@ function AddPlaidBankAccount({ defaultCheckedValue={defaultSelectedPlaidAccountID} onPress={handleSelectingPlaidAccount} radioButtonStyle={[styles.mb6]} - value={selectedPlaidAccountID} /> From 8cf4670d37eeda785db17f8509150fc5800e61b5 Mon Sep 17 00:00:00 2001 From: Yauheni Date: Tue, 27 Feb 2024 22:16:57 +0100 Subject: [PATCH 3/3] Update code --- src/components/RadioButtons.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/RadioButtons.tsx b/src/components/RadioButtons.tsx index c9ebf712072e..2030ce8f0bfd 100644 --- a/src/components/RadioButtons.tsx +++ b/src/components/RadioButtons.tsx @@ -39,11 +39,12 @@ type RadioButtonsProps = { function RadioButtons({items, onPress, defaultCheckedValue = '', radioButtonStyle, errorText, onInputChange = () => {}, value}: RadioButtonsProps, ref: ForwardedRef) { const styles = useThemeStyles(); const [checkedValue, setCheckedValue] = useState(defaultCheckedValue); + useEffect(() => { if (value === checkedValue || value === undefined) { return; } - setCheckedValue(value); + setCheckedValue(value ?? ''); }, [checkedValue, value]); return (