Skip to content

Commit 6fde11f

Browse files
bnussman-akamaijaalah-akamaijaalahpmakode-akamaidwiley-akamai
authored
Release v1.153.2 - staging → master (#13021)
* hotfix: [M3-10688] - Add ability to enter migration queue (#13016) * hotfix: [M3-10688] - Add ability to enter migration queue * Bump version and changelog --------- Co-authored-by: Jaalah Ramos <[email protected]> * hotfix: [UIE-9467] - Update Linode invoice US address (#13019) * Linode invoice US address update * Update changelog --------- Co-authored-by: Banks Nussman <[email protected]> * Revert "hotfix: [M3-10688] - Add ability to enter migration queue" (#13023) * Revert "hotfix: [M3-10688] - Add ability to enter migration queue (#13016)" This reverts commit 8a7101e. * version bump * Update packages/manager/CHANGELOG.md Co-authored-by: Dajahi Wiley <[email protected]> --------- Co-authored-by: Jaalah Ramos <[email protected]> Co-authored-by: Jaalah Ramos <[email protected]> Co-authored-by: Purvesh Makode <[email protected]> Co-authored-by: Dajahi Wiley <[email protected]>
2 parents a79aaf8 + ae97be6 commit 6fde11f

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

packages/manager/CHANGELOG.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [2025-10-28] - v1.153.2
8+
9+
### Changed:
10+
11+
- Linode invoice US address ([#13019](https://github.com/linode/manager/pull/13019))
712

813
## [2025-10-22] - v1.153.1
914

@@ -15,12 +20,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1520

1621
## [2025-10-21] - v1.153.0
1722

18-
1923
### Added:
2024

2125
- Volume attached to state ([#12903](https://github.com/linode/manager/pull/12903))
2226
- Profile Update client side validation ([#12963](https://github.com/linode/manager/pull/12963))
23-
- IAM DX: useDelegationRole hook ([#12979](https://github.com/linode/manager/pull/12979))
27+
- IAM DX: useDelegationRole hook ([#12979](https://github.com/linode/manager/pull/12979))
2428

2529
### Changed:
2630

@@ -69,7 +73,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
6973

7074
## [2025-10-07] - v1.152.0
7175

72-
7376
### Added:
7477

7578
- IAM RBAC: disable fields in the drawer ([#12892](https://github.com/linode/manager/pull/12892))
@@ -88,7 +91,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
8891
- Getting started link on the volume details page ([#12904](https://github.com/linode/manager/pull/12904))
8992
- ACLP: update default `ACLP Time Range Picker Preset` to `1 hour` ([#12915](https://github.com/linode/manager/pull/12915))
9093
- Check Region VPC availability for IPv6 prefix lengths instead of hardcoded prefix lengths ([#12919](https://github.com/linode/manager/pull/12919))
91-
- IAM Delegation: remove ProxyUserTable ([#12921](https://github.com/linode/manager/pull/12921))
94+
- IAM Delegation: remove ProxyUserTable ([#12921](https://github.com/linode/manager/pull/12921))
9295
- Add padding inside the ManagedDashboardCard component ([#12923](https://github.com/linode/manager/pull/12923))
9396
- Assorted VPC IPv4 and VPC IPv6 copy ([#12924](https://github.com/linode/manager/pull/12924))
9497
- IAM RBAC: replace grants with usePermission hook in Linodes ([#12932](https://github.com/linode/manager/pull/12932))

packages/manager/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "linode-manager",
33
"author": "Linode",
44
"description": "The Linode Manager website",
5-
"version": "1.153.1",
5+
"version": "1.153.2",
66
"private": true,
77
"type": "module",
88
"bugs": {

packages/manager/src/features/Billing/PdfGenerator/utils.test.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,20 @@ describe('getRemitAddress', () => {
7474
expect(result.entity).toBe('Linode');
7575
});
7676

77-
it('should return Linode address with Akamai entity when country is US and using Akamai billing', () => {
78-
const result = getRemitAddress('US', true);
79-
expect(result).toEqual(ADDRESSES.linode);
80-
expect(result.entity).toBe('Akamai Technologies, Inc.');
81-
});
77+
it('should return Akamai US address when country is CA or US and using Akamai billing', () => {
78+
const result1 = getRemitAddress('CA', true);
79+
expect(result1).toEqual(ADDRESSES.akamai.us);
8280

83-
it('should return Akamai US address when country is CA and using Akamai billing', () => {
84-
const result = getRemitAddress('CA', true);
85-
expect(result).toEqual(ADDRESSES.akamai.us);
81+
const result2 = getRemitAddress('US', true);
82+
expect(result2).toEqual(ADDRESSES.akamai.us);
8683
});
8784

88-
it('should return Linode address when country is CA and not using Akamai billing', () => {
89-
const result = getRemitAddress('CA', false);
90-
expect(result).toEqual(ADDRESSES.linode);
85+
it('should return Linode address when country is CA or US and not using Akamai billing', () => {
86+
const result1 = getRemitAddress('CA', false);
87+
expect(result1).toEqual(ADDRESSES.linode);
88+
89+
const result2 = getRemitAddress('US', false);
90+
expect(result2).toEqual(ADDRESSES.linode);
9191
});
9292

9393
it('should return Akamai international address for other countries when using Akamai billing', () => {

packages/manager/src/features/Billing/PdfGenerator/utils.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -440,13 +440,10 @@ export const getRemitAddress = (country: string, isAkamaiBilling: boolean) => {
440440
if (!isAkamaiBilling) {
441441
return ADDRESSES.linode;
442442
}
443-
// M3-6218: Temporarily change "Remit To" address for US customers back to the Philly address
444-
if (country === 'US') {
445-
ADDRESSES.linode.entity = 'Akamai Technologies, Inc.';
446-
return ADDRESSES.linode;
447-
}
448-
if (['CA'].includes(country)) {
443+
444+
if (['CA', 'US'].includes(country)) {
449445
return ADDRESSES.akamai.us;
450446
}
447+
451448
return ADDRESSES.akamai.international;
452449
};

0 commit comments

Comments
 (0)