chore: merge conflict fixes

Author: aorumbayev

.github/workflows/api_clients_ci.yml

@@ -120,8 +120,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-          cache: 'poetry'
-          cache-dependency-path: 'api/api_clients/python/pyproject.toml'
 
       - name: Test Python client
         working-directory: api/api_clients/python

api/oas_templates/python/custom_tests/test_transactions.mustache

@@ -14,12 +14,11 @@ from algorand_algod_client.api.algod_api import AlgodApi
 from algorand_algod_client.exceptions import ApiException
 from algorand_algod_client.models.transaction_params200_response import TransactionParams200Response
 from algokit_transact import (
-    TransactionHeader,
     encode_transaction,
-    PayTransactionFields,
     TransactionType,
     attach_signature,
     Transaction,
+    PaymentTransactionFields,
     Address,
 )
 
@@ -59,16 +58,15 @@ def create_test_transaction(
         bytes: Signed transaction
     """
     txn = Transaction(
-        header=TransactionHeader(
-            transaction_type=TransactionType.PAYMENT,
-            fee=params.min_fee,
-            first_valid=params.last_round,
-            last_valid=params.last_round + 1000,
-            sender=Address(address=sender.address, pub_key=sender.public_key),
-            genesis_hash=base64.b64decode(params.genesis_hash),
-            genesis_id=params.genesis_id,
-        ),
-        pay_fields=PayTransactionFields(
+
+        transaction_type=TransactionType.PAYMENT,
+        fee=params.min_fee,
+        first_valid=params.last_round,
+        last_valid=params.last_round + 1000,
+        sender=Address(address=sender.address, pub_key=sender.public_key),
+        genesis_hash=base64.b64decode(params.genesis_hash),
+        genesis_id=params.genesis_id,
+        payment=PaymentTransactionFields(
             amount=int(1e6),
             receiver=Address(address=receiver.address, pub_key=receiver.public_key)
         ),

api/oas_templates/typescript/custom_tests/transactions.test.mustache

@@ -24,16 +24,14 @@ const createSignedTxnHttpFile = (
   }
 
   const txn: Transaction = {
-    header: {
-      transactionType: 'Payment',
-      ...transactionHeaderParams,
-      sender: { address: String(sender.addr), pubKey: sender.publicKey },
-      note: note,
-    },
-    payFields: {
+    transactionType: 'Payment',
+    payment: {
       amount: BigInt(amount),
       receiver: receiver,
-    }
+    },
+    sender: { address: String(sender.addr), pubKey: sender.publicKey },
+    note: note,
+    ...transactionHeaderParams,
   };
 
   const encodedTxn = encodeTransaction(txn);