diff options
4 files changed, 8 insertions, 7 deletions
diff --git a/packages/taler-harness/src/integrationtests/test-payment-template.ts b/packages/taler-harness/src/integrationtests/test-payment-template.ts index 451a7dbe9..fc4cd1198 100644 --- a/packages/taler-harness/src/integrationtests/test-payment-template.ts +++ b/packages/taler-harness/src/integrationtests/test-payment-template.ts @@ -83,7 +83,7 @@ export async function runPaymentTemplateTest(t: GlobalTestState) { ); t.assertDeepEqual( - checkPayTemplateResult.template_contract.summary, + checkPayTemplateResult.templateDetails.template_contract.summary, mySummary, ); diff --git a/packages/taler-util/src/wallet-types.ts b/packages/taler-util/src/wallet-types.ts index dd8eb29a2..d472af187 100644 --- a/packages/taler-util/src/wallet-types.ts +++ b/packages/taler-util/src/wallet-types.ts @@ -2044,7 +2044,8 @@ export interface CheckPayTemplateRequest { talerPayTemplateUri: string; } -export type CheckPayTemplateReponse = TalerMerchantApi.WalletTemplateDetails & { +export type CheckPayTemplateReponse = { + templateDetails: TalerMerchantApi.WalletTemplateDetails; supportedCurrencies: string[]; } diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts index 77ea4c4c1..090a11cf0 100644 --- a/packages/taler-wallet-core/src/pay-merchant.ts +++ b/packages/taler-wallet-core/src/pay-merchant.ts @@ -1609,7 +1609,7 @@ export async function checkPayForTemplate( if (!parsedUri) { throw Error("invalid taler-template URI"); } - const asd = await downloadTemplate( + const templateDetails = await downloadTemplate( wex, parsedUri.merchantBaseUrl, parsedUri.templateId, @@ -1626,7 +1626,7 @@ export async function checkPayForTemplate( } return { - ...asd, + templateDetails, supportedCurrencies: Object.keys(cfg.body.currencies), }; } diff --git a/packages/taler-wallet-webextension/src/cta/PaymentTemplate/state.ts b/packages/taler-wallet-webextension/src/cta/PaymentTemplate/state.ts index 20edb98eb..1a92c4073 100644 --- a/packages/taler-wallet-webextension/src/cta/PaymentTemplate/state.ts +++ b/packages/taler-wallet-webextension/src/cta/PaymentTemplate/state.ts @@ -49,7 +49,7 @@ export function useComponentState({ const templateP = await api.wallet.call( WalletApiOperation.CheckPayForTemplate, { talerPayTemplateUri: talerTemplateUri }, ); - const requireMoreInfo = !templateP.template_contract.amount || !templateP.template_contract.summary; + const requireMoreInfo = !templateP.templateDetails.template_contract.amount || !templateP.templateDetails.template_contract.summary; let payStatus: PreparePayResult | undefined = undefined; if (!requireMoreInfo) { payStatus = await api.wallet.call(WalletApiOperation.PreparePayForTemplate, { talerPayTemplateUri: talerTemplateUri }); @@ -99,8 +99,8 @@ export function useComponentState({ } return () => { - const cfg = hook.response.templateP.template_contract; - const def = hook.response.templateP.editable_defaults; + const cfg = hook.response.templateP.templateDetails.template_contract; + const def = hook.response.templateP.templateDetails.editable_defaults; const fixedAmount = cfg.amount !== undefined ? Amounts.parseOrThrow(cfg.amount) : undefined; const fixedSummary = cfg.summary !== undefined ? cfg.summary : undefined; |