Merge branch 'dev' into nikola/countly-issues

Author: kantagara

Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll

@@ -0,0 +1,106 @@
+using UnityEngine;
+using TMPro;
+using System.IO;
+using System.Threading.Tasks;
+using ChainSafe.Gaming.UnityPackage;
+using ChainSafe.GamingSdk.Web3Auth;
+using UnityEngine.UI;
+
+public class Web3AuthCustomNftManager : MonoBehaviour
+{
+    #region Fields
+        
+    [SerializeField] private GameObject customNftPlaceHolder;
+    [SerializeField] private GameObject customNftDisplayParent;
+    [SerializeField] private GameObject customNftDisplay;
+    [SerializeField] private GameObject addCustomNftMenu;
+    [SerializeField] private TMP_InputField customNftAddressInput;
+    [SerializeField] private TMP_InputField customNftSymbolInput;
+    [SerializeField] private TMP_InputField customNftIdInput;
+    [SerializeField] private TextMeshProUGUI customNftAmountText;
+    [SerializeField] private TextMeshProUGUI customNftSymbolText;
+    [SerializeField] private Button addNftsMenuButton;
+    [SerializeField] private Button closeAddNftMenuButton;
+    [SerializeField] private Button addNftButton;
+    private string customNftContract;
+
+    #endregion
+
+    #region Methods
+
+    /// <summary>
+    /// Initializes objects.
+    /// </summary>
+    private void Awake()
+    {
+        addNftButton.onClick.AddListener(AddNft);
+        addNftsMenuButton.onClick.AddListener(ToggleAddNftMenuButton);
+        closeAddNftMenuButton.onClick.AddListener(ToggleAddNftMenuButton);
+        SetNfts();
+    }
+    
+    /// <summary>
+    /// Sets custom nft displays.
+    /// </summary>
+    private async void SetNfts()
+    {
+        if (File.Exists(Path.Combine(Application.persistentDataPath, "customNft.txt")))
+        {
+            var customTokenData = File.ReadAllText(Path.Combine(Application.persistentDataPath, "customNft.txt"));
+            var data = customTokenData.Split(",");
+            customNftPlaceHolder.SetActive(false);
+            customNftContract = data[0];
+            customNftSymbolText.text = data[1].ToUpper();
+            var balance = await Web3Unity.Web3.Erc1155.GetBalanceOf(customNftContract, data[2]);
+            customNftAmountText.text = balance.ToString();
+            customNftDisplay.SetActive(true);
+        }
+        else
+        {
+            customNftDisplay.SetActive(false);
+        }
+    }
+    
+    /// <summary>
+    /// Toggles the add nft menu.
+    /// </summary>
+    private void ToggleAddNftMenuButton()
+    {
+        addCustomNftMenu.SetActive(!addCustomNftMenu.activeSelf);
+    }
+
+    /// <summary>
+    /// Adds a custom nft to the wallet.
+    /// </summary>
+    private void AddNft()
+    {
+        if (customNftAddressInput.text.Length != 42) return;
+        File.WriteAllText(Path.Combine(Application.persistentDataPath, "customNft.txt"), $"{customNftAddressInput.text},{customNftSymbolInput.text},{customNftIdInput.text}");
+        customNftSymbolText.text = customNftSymbolInput.text.ToUpper();
+        ToggleAddNftMenuButton();
+        customNftPlaceHolder.SetActive(false);
+        customNftDisplay.SetActive(true);
+        customNftAddressInput.text = string.Empty;
+        customNftSymbolInput.text = string.Empty;
+        customNftIdInput.text = string.Empty;
+        SetNfts();
+    }
+
+    /// <summary>
+    /// Subscribes to events.
+    /// </summary>
+    private void OnEnable()
+    {
+        Web3AuthEventManager.SetTokens += SetNfts;
+    }
+
+    /// <summary>
+    /// Unsubscribes from events.
+    /// </summary>
+    private void OnDisable()
+    {
+        Web3AuthEventManager.SetTokens -= SetNfts;
+    }
+
+    #endregion
+}

Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll

@@ -9,7 +9,6 @@
 using ChainSafe.Gaming.UnityPackage;
 using ChainSafe.Gaming.Web3;
 using ChainSafe.GamingSdk.Web3Auth;
-using Scripts.EVM.Token;
 using UnityEngine.UI;
 
 /// <summary>
@@ -20,7 +19,9 @@ public class Web3AuthWalletGUITokenManager : MonoBehaviour
     #region Fields
 
     [SerializeField] private GameObject customTokenPlaceHolder;
-    [SerializeField] private GameObject customTokenDisplay;
+    [SerializeField] private GameObject customTokenDisplayErc20Parent;
+    [SerializeField] private GameObject customNftDisplayParent;
+    [SerializeField] private GameObject customTokenDisplayErc20;
     [SerializeField] private GameObject transferTokensContainer;
     [SerializeField] private GameObject addCustomTokensMenu;
     [SerializeField] private TMP_Dropdown selectedTokenToTransfer;
@@ -38,10 +39,12 @@ public class Web3AuthWalletGUITokenManager : MonoBehaviour
     [SerializeField] private Button transferTokensMenuButton;
     [SerializeField] private Button closeTransferTokensButton;
     [SerializeField] private Button transferTokensButton;
+    [SerializeField] private Button toggleCustomTokensButton;
     private Task<string> symbolTask;
     private bool isSymbolTaskRunning;
     private string lastCheckedAddress;
     private string customTokenContract;
+    private string customNftContract;
 
     #endregion
 
@@ -58,6 +61,7 @@ private void Awake()
         transferTokensMenuButton.onClick.AddListener(ToggleTransferTokensMenuButton);
         closeTransferTokensButton.onClick.AddListener(ToggleTransferTokensMenuButton);
         transferTokensButton.onClick.AddListener(TransferTokens);
+        toggleCustomTokensButton.onClick.AddListener(ToggleCustomTokenMenu);
         SetTokens();
     }
 
@@ -76,11 +80,11 @@ private async void SetTokens()
             var balance = await Web3Unity.Web3.Erc20.GetBalanceOf(customTokenContract, Web3Unity.Web3.Signer.PublicAddress);
             var customTokenValue = (decimal)balance / (decimal)BigInteger.Pow(10, 18);
             customTokenAmountText.text = customTokenValue.ToString("N18");
-            customTokenDisplay.SetActive(true);
+            customTokenDisplayErc20.SetActive(true);
         }
         else
         {
-            customTokenDisplay.SetActive(false);
+            customTokenDisplayErc20.SetActive(false);
         }
         // Set native token
         nativeTokenSymbolText.text = Web3Unity.Web3.ChainConfig.NativeCurrency.Symbol.ToUpper();
@@ -97,10 +101,6 @@ private async void SetTokens()
     private void ToggleAddTokensMenuButton()
     {
         addCustomTokensMenu.SetActive(!addCustomTokensMenu.activeSelf);
-        if (addCustomTokensMenu.activeSelf)
-        {
-            addTokenButton.gameObject.SetActive(false);
-        }
     }
 
     /// <summary>
@@ -129,6 +129,15 @@ private async void GetSymbol()
         }
     }
 
+    /// <summary>
+    /// Toggles the custom token type menus.
+    /// </summary>
+    private void ToggleCustomTokenMenu()
+    {
+        customTokenDisplayErc20Parent.SetActive(!customTokenDisplayErc20Parent.activeSelf);
+        customNftDisplayParent.SetActive(!customNftDisplayParent.activeSelf);
+    }
+
     /// <summary>
     /// Adds a custom token to the wallet.
     /// </summary>
@@ -139,7 +148,7 @@ private void AddToken()
         customTokenSymbolText.text = customTokenSymbolInput.text.ToUpper();
         ToggleAddTokensMenuButton();
         customTokenPlaceHolder.SetActive(false);
-        customTokenDisplay.SetActive(true);
+        customTokenDisplayErc20.SetActive(true);
         customTokenAddressInput.text = string.Empty;
         customTokenSymbolInput.text = string.Empty;
         SetTokens();