tipping transaction list entry, integration test and DB simplifications

2 files changed, 7 insertions, 34 deletions

diff --git a/packages/taler-wallet-core/src/types/dbTypes.ts b/packages/taler-wallet-core/src/types/dbTypes.ts
index 3e24f787b..60a427ef2 100644
--- a/packages/taler-wallet-core/src/types/dbTypes.ts
+++ b/packages/taler-wallet-core/src/types/dbTypes.ts
@@ -951,16 +951,6 @@ export interface TipRecord {
   acceptedTimestamp: Timestamp | undefined;
 
   /**
-   * Has the user rejected the tip?
-   */
-  rejectedTimestamp: Timestamp | undefined;
-
-  /**
-   * Have we picked up the tip record from the merchant already?
-   */
-  pickedUp: boolean;
-
-  /**
    * The tipped amount.
    */
   tipAmountRaw: AmountJson;
@@ -970,12 +960,12 @@ export interface TipRecord {
   /**
    * Timestamp, the tip can't be picked up anymore after this deadline.
    */
-  deadline: Timestamp;
+  tipExpiration: Timestamp;
 
   /**
    * The exchange that will sign our coins, chosen by the merchant.
    */
-  exchangeUrl: string;
+  exchangeBaseUrl: string;
 
   /**
    * Base URL of the merchant that is giving us the tip.
@@ -991,12 +981,6 @@ export interface TipRecord {
   denomsSel: DenomSelectionState;
 
   /**
-   * Response if the merchant responded,
-   * undefined otherwise.
-   */
-  response?: TipResponse[];
-
-  /**
    * Tip ID chosen by the wallet.
    */
   walletTipId: string;
@@ -1006,12 +990,13 @@ export interface TipRecord {
    */
   merchantTipId: string;
 
+  createdTimestamp: Timestamp;
+
   /**
-   * URL to go to once the tip has been accepted.
+   * Timestamp for when the wallet finished picking up the tip
+   * from the merchant.
    */
-  nextUrl?: string;
-
-  createdTimestamp: Timestamp;
+  pickedUpTimestamp: Timestamp | undefined;
 
   /**
    * Retry info, even present when the operation isn't active to allow indexing
diff --git a/packages/taler-wallet-core/src/types/transactions.ts b/packages/taler-wallet-core/src/types/transactions.ts
index 1d1eb6490..21d7ee181 100644
--- a/packages/taler-wallet-core/src/types/transactions.ts
+++ b/packages/taler-wallet-core/src/types/transactions.ts
@@ -278,18 +278,6 @@ interface TransactionRefund extends TransactionCommon {
 interface TransactionTip extends TransactionCommon {
   type: TransactionType.Tip;
 
-  // true if the user still needs to accept/decline this tip
-  waiting: boolean;
-
-  // true if the user has accepted this top, false otherwise
-  accepted: boolean;
-
-  // Exchange that the tip will be (or was) withdrawn from
-  exchangeBaseUrl: string;
-
-  // More information about the merchant that sent the tip
-  merchant: any;
-
   // Raw amount of the tip, without extra fees that apply
   amountRaw: AmountString;