From 883e266a9b55d6cb0932af121354df5edf5760d8 Mon Sep 17 00:00:00 2001
From: Taavi <97351942+Taavi-AU@users.noreply.github.com>
Date: Mon, 7 Nov 2022 19:33:05 +0800
Subject: [PATCH] context implementation

---
 [esx_addons]/esx_clotheshop/client/main.lua | 49 +++++++++------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/[esx_addons]/esx_clotheshop/client/main.lua b/[esx_addons]/esx_clotheshop/client/main.lua
index 6acbb22e..4cff1f30 100644
--- a/[esx_addons]/esx_clotheshop/client/main.lua
+++ b/[esx_addons]/esx_clotheshop/client/main.lua
@@ -8,16 +8,14 @@ function OpenShopMenu()
 	TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu)
 		menu.close()
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', {
-			title = TranslateCap('valid_this_purchase'),
-			align = 'top-left',
-			elements = {
-				{label = TranslateCap('no'), value = 'no'},
-				{label = TranslateCap('yes'), value = 'yes'}
-		}}, function(data, menu)
-			menu.close()
+		local elements = {
+			{unselectable = true, icon = "fas fa-check-double", title = TranslateCap("valid_this_purchase")},
+			{icon = "fas fa-check-circle", title = TranslateCap("yes"), value = "yes"},
+			{icon = "fas fa-window-close", title = TranslateCap("no"), value = "no"},
+		}
 
-			if data.current.value == 'yes' then
+		ESX.OpenContext("right", elements, function(menu,element)
+			if element.value == "yes" then
 				ESX.TriggerServerCallback('esx_clotheshop:buyClothes', function(bought)
 					if bought then
 						TriggerEvent('skinchanger:getSkin', function(skin)
@@ -25,56 +23,53 @@ function OpenShopMenu()
 						end)
 
 						hasPaid = true
-
 						ESX.TriggerServerCallback('esx_clotheshop:checkPropertyDataStore', function(foundStore)
 							if foundStore then
-								ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'save_dressing', {
-									title = TranslateCap('save_in_dressing'),
-									align = 'top-left',
-									elements = {
-										{label = TranslateCap('no'),  value = 'no'},
-										{label = TranslateCap('yes'), value = 'yes'}
-								}}, function(data2, menu2)
-									menu2.close()
+								local elements2 = {
+									{unselectable = true, icon = "fas fa-check-double", title = TranslateCap('save_in_dressing')},
+									{icon = "fas fa-check-circle", title = TranslateCap("yes"), value = "yes"},
+									{icon = "fas fa-window-close", title = TranslateCap("no"), value = "no"},
+								}
 
-									if data2.current.value == 'yes' then
+								ESX.OpenContext("right", elements2, function(menu2,element2)
+									if element2.value == "yes" then
 										ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'outfit_name', {
 											title = TranslateCap('name_outfit')
 										}, function(data3, menu3)
 											menu3.close()
 
 											TriggerEvent('skinchanger:getSkin', function(skin)
+												ESX.CloseContext()
 												TriggerServerEvent('esx_clotheshop:saveOutfit', data3.value, skin)
 												ESX.ShowNotification(TranslateCap('saved_outfit'))
 											end)
 										end, function(data3, menu3)
 											menu3.close()
 										end)
+									elseif element2.value == "no" then
+										ESX.CloseContext()
 									end
 								end)
 							end
 						end)
-
 					else
+						ESX.CloseContext()
 						ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
 							TriggerEvent('skinchanger:loadSkin', skin)
 						end)
-
 						ESX.ShowNotification(TranslateCap('not_enough_money'))
 					end
 				end)
-			elseif data.current.value == 'no' then
+			elseif element.value == "no" then
 				ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
 					TriggerEvent('skinchanger:loadSkin', skin)
 				end)
+				ESX.CloseContext()
 			end
-
 			currentAction     = 'shop_menu'
 			currentActionMsg  = TranslateCap('press_menu')
 			currentActionData = {}
-		end, function(data, menu)
-			menu.close()
-
+		end, function(menu)
 			currentAction     = 'shop_menu'
 			currentActionMsg  = TranslateCap('press_menu')
 			currentActionData = {}
@@ -107,7 +102,7 @@ AddEventHandler('esx_clotheshop:hasEnteredMarker', function(zone)
 end)
 
 AddEventHandler('esx_clotheshop:hasExitedMarker', function(zone)
-	ESX.UI.Menu.CloseAll()
+	ESX.CloseContext()
 	currentAction = nil
 
 	if not hasPaid then