taler-typescript-core

commit 8f0e2ca8eb70560a8616b8f1b9407738099825e3
parent 4f55f3f224ff5683c54e010364fc28afa3029c8f
Author: Sebastian <sebasjm@gmail.com>
Date:   Mon, 23 Sep 2024 16:24:33 -0300

add missing refactor

Diffstat:
M
packages/merchant-backoffice-ui/src/paths/instance/kyc/list/ListPage.tsx
 | 
4
----
M
packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit.ts
 | 
8
++++----

2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/ListPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/ListPage.tsx
@@ -75,13 +75,9 @@ export function ListPage({
   );
 }
 interface PendingTableProps {
-<<<<<<< HEAD
-  entries: TalerMerchantApi.LegacyMerchantAccountKycRedirect[];
-=======
   entries: TalerMerchantApi.MerchantAccountKycRedirect[];
   // onGetInfo: (url: string, token: AccessToken) => void;
   onShowInstructions: (toAccounts: string[], fromAccount: string) => void;
->>>>>>> 452d4eb69 (show instructions on how to complete kyc auth)
 }
 
 interface TimedOutTableProps {
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit.ts b/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit.ts
@@ -18,8 +18,8 @@
  * Imports.
  */
 import {
+  codecForAccountKycRedirects,
   codecForKycProcessClientInformation,
-  codecForMerchantAccountKycRedirectsResponse,
   codecForQueryInstancesResponse,
   Duration,
   encodeCrock,
@@ -313,7 +313,7 @@ export async function runKycMerchantDepositTest(t: GlobalTestState) {
     if (resp.status === 200) {
       kycRespOne = await readSuccessResponseJsonOrThrow(
         resp,
-        codecForMerchantAccountKycRedirectsResponse(),
+        codecForAccountKycRedirects(),
       );
       break;
     }
@@ -347,7 +347,7 @@ export async function runKycMerchantDepositTest(t: GlobalTestState) {
     t.assertDeepEqual(resp.status, 200);
     const parsedResp = await readSuccessResponseJsonOrThrow(
       resp,
-      codecForMerchantAccountKycRedirectsResponse(),
+      codecForAccountKycRedirects(),
     );
     logger.info(`kyc resp 2: ${j2s(parsedResp)}`);
     if (parsedResp.kyc_data[0].payto_kycauths == null) {
@@ -381,7 +381,7 @@ export async function runKycMerchantDepositTest(t: GlobalTestState) {
     t.assertDeepEqual(resp.status, 200);
     const parsedResp = await readSuccessResponseJsonOrThrow(
       resp,
-      codecForMerchantAccountKycRedirectsResponse(),
+      codecForAccountKycRedirects(),
     );
     logger.info(`kyc resp 3: ${j2s(parsedResp)}`);
     if ((parsedResp.kyc_data[0].limits?.length ?? 0) == 0) {