Merge branch 'master' into age-withdraw

1 files changed, 5 insertions, 5 deletions

diff --git a/packages/taler-util/src/taleruri.ts b/packages/taler-util/src/taleruri.ts
index fff1ca833..310986eaf 100644
--- a/packages/taler-util/src/taleruri.ts
+++ b/packages/taler-util/src/taleruri.ts
@@ -63,7 +63,7 @@ export interface RefundUriResult {
 export interface RewardUriResult {
   type: TalerUriAction.Reward;
   merchantBaseUrl: string;
-  merchantTipId: string;
+  merchantRewardId: string;
 }
 
 export interface ExchangeUri {
@@ -408,7 +408,7 @@ export function parseRewardUri(s: string): RewardUriResult | undefined {
     return undefined;
   }
   const host = parts[0].toLowerCase();
-  const tipId = parts[parts.length - 1];
+  const rewardId = parts[parts.length - 1];
   const pathSegments = parts.slice(1, parts.length - 1);
   const hostAndSegments = [host, ...pathSegments].join("/");
   const merchantBaseUrl = canonicalizeBaseUrl(
@@ -418,7 +418,7 @@ export function parseRewardUri(s: string): RewardUriResult | undefined {
   return {
     type: TalerUriAction.Reward,
     merchantBaseUrl,
-    merchantTipId: tipId,
+    merchantRewardId: rewardId,
   };
 }
 
@@ -701,10 +701,10 @@ export function stringifyRefundUri({
 }
 export function stringifyRewardUri({
   merchantBaseUrl,
-  merchantTipId,
+  merchantRewardId,
 }: Omit<RewardUriResult, "type">): string {
   const { proto, path } = getUrlInfo(merchantBaseUrl);
-  return `${proto}://reward/${path}${merchantTipId}`;
+  return `${proto}://reward/${path}${merchantRewardId}`;
 }
 
 export function stringifyExchangeUri({