taler-typescript-core

commit 1264a1eec55e33b2dac1756c54367f71b736ad17
parent a8ef7c091130faac479f4657be8197925275be1b
Author: Florian Dold <florian@dold.me>
Date:   Tue, 17 Feb 2026 18:03:42 +0100

merge kyc and kyc-merge states

Both are the same for the UI

Diffstat:
M
packages/taler-harness/src/integrationtests/test-kyc-peer-pull.ts
 | 
2
+-
M
packages/taler-harness/src/integrationtests/test-kyc-peer-push.ts
 | 
2
+-
M
packages/taler-harness/src/integrationtests/test-tops-peer.ts
 | 
2
+-
M
packages/taler-util/src/types-taler-wallet-transactions.ts
 | 
1
-
M
packages/taler-wallet-core/src/pay-peer-pull-credit.ts
 | 
4
++--
M
packages/taler-wallet-core/src/pay-peer-push-credit.ts
 | 
4
++--

6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-peer-pull.ts b/packages/taler-harness/src/integrationtests/test-kyc-peer-pull.ts
@@ -179,7 +179,7 @@ async function doPeerPullCredit(
     transactionId: initRet.transactionId,
     txState: {
       major: TransactionMajorState.Pending,
-      minor: TransactionMinorState.MergeKycRequired,
+      minor: TransactionMinorState.KycRequired,
     },
   });
 
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-peer-push.ts b/packages/taler-harness/src/integrationtests/test-kyc-peer-push.ts
@@ -101,7 +101,7 @@ export async function runKycPeerPushTest(t: GlobalTestState) {
     transactionId: prepRes.transactionId,
     txState: {
       major: TransactionMajorState.Pending,
-      minor: TransactionMinorState.MergeKycRequired,
+      minor: TransactionMinorState.KycRequired,
     },
   });
 
diff --git a/packages/taler-harness/src/integrationtests/test-tops-peer.ts b/packages/taler-harness/src/integrationtests/test-tops-peer.ts
@@ -121,7 +121,7 @@ export async function runTopsPeerTest(t: GlobalTestState) {
     timeout: { seconds: 10 },
     txState: {
       major: TransactionMajorState.Pending,
-      minor: TransactionMinorState.MergeKycRequired,
+      minor: TransactionMinorState.KycRequired,
     },
   });
 
diff --git a/packages/taler-util/src/types-taler-wallet-transactions.ts b/packages/taler-util/src/types-taler-wallet-transactions.ts
@@ -222,7 +222,6 @@ export enum TransactionMinorState {
   KycRequired = "kyc",
   MerchantOrderProposed = "merchant-order-proposed",
   Merge = "merge",
-  MergeKycRequired = "merge-kyc",
   PaidByOther = "paid-by-other",
   Proposed = "proposed",
   Ready = "ready",
diff --git a/packages/taler-wallet-core/src/pay-peer-pull-credit.ts b/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
@@ -1174,7 +1174,7 @@ export function computePeerPullCreditTransactionState(
       if (pullCreditRecord.kycAccessToken != null) {
         return {
           major: TransactionMajorState.Pending,
-          minor: TransactionMinorState.MergeKycRequired,
+          minor: TransactionMinorState.KycRequired,
         };
       } else {
         return {
@@ -1186,7 +1186,7 @@ export function computePeerPullCreditTransactionState(
       if (pullCreditRecord.kycAccessToken != null) {
         return {
           major: TransactionMajorState.Suspended,
-          minor: TransactionMinorState.MergeKycRequired,
+          minor: TransactionMinorState.KycRequired,
         };
       } else {
         return {
diff --git a/packages/taler-wallet-core/src/pay-peer-push-credit.ts b/packages/taler-wallet-core/src/pay-peer-push-credit.ts
@@ -1234,7 +1234,7 @@ export function computePeerPushCreditTransactionState(
       if (pushCreditRecord.kycAccessToken) {
         return {
           major: TransactionMajorState.Pending,
-          minor: TransactionMinorState.MergeKycRequired,
+          minor: TransactionMinorState.KycRequired,
         };
       } else {
         return {
@@ -1246,7 +1246,7 @@ export function computePeerPushCreditTransactionState(
       if (pushCreditRecord.kycAccessToken) {
         return {
           major: TransactionMajorState.Suspended,
-          minor: TransactionMinorState.MergeKycRequired,
+          minor: TransactionMinorState.KycRequired,
         };
       } else {
         return {