fix: send transaction with confirmation hash, e2e tests

Author: nattb8

.gitignore

@@ -107,4 +107,6 @@ sample/Assets/Vuplex*
 
 __pycache__/
 *.pyc
-.pytest_cache/
+.pytest_cache/
+
+xcuserdata/

sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs

@@ -70,7 +70,7 @@ private async UniTaskVoid SendTransactionAsync()
             if (ConfirmToggle != null && ConfirmToggle.isOn)
             {
                 TransactionReceiptResponse response = await SampleAppManager.PassportInstance.ZkEvmSendTransactionWithConfirmation(request);
-                ShowOutput($"Transaction hash: {response.transactionHash}\nStatus: {GetTransactionStatusString(response.status)}");
+                ShowOutput($"Transaction hash: {response.hash}\nStatus: {GetTransactionStatusString(response.status)}");
             }
             else
             {

sample/Tests/test/test.py

@@ -93,6 +93,7 @@ def test_2_imx_functions(self):
 
         # Connect to IMX
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         text = output.get_text()
         print(f"ConnectBtn output: {text}")
         self.assertEqual("Connected to IMX", text)

sample/Tests/test/test_android.py

@@ -142,6 +142,7 @@ def test_6_pkce_relogin(self):
 
         # Click Connect to IMX button
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         self.assertEqual("Connected to IMX", output.get_text())
 
         self.altdriver.stop()

sample/Tests/test/test_mac.py

@@ -185,6 +185,7 @@ def test_6_device_code_relogin(self):
 
         # Click Connect to IMX button
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         self.assertEqual("Connected to IMX", output.get_text())
 
         self.altdriver.stop()

sample/Tests/test/test_windows.py

@@ -128,6 +128,7 @@ def test_6_relogin(self):
 
         # Click Connect to IMX button
         self.get_altdriver().find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         self.assertEqual("Connected to IMX", output.get_text())
 
     def test_7_reconnect_device_code_connect_imx(self):

sample/Tests/test/test_windows_helpers.py

@@ -57,11 +57,29 @@ def login(use_pkce: bool):
     # Get all window handles
     all_windows = driver.window_handles
 
-    print("Find the new window")
-    new_window = [window for window in all_windows if window != driver.current_window_handle][0]
+    print(f"Found {len(all_windows)} new windows to check: {all_windows}")
+
+    # Find the window with email input
+    target_window = None
+    for window in all_windows:
+        try:
+            print(f"Checking window: {window}")
+            driver.switch_to.window(window)
+            driver.find_element(By.ID, ':r1:')
+            target_window = window
+            print(f"Found email input in window: {window}")
+            break
+        except:
+            print(f"Email input not found in window: {window}, trying next...")
+            continue
+
+    if not target_window:
+        print("Could not find email input field in any window!")
+        driver.quit()
+        return
 
-    print("Switch to the new window")
-    driver.switch_to.window(new_window)
+    print("Switch to the target window")
+    driver.switch_to.window(target_window)
 
     wait = WebDriverWait(driver, 60)
 
@@ -133,8 +151,9 @@ def bring_sample_app_to_foreground():
 
     command = [
         "powershell.exe",
-        "-Command",
-        f"Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process; & '{powershell_script_path}' -appName '{product_name}'"
+        "-ExecutionPolicy", "Bypass",
+        "-File", powershell_script_path,
+        "-appName", product_name
     ]
 
     subprocess.run(command, check=True)

src/Packages/Passport/Runtime/Scripts/Private/Model/Response/TransactionReceiptResponse.cs

@@ -34,7 +34,7 @@ public class TransactionReceiptResponse
 
         public string to;
 
-        public string transactionHash;
+        public string hash;
 
         public string transactionIndex;
 

src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs

@@ -753,8 +753,8 @@ public async UniTask<string> ZkEvmSendTransaction(TransactionRequest request)
 
         public async UniTask<TransactionReceiptResponse> ZkEvmSendTransactionWithConfirmation(TransactionRequest request)
         {
-            string json = SerialiseTransactionRequest(request);
-            string callResponse = await communicationsManager.Call(PassportFunction.ZK_EVM.SEND_TRANSACTION_WITH_CONFIRMATION, json);
+            var json = SerialiseTransactionRequest(request);
+            var callResponse = await communicationsManager.Call(PassportFunction.ZK_EVM.SEND_TRANSACTION_WITH_CONFIRMATION, json);
             return callResponse.OptDeserializeObject<TransactionReceiptResponse>();
         }
 

src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs

@@ -70,7 +70,7 @@ private async UniTaskVoid SendTransactionAsync()
             if (ConfirmToggle != null && ConfirmToggle.isOn)
             {
                 TransactionReceiptResponse response = await SampleAppManager.PassportInstance.ZkEvmSendTransactionWithConfirmation(request);
-                ShowOutput($"Transaction hash: {response.transactionHash}\nStatus: {GetTransactionStatusString(response.status)}");
+                ShowOutput($"Transaction hash: {response.hash}\nStatus: {GetTransactionStatusString(response.status)}");
             }
             else
             {