[taler-wallet-core] branch master updated: rename tip->reward in URI

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new 57e86b759 rename tip->reward in URI
57e86b759 is described below

commit 57e86b759e0376238f993fea1617609977fefb46
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu Aug 3 19:03:24 2023 +0200

    rename tip->reward in URI
---
 packages/taler-util/src/taleruri.test.ts           |  8 +++----
 packages/taler-util/src/taleruri.ts                | 28 +++++++++++-----------
 packages/taler-wallet-cli/src/index.ts             |  2 +-
 .../taler-wallet-core/src/operations/reward.ts     |  4 ++--
 .../src/NavigationBar.tsx                          |  2 +-
 .../src/platform/chrome.ts                         |  2 +-
 .../src/popup/TalerActionFound.tsx                 |  2 +-
 .../src/wallet/AddNewActionView.tsx                |  2 +-
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/taler-util/src/taleruri.test.ts 
b/packages/taler-util/src/taleruri.test.ts
index 3244bbbd9..0dcf92252 100644
--- a/packages/taler-util/src/taleruri.test.ts
+++ b/packages/taler-util/src/taleruri.test.ts
@@ -21,7 +21,7 @@ import {
   parsePayUri,
   parseRefundUri,
   parseRestoreUri,
-  parseTipUri,
+  parseRewardUri,
   parseWithdrawExchangeUri,
   parseWithdrawUri,
   stringifyPayPushUri,
@@ -161,7 +161,7 @@ test("taler refund uri parsing with instance", (t) => {
 
 test("taler tip pickup uri", (t) => {
   const url1 = "taler://tip/merchant.example.com/tipid";
-  const r1 = parseTipUri(url1);
+  const r1 = parseRewardUri(url1);
   if (!r1) {
     t.fail();
     return;
@@ -171,7 +171,7 @@ test("taler tip pickup uri", (t) => {
 
 test("taler tip pickup uri with instance", (t) => {
   const url1 = "taler://tip/merchant.example.com/instances/tipm/tipid";
-  const r1 = parseTipUri(url1);
+  const r1 = parseRewardUri(url1);
   if (!r1) {
     t.fail();
     return;
@@ -182,7 +182,7 @@ test("taler tip pickup uri with instance", (t) => {
 
 test("taler tip pickup uri with instance and prefix", (t) => {
   const url1 = "taler://tip/merchant.example.com/my/pfx/tipm/tipid";
-  const r1 = parseTipUri(url1);
+  const r1 = parseRewardUri(url1);
   if (!r1) {
     t.fail();
     return;
diff --git a/packages/taler-util/src/taleruri.ts 
b/packages/taler-util/src/taleruri.ts
index fc140811b..777cb5245 100644
--- a/packages/taler-util/src/taleruri.ts
+++ b/packages/taler-util/src/taleruri.ts
@@ -26,7 +26,7 @@ export type TalerUri =
   | PayPushUriResult
   | BackupRestoreUri
   | RefundUriResult
-  | TipUriResult
+  | RewardUriResult
   | WithdrawUriResult
   | ExchangeUri
   | WithdrawExchangeUri
@@ -60,8 +60,8 @@ export interface RefundUriResult {
   orderId: string;
 }
 
-export interface TipUriResult {
-  type: TalerUriAction.Tip;
+export interface RewardUriResult {
+  type: TalerUriAction.Reward;
   merchantBaseUrl: string;
   merchantTipId: string;
 }
@@ -167,7 +167,7 @@ export enum TalerUriAction {
   Pay = "pay",
   Withdraw = "withdraw",
   Refund = "refund",
-  Tip = "tip",
+  Reward = "reward",
   PayPull = "pay-pull",
   PayPush = "pay-push",
   PayTemplate = "pay-template",
@@ -212,7 +212,7 @@ const parsers: { [A in TalerUriAction]: Parser } = {
   [TalerUriAction.PayTemplate]: parsePayTemplateUri,
   [TalerUriAction.Restore]: parseRestoreUri,
   [TalerUriAction.Refund]: parseRefundUri,
-  [TalerUriAction.Tip]: parseTipUri,
+  [TalerUriAction.Reward]: parseRewardUri,
   [TalerUriAction.Withdraw]: parseWithdrawUri,
   [TalerUriAction.DevExperiment]: parseDevExperimentUri,
   [TalerUriAction.Exchange]: parseExchangeUri,
@@ -255,8 +255,8 @@ export function stringifyTalerUri(uri: TalerUri): string {
     case TalerUriAction.Refund: {
       return stringifyRefundUri(uri);
     }
-    case TalerUriAction.Tip: {
-      return stringifyTipUri(uri);
+    case TalerUriAction.Reward: {
+      return stringifyRewardUri(uri);
     }
     case TalerUriAction.Withdraw: {
       return stringifyWithdrawUri(uri);
@@ -394,11 +394,11 @@ export function parsePayPullUri(s: string): 
PayPullUriResult | undefined {
 }
 
 /**
- * Parse a taler[+http]://tip URI.
+ * Parse a taler[+http]://reward URI.
  * Return undefined if not passed a valid URI.
  */
-export function parseTipUri(s: string): TipUriResult | undefined {
-  const pi = parseProtoInfo(s, "tip");
+export function parseRewardUri(s: string): RewardUriResult | undefined {
+  const pi = parseProtoInfo(s, "reward");
   if (!pi) {
     return undefined;
   }
@@ -416,7 +416,7 @@ export function parseTipUri(s: string): TipUriResult | 
undefined {
   );
 
   return {
-    type: TalerUriAction.Tip,
+    type: TalerUriAction.Reward,
     merchantBaseUrl,
     merchantTipId: tipId,
   };
@@ -699,12 +699,12 @@ export function stringifyRefundUri({
   const { proto, path } = getUrlInfo(merchantBaseUrl);
   return `${proto}://refund/${path}${orderId}`;
 }
-export function stringifyTipUri({
+export function stringifyRewardUri({
   merchantBaseUrl,
   merchantTipId,
-}: Omit<TipUriResult, "type">): string {
+}: Omit<RewardUriResult, "type">): string {
   const { proto, path } = getUrlInfo(merchantBaseUrl);
-  return `${proto}://tip/${path}${merchantTipId}`;
+  return `${proto}://reward/${path}${merchantTipId}`;
 }
 
 export function stringifyExchangeUri({
diff --git a/packages/taler-wallet-cli/src/index.ts 
b/packages/taler-wallet-cli/src/index.ts
index a34f6be03..e2787db66 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -651,7 +651,7 @@ walletCli
             alwaysYes: args.handleUri.autoYes,
           });
           break;
-        case TalerUriAction.Tip: {
+        case TalerUriAction.Reward: {
           const res = await 
wallet.client.call(WalletApiOperation.PrepareReward, {
             talerRewardUri: uri,
           });
diff --git a/packages/taler-wallet-core/src/operations/reward.ts 
b/packages/taler-wallet-core/src/operations/reward.ts
index 58c745780..47956f15f 100644
--- a/packages/taler-wallet-core/src/operations/reward.ts
+++ b/packages/taler-wallet-core/src/operations/reward.ts
@@ -31,7 +31,7 @@ import {
   j2s,
   Logger,
   NotificationType,
-  parseTipUri,
+  parseRewardUri,
   PrepareTipResult,
   TalerErrorCode,
   TalerPreciseTimestamp,
@@ -141,7 +141,7 @@ export async function prepareTip(
   ws: InternalWalletState,
   talerTipUri: string,
 ): Promise<PrepareTipResult> {
-  const res = parseTipUri(talerTipUri);
+  const res = parseRewardUri(talerTipUri);
   if (!res) {
     throw Error("invalid taler://tip URI");
   }
diff --git a/packages/taler-wallet-webextension/src/NavigationBar.tsx 
b/packages/taler-wallet-webextension/src/NavigationBar.tsx
index 231418861..167f1797c 100644
--- a/packages/taler-wallet-webextension/src/NavigationBar.tsx
+++ b/packages/taler-wallet-webextension/src/NavigationBar.tsx
@@ -146,7 +146,7 @@ const talerUriActionToPageName: {
 } = {
   [TalerUriAction.Withdraw]: "ctaWithdraw",
   [TalerUriAction.Pay]: "ctaPay",
-  [TalerUriAction.Tip]: "ctaTips",
+  [TalerUriAction.Reward]: "ctaTips",
   [TalerUriAction.Refund]: "ctaRefund",
   [TalerUriAction.PayPull]: "ctaInvoicePay",
   [TalerUriAction.PayPush]: "ctaTransferPickup",
diff --git a/packages/taler-wallet-webextension/src/platform/chrome.ts 
b/packages/taler-wallet-webextension/src/platform/chrome.ts
index 1295fa514..a50f225dc 100644
--- a/packages/taler-wallet-webextension/src/platform/chrome.ts
+++ b/packages/taler-wallet-webextension/src/platform/chrome.ts
@@ -279,7 +279,7 @@ function openWalletURIFromPopup(uri: TalerUri): void {
         `static/wallet.html#/cta/pay?talerUri=${encodeURIComponent(talerUri)}`,
       );
       break;
-    case TalerUriAction.Tip:
+    case TalerUriAction.Reward:
       url = chrome.runtime.getURL(
         `static/wallet.html#/cta/tip?talerUri=${encodeURIComponent(talerUri)}`,
       );
diff --git a/packages/taler-wallet-webextension/src/popup/TalerActionFound.tsx 
b/packages/taler-wallet-webextension/src/popup/TalerActionFound.tsx
index 6a0585907..e120334e8 100644
--- a/packages/taler-wallet-webextension/src/popup/TalerActionFound.tsx
+++ b/packages/taler-wallet-webextension/src/popup/TalerActionFound.tsx
@@ -65,7 +65,7 @@ function ContentByUriType({
           </Button>
         </div>
       );
-    case TalerUriAction.Tip:
+    case TalerUriAction.Reward:
       return (
         <div>
           <p>
diff --git a/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx 
b/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx
index fd9815401..fc3a0916c 100644
--- a/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx
@@ -66,7 +66,7 @@ export function AddNewActionView({ onCancel }: Props): VNode {
                   return <i18n.Translate>Open pay page</i18n.Translate>;
                 case TalerUriAction.Refund:
                   return <i18n.Translate>Open refund page</i18n.Translate>;
-                case TalerUriAction.Tip:
+                case TalerUriAction.Reward:
                   return <i18n.Translate>Open tip page</i18n.Translate>;
                 case TalerUriAction.Withdraw:
                   return <i18n.Translate>Open withdraw page</i18n.Translate>;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.