From 7cf3f12c5d6657d16eb49b52caab812841c95a0b Mon Sep 17 00:00:00 2001
From: DreamXZE <dreamxze@hotmail.com>
Date: Thu, 16 Mar 2023 02:29:48 +0100
Subject: [PATCH] Another improvement

---
 .../FightForStyleShowRoomMenu.tsx             | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/resources/[soz]/soz-core/src/nui/components/FightForStyle/FightForStyleShowRoomMenu.tsx b/resources/[soz]/soz-core/src/nui/components/FightForStyle/FightForStyleShowRoomMenu.tsx
index 84c80533a0..16582dbb92 100755
--- a/resources/[soz]/soz-core/src/nui/components/FightForStyle/FightForStyleShowRoomMenu.tsx
+++ b/resources/[soz]/soz-core/src/nui/components/FightForStyle/FightForStyleShowRoomMenu.tsx
@@ -123,6 +123,18 @@ export const FightForStyleShowRoomMenu: FunctionComponent<FightForStyleShowRoomC
         setCurrentDrawable(0);
     });
 
+    const resetUnderShirt = async () => {
+        const componentIndex = FfsComponent.Undershirt.toString();
+        const component = state.clothConfig.Components[componentIndex];
+        component.Drawable = 0;
+        component.Texture = 25;
+
+        return await fetchNui(NuiEvent.FfsShowRoomChangeComponent, {
+            componentIndex,
+            component,
+        });
+    };
+
     const onComponentChange = async (
         componentIndex: FfsComponent | string,
         key: 'drawable' | 'texture',
@@ -150,7 +162,7 @@ export const FightForStyleShowRoomMenu: FunctionComponent<FightForStyleShowRoomC
                 break;
         }
 
-        await fetchNui(NuiEvent.FfsShowRoomChangeComponent, {
+        return await fetchNui(NuiEvent.FfsShowRoomChangeComponent, {
             componentIndex,
             component,
         });
@@ -178,7 +190,7 @@ export const FightForStyleShowRoomMenu: FunctionComponent<FightForStyleShowRoomC
                 break;
         }
 
-        await fetchNui(NuiEvent.FfsShowRoomChangeProp, {
+        return await fetchNui(NuiEvent.FfsShowRoomChangeProp, {
             propIndex,
             prop,
         });
@@ -336,8 +348,8 @@ export const FightForStyleShowRoomMenu: FunctionComponent<FightForStyleShowRoomC
                         {parseInt(componentIndex) == FfsComponent.Undershirt ? (
                             <MenuItemButton
                                 onConfirm={async () => {
-                                    await onComponentChange(componentIndex, 'drawable', 0);
-                                    await onComponentChange(componentIndex, 'texture', 25);
+                                    await resetUnderShirt();
+                                    navigate(-1);
                                 }}
                             >{`Retirer l'Undershirt`}</MenuItemButton>
                         ) : (