new UniTask instead of task

Assets/Scripts/InteractableObjects/BaseInteractableObject.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
 using System.Linq;
-using System.Threading.Tasks;
 using UnityEngine;
 
 public abstract class BaseInteractableObject : MonoBehaviour
@@ -31,7 +31,7 @@ public abstract class BaseInteractableObject : MonoBehaviour
         };
     }
 
-    public async Task<InteractionStatus> ShowPopupMenu(Player player)
+    public async UniTask<InteractionStatus> ShowPopupMenu(Player player)
     {
         _player = player;
         PrepareMenuActions();

Assets/Scripts/Interfaces/IStat.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Assets.Scripts.Interfaces
+namespace Assets.Scripts.Interfaces
 {
     public interface IStat
     {

Assets/Scripts/Player/Player.cs

@@ -117,7 +117,7 @@ public class Player : BaseCharacter
     {
         containerItem.transform.parent = _holdPoint;
         containerItem.transform.localPosition = Vector3.zero;
-        _containerItem = containerItem;
+        //_containerItem = containerItem;
     }
     public ContainerItem GetContainerItem()
     {

Assets/Scripts/UIElements/RadialMenuItem.cs

@@ -1,6 +1,6 @@
+using Cysharp.Threading.Tasks;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -10,10 +10,10 @@ public class RadialMenuItem : MonoBehaviour
     [SerializeField]
     private Button _radialMenuItemPrefab;
     private Dictionary<RadialMenuActions, RadialMenuActionDescription> _actions;
-    TaskCompletionSource<RadialMenuActions> tcs = new TaskCompletionSource<RadialMenuActions>();
+    UniTaskCompletionSource<RadialMenuActions> tcs = new UniTaskCompletionSource<RadialMenuActions>();
 
 
-    public Task<RadialMenuActions> ShowButtons(RadialMenuItem popupMenu, Dictionary<RadialMenuActions, RadialMenuActionDescription> actions)
+    public UniTask<RadialMenuActions> ShowButtons(RadialMenuItem popupMenu, Dictionary<RadialMenuActions, RadialMenuActionDescription> actions)
     {
 
         _actions = actions;
@@ -42,13 +42,14 @@ public class RadialMenuItem : MonoBehaviour
     {
         b.onClick.AddListener(() =>
         {
-            tcs.SetResult(_actions.ElementAt(buttonNumber).Key);
+            tcs.TrySetResult(_actions.ElementAt(buttonNumber).Key);
             Close();
         });
     }
 
     public void CancelAndClose()
     {
+        tcs.TrySetCanceled();
         Close();
     }
 

Assets/Scripts/UIElements/UISystem.cs

@@ -1,6 +1,6 @@
+using Cysharp.Threading.Tasks;
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using UnityEngine;
 
 public class UISystem : MonoBehaviour
@@ -33,7 +33,7 @@ public class UISystem : MonoBehaviour
         jobSelector.ShowJobSelectionDialog(title,  onCancel, onConfirm);
     }
 
-    public async Task<RadialMenuActions> ShowItemPopupMenu(Dictionary<RadialMenuActions, RadialMenuActionDescription> actions)
+    public async UniTask<RadialMenuActions> ShowItemPopupMenu(Dictionary<RadialMenuActions, RadialMenuActionDescription> actions)
     {
         _popupMenu = Instantiate(_radialMenuItemPrefab);
         _popupMenu.transform.transform.SetParent(transform, false);