From 75df42541b58043a70bdc6001f15cd69943f221f Mon Sep 17 00:00:00 2001
From: kunal528 <jainkunal976@gmail.com>
Date: Sat, 25 Mar 2023 01:41:13 +0530
Subject: [PATCH] metamask integration at last completed at 1:41 pm

---
 MetaMask/Runtime/MetaMaskWallet.cs            | 16 ++---
 .../Samples/Main/Scenes/MetaMaskMain.unity    | 39 ++++++++++++
 MetaMask/Samples/Main/Scripts/MetaMaskDemo.cs | 11 ++--
 MetaMask/Scripts/MetaMaskUnity.cs             |  3 +
 Scenes/MainScene.unity                        | 60 ++++++++++++++++++-
 Scripts/ButtonHandler.cs                      |  5 +-
 Scripts/CameraController.cs                   |  1 +
 Scripts/CounterController.cs                  | 16 +++--
 Scripts/DetailController.cs                   |  1 +
 Scripts/GetContract.cs                        | 15 +++--
 Scripts/PanelController.cs                    | 35 +++++++----
 11 files changed, 165 insertions(+), 37 deletions(-)

diff --git a/MetaMask/Runtime/MetaMaskWallet.cs b/MetaMask/Runtime/MetaMaskWallet.cs
index 0de3992..4c7a207 100644
--- a/MetaMask/Runtime/MetaMaskWallet.cs
+++ b/MetaMask/Runtime/MetaMaskWallet.cs
@@ -606,19 +606,21 @@ protected void OnEthereumEventReceived(JsonElement data)
         protected void OnAccountsChanged(JsonElement accounts)
         {
             MetaMaskDebug.Log("Account changed");
-            try
-            {
+            
                 this.selectedAddress = accounts[0].ToString();
+            MetaMaskDebug.Log(accounts[0]);
+            MetaMaskDebug.Log(accounts);
+            MetaMaskDebug.Log(this.selectedAddress);
                 AccountChanged?.Invoke(this, EventArgs.Empty);
                 if (this.paused)
                 {
                     OnWalletReady();
                 }
-            }
-            catch
-            {
-                this.selectedAddress = string.Empty;
-            }
+            //}
+            //catch
+            //{
+            //    this.selectedAddress = string.Empty;
+            //}
         }
 
         /// <summary>Handles the event that is fired when an Chain ID changed event is received.</summary>
diff --git a/MetaMask/Samples/Main/Scenes/MetaMaskMain.unity b/MetaMask/Samples/Main/Scenes/MetaMaskMain.unity
index c9485d9..4f83fb9 100644
--- a/MetaMask/Samples/Main/Scenes/MetaMaskMain.unity
+++ b/MetaMask/Samples/Main/Scenes/MetaMaskMain.unity
@@ -5280,6 +5280,7 @@ GameObject:
   m_Component:
   - component: {fileID: 990788811}
   - component: {fileID: 990788810}
+  - component: {fileID: 990788812}
   m_Layer: 0
   m_Name: WebSocket Dispatcher
   m_TagString: Untagged
@@ -5314,6 +5315,18 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &990788812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 990788809}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6d84adc1622094a29b4ac495436769e6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1000082875
 GameObject:
   m_ObjectHideFlags: 0
@@ -10972,6 +10985,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1920087936}
   - component: {fileID: 1920087935}
+  - component: {fileID: 1920087937}
   m_Layer: 0
   m_Name: MetaMaskUnityTransportBroadcaster
   m_TagString: Untagged
@@ -11008,6 +11022,18 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1920087937
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1920087934}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6d84adc1622094a29b4ac495436769e6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1979139653
 GameObject:
   m_ObjectHideFlags: 0
@@ -11680,6 +11706,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2036012899}
   - component: {fileID: 2036012898}
+  - component: {fileID: 2036012900}
   m_Layer: 0
   m_Name: MetaMaskUnity
   m_TagString: Untagged
@@ -11716,6 +11743,18 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2036012900
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2036012897}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6d84adc1622094a29b4ac495436769e6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2039765033
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/MetaMask/Samples/Main/Scripts/MetaMaskDemo.cs b/MetaMask/Samples/Main/Scripts/MetaMaskDemo.cs
index bdf4ef8..6dbd01d 100644
--- a/MetaMask/Samples/Main/Scripts/MetaMaskDemo.cs
+++ b/MetaMask/Samples/Main/Scripts/MetaMaskDemo.cs
@@ -13,7 +13,8 @@
 using Nethereum.Contracts;
 using Nethereum.ABI.Model;
 using System.Numerics;
-using Nethereum.Contracts;
+using Nethereum.Util;
+
 
 
 
@@ -88,8 +89,8 @@ public void TransactionResult(object sender, MetaMaskEthereumRequestResultEventA
         /// <summary>Raised when the wallet is connected.</summary>
         private void walletConnected(object sender, EventArgs e)
         {
-            SceneManager.LoadScene("MainScene");
             onWalletConnected?.Invoke(this, EventArgs.Empty);
+            SceneManager.LoadScene("MainScene");
         }
 
         /// <summary>Raised when the wallet is disconnected.</summary>
@@ -203,12 +204,12 @@ public async void GetNFT(string id)
             if (data != null)
             {
                 var owner = await indiCultureNFTConsole.GetOwnerOf(id);
-                NFTData nftData = new NFTData(Int16.Parse(data.TokenId.ToString()), owner, indiCultre.ConvertWei(data.BidAmount), data.Bidder, data.EndTimestamp.ToString() + "000");
+                NFTData nftData = new NFTData(Int16.Parse(data.TokenId.ToString()), owner.ToLower(), indiCultre.ConvertWei(data.BidAmount), data.Bidder.ToLower(), data.EndTimestamp.ToString() + "000");
                 MetaState.nft = nftData;
             }
         }
 
-        public async void Collect(string id)
+        public async void Collect(int id)
         {
             TransactionInput input = new IndiCultre.IndiCultreConsole().Collect(id, MetaMaskUnity.Instance.Wallet.SelectedAddress);
             TransactionData transactionData = new TransactionData(input.To, input.From, input.Data, "0x0");
@@ -221,7 +222,7 @@ public async void Collect(string id)
              await MetaMaskUnity.Instance.Wallet.Request(request);
         }
 
-        public async void Bid(string id, BigInteger amount)
+        public async void Bid(string id,BigDecimal  amount)
         {
             TransactionInput input = new IndiCultre.IndiCultreConsole().Bid(id, MetaMaskUnity.Instance.Wallet.SelectedAddress, amount);
             TransactionData transactionData = new TransactionData(input.To, input.From, input.Data, input.Value.HexValue);
diff --git a/MetaMask/Scripts/MetaMaskUnity.cs b/MetaMask/Scripts/MetaMaskUnity.cs
index eb4780f..33f3e76 100644
--- a/MetaMask/Scripts/MetaMaskUnity.cs
+++ b/MetaMask/Scripts/MetaMaskUnity.cs
@@ -58,6 +58,7 @@ public static MetaMaskUnity Instance
                 if (instance == null)
                 {
                     var instances = FindObjectsOfType<MetaMaskUnity>();
+                    print(instances);
                     if (instances.Length > 1)
                     {
                         Debug.LogError("There are more than 1 instances of " + nameof(MetaMaskUnity) + " inside the scene, there should be only one.");
@@ -191,6 +192,8 @@ public void Initialize(MetaMaskConfig config, IMetaMaskTransport transport, IMet
                 // Load and configure the session
                 LoadSession();
 
+                MetaMaskDebug.Log("Metamask Instanitialize");
+
                 // Setup the wallet
                 this.wallet = new MetaMaskWallet(this.session, transport, socket, this.config.SocketUrl);
                 this.wallet.AnalyticsPlatform = "unity";
diff --git a/Scenes/MainScene.unity b/Scenes/MainScene.unity
index fde3b02..0c32c37 100644
--- a/Scenes/MainScene.unity
+++ b/Scenes/MainScene.unity
@@ -1288,6 +1288,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &166533681
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -1389,6 +1391,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &177512989
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -2059,6 +2063,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &236544194
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -2604,6 +2610,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &287698324
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -3246,6 +3254,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &341972815
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -4400,7 +4410,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 3107459617028279915, guid: 4d70977260a4df64d9088a29dc5ad759, type: 2}
+  - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4999,6 +5009,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &431786744
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -5100,6 +5112,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &443112732
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -6708,6 +6722,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &566356015
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -9747,6 +9763,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!4 &753600592 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 430272, guid: a8af4b644620845289b210a472d4cf80, type: 3}
@@ -9816,6 +9834,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &761562281
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -10348,6 +10368,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &809099391
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -11192,6 +11214,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!1001 &892784754
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13116,7 +13140,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 7998390759824753287, guid: fea538ba0ea812a4aacf1dd48c93ffab, type: 2}
+  - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -14588,6 +14612,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1046970506
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -14689,6 +14715,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1048313269
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -15987,6 +16015,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1180408071
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -18591,6 +18621,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1327659950
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -19353,6 +19385,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1409011437
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -19454,6 +19488,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1411626055
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -19993,6 +20029,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1436108480
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -20094,6 +20132,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1436413227
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -21080,6 +21120,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1542126579
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -21275,6 +21317,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1558056549
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -21376,6 +21420,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1558276253
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -23016,6 +23062,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1693615294
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -24110,6 +24158,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1746023676
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -25626,6 +25676,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1873394699
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -26032,6 +26084,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1918314211
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -26133,6 +26187,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   details: {fileID: 28876496010075788}
   language: english
+  panelOpen: 0
+  timer: 0
 --- !u!23 &1921090930
 MeshRenderer:
   m_ObjectHideFlags: 0
diff --git a/Scripts/ButtonHandler.cs b/Scripts/ButtonHandler.cs
index d8b11c0..95541e9 100644
--- a/Scripts/ButtonHandler.cs
+++ b/Scripts/ButtonHandler.cs
@@ -5,6 +5,7 @@
 using UnityEngine.UI;
 using System;
 using System.Numerics;
+using Nethereum.Util;
 
 public class ButtonHandler : MonoBehaviour
 {
@@ -26,7 +27,7 @@ public void onBidOrWithdraw() {
         if (name == "Bid") {
             inputForm.SetActive(true);
         } else if (name == "Collect") {
-            GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().Collect(MetaState.token_id.ToString());
+            GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().Collect(MetaState.token_id);
 /*#if !UNITY_EDITOR
             Withdraw(MetaState.token_id);
 #endif*/
@@ -41,7 +42,7 @@ public void onBidOrWithdraw() {
     }
 
     public void onBid() {
-        GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().Bid(MetaState.token_id.ToString(), new BigInteger(Double.Parse(MetaState.bid)));
+        GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().Bid(MetaState.token_id.ToString(), new BigDecimal(new Decimal(Double.Parse(MetaState.bid))));
 /*#if !UNITY_EDITOR
         Bid(data);
 #endif*/
diff --git a/Scripts/CameraController.cs b/Scripts/CameraController.cs
index 6b21e7a..e5b1e3f 100644
--- a/Scripts/CameraController.cs
+++ b/Scripts/CameraController.cs
@@ -15,6 +15,7 @@ public class CameraController : MonoBehaviour
 
     private void Start()
     {
+        print(GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().getUser());
         //var arts = GameObject.FindObjectsOfType<ArtController>();
         //string data = "sep=@\nToken Id, Name, Description\n";
         //for (int i = 0; i < arts.Length; i++)
diff --git a/Scripts/CounterController.cs b/Scripts/CounterController.cs
index 8c4b417..54a2d36 100644
--- a/Scripts/CounterController.cs
+++ b/Scripts/CounterController.cs
@@ -16,6 +16,7 @@ private void Start() {
     }
 
     public void ChangeTime(string time, int id) {
+
         System.DateTime epochStart = new System.DateTime(1970, 1, 1, 0, 0, 0, System.DateTimeKind.Utc);
         epochStart = epochStart.ToLocalTime();
         Int64 cur_time = (Int64)((System.DateTime.Now - epochStart).TotalSeconds * 1000);
@@ -48,7 +49,8 @@ public void SetTimer(string value) {
         System.DateTime epochStart = new System.DateTime(1970, 1, 1, 0, 0, 0, System.DateTimeKind.Utc);
         epochStart = epochStart.ToLocalTime();
         Int64 cur_time = (Int64)((System.DateTime.Now - epochStart).TotalSeconds * 1000);
-        if (Int64.Parse(MetaState.nft.end_timestamp) > cur_time && MetaState.nft.owner == MetaState.user)
+        var user = GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().getUser();
+        if (Int64.Parse(MetaState.nft.end_timestamp) > cur_time && MetaState.nft.owner == user)
         {
             button.GetComponentInChildren<TextMeshProUGUI>().text = "Resale";
             button.GetComponent<Button>().interactable = false;
@@ -62,9 +64,11 @@ public void SetTimer(string value) {
 
     public void OnCompleted() {
         SetTimer("Completed");
+        var user = GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().getUser().ToLower();
+        Debug.Log("User" + user);
         System.DateTime epochStart = new System.DateTime(1970, 1, 1, 0, 0, 0, System.DateTimeKind.Utc);
         Int64 cur_time = (Int64)((System.DateTime.Now - epochStart).TotalSeconds * 1000);
-        if (Int64.Parse(MetaState.nft.end_timestamp) < cur_time && MetaState.nft.highest_bidder == MetaState.user && MetaState.nft.owner != MetaState.user)
+        if (Int64.Parse(MetaState.nft.end_timestamp) < cur_time && MetaState.nft.highest_bidder == user && MetaState.nft.owner != user)
         { 
             bidder.GetComponent<TextMeshProUGUI>().text = "Highest Bidder: " + MetaState.nft.highest_bidder;
         }
@@ -73,7 +77,7 @@ public void OnCompleted() {
             bidder.GetComponent<TextMeshProUGUI>().text = "Owner: " + MetaState.nft.owner;
         }
         amount.GetComponent<TextMeshProUGUI>().text = "Sold at: " + MetaState.nft.min_bid + "MATIC";
-        if (Int64.Parse(MetaState.nft.end_timestamp) < cur_time && MetaState.nft.owner == MetaState.user)
+        if (Int64.Parse(MetaState.nft.end_timestamp) < cur_time && MetaState.nft.owner == user && MetaState.nft.highest_bidder == user)
         {
             
             button.GetComponentInChildren<TextMeshProUGUI>().text = "Resale";
@@ -84,7 +88,11 @@ public void OnCompleted() {
             print("Collect");
             button.GetComponentInChildren<TextMeshProUGUI>().text = "Collect";
         }
-        if (MetaState.nft.owner != MetaState.user && MetaState.nft.highest_bidder != MetaState.user) {
+        Debug.Log(MetaState.nft.owner);
+        Debug.Log(MetaState.nft.highest_bidder);
+        Debug.Log(user);
+        Debug.Log(MetaState.nft.owner != user);
+        if (MetaState.nft.owner != user && MetaState.nft.highest_bidder != user) {
             button.SetActive(false);
         }
 
diff --git a/Scripts/DetailController.cs b/Scripts/DetailController.cs
index 1a13dde..d27b684 100644
--- a/Scripts/DetailController.cs
+++ b/Scripts/DetailController.cs
@@ -69,6 +69,7 @@ void Update()
             amount.SetActive(true);
             owner.SetActive(true);
             bid.SetActive(true);
+            print(GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().getUser());
             timer.GetComponent<CounterController>().ChangeTime(MetaState.nft.end_timestamp, MetaState.nft.id);
         }
 
diff --git a/Scripts/GetContract.cs b/Scripts/GetContract.cs
index 421673a..42ef8fa 100644
--- a/Scripts/GetContract.cs
+++ b/Scripts/GetContract.cs
@@ -11,6 +11,7 @@
 using Nethereum.Contracts;
 using Nethereum.Contracts.Extensions;
 using System.Numerics;
+using System;
 using Nethereum.RPC.Eth.DTOs;
 using Nethereum.Hex.HexTypes;
 using System.Threading.Tasks;
@@ -48,24 +49,26 @@ public string ConvertWei(BigInteger value)
             return Web3.Convert.FromWei(value).ToString();
         }
 
-        public TransactionInput Collect(string id, string account)
+        public TransactionInput Collect(int id, string account)
         {
+            
             var contract = new ContractBuilder(ABI, ADDRESS);
-            var contractHandler = contract.GetFunctionBuilder("collect").CreateTransactionInput(account,new string[] { id});
+            var contractHandler = contract.GetFunctionBuilder("collect").CreateTransactionInput(account, new object[] { id });
             return contractHandler;
         }
 
-        public TransactionInput Bid(string id, string account, BigInteger bid)
+        public TransactionInput Bid(string id, string account, BigDecimal bid)
         {
+            Debug.Log("Bid: " + bid);
             var contract = new ContractBuilder(ABI, ADDRESS);
-            var contractHandler = contract.GetFunctionBuilder("bid").CreateTransactionInput(account,new HexBigInteger(new BigInteger(0)),new HexBigInteger(Web3.Convert.ToWei(bid)), new string[] { id });
+            var contractHandler = contract.GetFunctionBuilder("bid").CreateTransactionInput(account,new HexBigInteger(new BigInteger(0)),new HexBigInteger(Web3.Convert.ToWei(bid)), new object[] { ((int)Int64.Parse(id)) });
             return contractHandler;
         }
 
         public TransactionInput Resale(string id, string account)
         {
             var contract = new ContractBuilder(ABI, ADDRESS);
-            var contractHandler = contract.GetFunctionBuilder("startAuction").CreateTransactionInput(account, new string[] { id });
+            var contractHandler = contract.GetFunctionBuilder("startAuction").CreateTransactionInput(account, new object[] { ((int)Int64.Parse(id)) });
             return contractHandler;
         }
 
@@ -330,7 +333,7 @@ public async Task<string> GetOwnerOf(string tokenId)
         public TransactionInput approve(string id, string from)
         {
             var contract = new ContractBuilder(ABI, ADDRESS);
-            var contractHandler = contract.GetFunctionBuilder("approve").CreateTransactionInput(from, new string[] { new IndiCultre.IndiCultreConsole().ADDRESS, id });
+            var contractHandler = contract.GetFunctionBuilder("approve").CreateTransactionInput(from, new object[] { new IndiCultre.IndiCultreConsole().ADDRESS,  ((int)Int64.Parse(id))});
             return contractHandler;
         }
 
diff --git a/Scripts/PanelController.cs b/Scripts/PanelController.cs
index c5fe7b2..2d524b4 100644
--- a/Scripts/PanelController.cs
+++ b/Scripts/PanelController.cs
@@ -12,6 +12,8 @@ public class PanelController : MonoBehaviour
 
     public bool panelOpen = false;
 
+    public double timer = 0f;
+
 
     // Start is called before the first frame update
     void Start()
@@ -27,24 +29,33 @@ void OnEnable()
         MetaState.token_id = token_id;
     }
 
-    private void OnDisable() { 
-        MetaState.token_id = 0;
+    private void OnDisable() {
     }
 
 
     private void Update()
     {
-        if (!panelOpen)
+        if (timer > 0f)
+        {
+            timer = timer - Time.deltaTime;
+        }
+        if (panelOpen && timer <= 0f)
         {
-            StopCoroutine("gettingData");
+            print("Token ID is");
+            var token_id = gameObject.GetComponentInParent<ArtController>().token_id;
+            print(token_id);
+            GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().GetNFT(token_id.ToString());
+            timer = 10f;
+        }
+        if (gameObject.active)
+        {
+            panelOpen = true;
         }
         if (Input.GetKeyDown(KeyCode.B) && gameObject.active)
         {
             Debug.Log("Popup");
-            
-            var token_id = gameObject.GetComponentInParent<ArtController>().token_id;
-            StartCoroutine(gettingData(token_id.ToString()));
             panelOpen = true;
+            Debug.Log("Opening the Panel " + panelOpen);
             details.SetActive(true);
         }
         if (Input.GetKeyDown(KeyCode.L) && gameObject.active)
@@ -78,15 +89,17 @@ public void ChangeLanguage(string _language)
         language = _language;
     }
 
-    IEnumerator gettingData(string tokenId)
+    /*IEnumerator gettingData(string tokenId)
     {
 
-            GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().GetNFT(tokenId);
+        GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().GetNFT(tokenId);
+        Debug.Log("Starting Getting the Data");
         while(true)
         {
+            Debug.Log("Reload of Data");
             yield return new WaitForSeconds(10);
             GameObject.FindObjectOfType<MetaMask.Unity.Samples.MetaMaskDemo>().GetNFT(tokenId);
-        }
-    }
+        } x
+    }*/
     
 }