fix: PinPad race condition 2

synonymdev · May 28, 2024 · ef7996d · ef7996d
1 parent f32ddb3
commit ef7996d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 32 deletions.
diff --git a/src/screens/Settings/PIN/ChangePin.tsx b/src/screens/Settings/PIN/ChangePin.tsx
@@ -30,16 +30,15 @@ const ChangePin = ({
 	const { brand, brand08 } = useColors();
 
 	const handleOnPress = (key: string): void => {
+		vibrate();
 		if (key === 'delete') {
-			if (pin.length !== 0) {
-				vibrate();
-				setPin((p) => p.slice(0, -1));
-			}
+			setPin((p) => {
+				return p.length === 0 ? '' : p.slice(0, -1);
+			});
 		} else {
-			if (pin.length !== 4) {
-				vibrate();
-				setPin((p) => p + key);
-			}
+			setPin((p) => {
+				return p.length === 4 ? p : p + key;
+			});
 		}
 	};
 

diff --git a/src/screens/Settings/PIN/ChangePin2.tsx b/src/screens/Settings/PIN/ChangePin2.tsx
@@ -31,16 +31,15 @@ const ChangePin2 = ({
 	const { brand, brand08 } = useColors();
 
 	const handleOnPress = (key: string): void => {
+		vibrate();
 		if (key === 'delete') {
-			if (pin.length !== 0) {
-				vibrate();
-				setPin((p) => p.slice(0, -1));
-			}
+			setPin((p) => {
+				return p.length === 0 ? '' : p.slice(0, -1);
+			});
 		} else {
-			if (pin.length !== 4) {
-				vibrate();
-				setPin((p) => p + key);
-			}
+			setPin((p) => {
+				return p.length === 4 ? p : p + key;
+			});
 		}
 	};
 

diff --git a/src/screens/Settings/PIN/ChoosePIN.tsx b/src/screens/Settings/PIN/ChoosePIN.tsx
@@ -34,16 +34,15 @@ const ChoosePIN = ({
 	const { brand, brand08 } = useColors();
 
 	const handleOnPress = (key: string): void => {
+		vibrate();
 		if (key === 'delete') {
-			if (pin.length !== 0) {
-				vibrate();
-				setPin((p) => p.slice(0, -1));
-			}
+			setPin((p) => {
+				return p.length === 0 ? '' : p.slice(0, -1);
+			});
 		} else {
-			if (pin.length !== 4) {
-				vibrate();
-				setPin((p) => p + key);
-			}
+			setPin((p) => {
+				return p.length === 4 ? p : p + key;
+			});
 		}
 	};
 

diff --git a/src/screens/Wallets/Send/SendPinPad.tsx b/src/screens/Wallets/Send/SendPinPad.tsx
@@ -18,16 +18,15 @@ const SendPinPad = ({ onSuccess }: { onSuccess: () => void }): ReactElement => {
 	const { brand, brand08 } = useColors();
 
 	const handleOnPress = (key: string): void => {
+		vibrate();
 		if (key === 'delete') {
-			if (pin.length !== 0) {
-				vibrate();
-				setPin((p) => p.slice(0, -1));
-			}
+			setPin((p) => {
+				return p.length === 0 ? '' : p.slice(0, -1);
+			});
 		} else {
-			if (pin.length !== 4) {
-				vibrate();
-				setPin((p) => p + key);
-			}
+			setPin((p) => {
+				return p.length === 4 ? p : p + key;
+			});
 		}
 	};