From 7810f27d189d9a2366042481ade55379c112e7fc Mon Sep 17 00:00:00 2001 From: Jaalah Ramos <125309814+jaalah-akamai@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:52:32 -0400 Subject: [PATCH 1/2] fix: resort to payment id for edit billing flow (#12544) * fix: resort to payment id for edit billing flow * Update packages/manager/CHANGELOG.md Co-authored-by: Connie Liu <139280159+coliu-akamai@users.noreply.github.com> * fix test --------- Co-authored-by: Jaalah Ramos Co-authored-by: Connie Liu <139280159+coliu-akamai@users.noreply.github.com> Co-authored-by: Connie Liu --- packages/manager/CHANGELOG.md | 6 ++++++ packages/manager/package.json | 2 +- .../PaymentMethodRow/PaymentMethodRow.test.tsx | 12 +----------- .../PaymentMethodRow/PaymentMethodRow.tsx | 4 +++- .../BillingSummary/BillingSummary.tsx | 18 ++++++++++++------ packages/manager/src/routes/account/index.ts | 4 +--- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md index 7558a5dd3fd..d952d9170c6 100644 --- a/packages/manager/CHANGELOG.md +++ b/packages/manager/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2025-07-21] - v1.146.2 + +### Fixed: + +- Resort to payment id for edit billing flow ([#12525](https://github.com/linode/manager/pull/12525)) + ## [2025-07-16] - v1.146.1 diff --git a/packages/manager/package.json b/packages/manager/package.json index 86d0386430b..ffd87944d98 100644 --- a/packages/manager/package.json +++ b/packages/manager/package.json @@ -2,7 +2,7 @@ "name": "linode-manager", "author": "Linode", "description": "The Linode Manager website", - "version": "1.146.1", + "version": "1.146.2", "private": true, "type": "module", "bugs": { diff --git a/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.test.tsx b/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.test.tsx index cb8d53d8d1c..e52524f43c0 100644 --- a/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.test.tsx +++ b/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.test.tsx @@ -243,17 +243,7 @@ describe('Payment Method Row', () => { expect(navigate).toHaveBeenCalledWith({ search: { - paymentMethod: { - created: '2021-05-21T14:27:51', - data: { - card_type: 'Visa', - expiry: '12/2022', - last_four: '1881', - }, - id: 9, - is_default: false, - type: 'credit_card', - }, + paymentMethodId: 9, }, to: '/account/billing/make-payment', }); diff --git a/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.tsx b/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.tsx index b3b4dd9f857..61e97fa55bf 100644 --- a/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.tsx +++ b/packages/manager/src/components/PaymentMethodRow/PaymentMethodRow.tsx @@ -61,7 +61,9 @@ export const PaymentMethodRow = (props: Props) => { onClick: () => { navigate({ to: '/account/billing/make-payment', - search: { paymentMethod }, + search: { + paymentMethodId: paymentMethod.id, + }, }); }, title: 'Make a Payment', diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx index 82c21ad9c55..d36b01abe99 100644 --- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx @@ -55,10 +55,12 @@ export const BillingSummary = (props: BillingSummaryProps) => { const navigate = useNavigate(); const match = useMatch({ strict: false }); - const { paymentMethod } = useSearch({ + const search = useSearch({ strict: false, }); + const { paymentMethodId } = search; + const routeForMakePayment = '/account/billing/make-payment'; const makePaymentRouteMatch = match?.routeId === routeForMakePayment; @@ -91,13 +93,17 @@ export const BillingSummary = (props: BillingSummaryProps) => { return; } - const selectedPaymentMethod = - paymentMethod ?? - paymentMethods?.find((payment) => payment.is_default) ?? - undefined; + const selectedPaymentMethod = paymentMethodId + ? paymentMethods?.find((payment) => payment.id === paymentMethodId) + : (paymentMethods?.find((payment) => payment.is_default) ?? undefined); openPaymentDrawer(selectedPaymentMethod); - }, [paymentMethods, openPaymentDrawer, makePaymentRouteMatch, paymentMethod]); + }, [ + paymentMethods, + openPaymentDrawer, + makePaymentRouteMatch, + paymentMethodId, + ]); // // Account Balance logic diff --git a/packages/manager/src/routes/account/index.ts b/packages/manager/src/routes/account/index.ts index bc3130f8122..789da6adc31 100644 --- a/packages/manager/src/routes/account/index.ts +++ b/packages/manager/src/routes/account/index.ts @@ -3,15 +3,13 @@ import { createRoute, redirect } from '@tanstack/react-router'; import { rootRoute } from '../root'; import { AccountRoute } from './AccountRoute'; -import type { PaymentMethod } from '@linode/api-v4'; - interface AccountBillingSearch { contactDrawerOpen?: boolean; focusEmail?: boolean; } interface AccountBillingMakePaymentSearch { - paymentMethod?: PaymentMethod; + paymentMethodId?: number; } const accountRoute = createRoute({ From 7c7179d1abe1ae090dd0f87509c9b2ee6c2ab23d Mon Sep 17 00:00:00 2001 From: Connie Liu Date: Mon, 21 Jul 2025 11:06:47 -0700 Subject: [PATCH 2/2] Release v1.146.2 update changelog to have correct PR number --- packages/manager/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md index d952d9170c6..573a5239952 100644 --- a/packages/manager/CHANGELOG.md +++ b/packages/manager/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed: -- Resort to payment id for edit billing flow ([#12525](https://github.com/linode/manager/pull/12525)) +- Resort to payment id for edit billing flow ([#12544](https://github.com/linode/manager/pull/12544)) ## [2025-07-16] - v1.146.1