Skip to content

Emails: fix inverted DNS requirements notice condition (DOTEMP-76) #113886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordesign merged 2 commits into from
Sep 1, 2026
+60 −1
Merged

Emails: fix inverted DNS requirements notice condition (DOTEMP-76) #113886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab8238f
Emails: fix inverted condition in DnsRequirementsNotice
jordesign Aug 28, 2026
49c9c30
Merge branch 'trunk' into ai/agent/dotemp-76-1787882494
jordesign Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/dashboard/emails/add-forwarder/dns-requirements-notice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface DnsRequirementsNoticeProps {
}

export const DnsRequirementsNotice = ( { domainName, domainData }: DnsRequirementsNoticeProps ) => {
if ( ! domainData.has_wpcom_nameservers ) {
if ( domainData.has_wpcom_nameservers ) {

@StevenDufresne StevenDufresne Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems logical. @zaguiini can verify.

@zaguiini zaguiini Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deferring this to @Automattic/quake

return null;
}

Expand Down
59 changes: 59 additions & 0 deletions client/dashboard/emails/add-forwarder/test/dns-requirements-notice.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/**
* @jest-environment jsdom
*/
import { DomainSubtype } from '@automattic/api-core';
import { screen } from '@testing-library/react';
import { render } from '../../../test-utils';
import { DnsRequirementsNotice } from '../dns-requirements-notice';
import type { Domain } from '@automattic/api-core';

function makeDomainData( overrides: Partial< Domain > ): Domain {
return {
has_wpcom_nameservers: true,
subtype: { id: DomainSubtype.DOMAIN_REGISTRATION, label: 'Domain Registration' },
...overrides,
} as Domain;
}

describe( '<DnsRequirementsNotice>', () => {
// DOTEMP-76
test( 'shows the DNS requirements notice when using external name servers', () => {
render(
<DnsRequirementsNotice
domainName="example.com"
domainData={ makeDomainData( { has_wpcom_nameservers: false } ) }
/>
);

expect( screen.getByText( /your domain is using external name servers/i ) ).toBeVisible();
} );

// DOTEMP-76
test( 'hides the DNS requirements notice when using WordPress.com name servers', () => {
render(
<DnsRequirementsNotice
domainName="example.com"
domainData={ makeDomainData( { has_wpcom_nameservers: true } ) }
/>
);

expect(
screen.queryByText( /your domain is using external name servers/i )
).not.toBeInTheDocument();
} );

// DOTEMP-76
test( 'shows a domain connection variant notice when using external name servers on a connected domain', () => {
render(
<DnsRequirementsNotice
domainName="example.com"
domainData={ makeDomainData( {
has_wpcom_nameservers: false,
subtype: { id: DomainSubtype.DOMAIN_CONNECTION, label: 'Domain Connection' },
} ) }
/>
);

expect( screen.getByText( /your domain is using external name servers/i ) ).toBeVisible();
} );
} );
Loading