Skip to content
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

Jump to bottom

Update email protection copy to align with mobile #362

Merged
merged 1 commit into from
Aug 2, 2023
Merged

Update email protection copy to align with mobile #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions dist/autofill-debug.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/autofill.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-test/helpers/pages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
* @param {string} address
*/
async selectPrivateAddress (address) {
await page.getByRole('button', { name: `Generate Private Duck Address ${address} Blocks email trackers and hides your address` })
await page.getByRole('button', { name: `Generate Private Duck Address ${address} Block email trackers & hide address` })
.click({force: true})
}
/**
Expand Down Expand Up @@ -170,7 +170,7 @@
const [, generatedPassword] = passwordButtonText.split('\n')

if (!generatedPassword.trim()) {
throw new Error('unreachable - password must not be empty')

Check failure on line 173 in integration-test/helpers/pages.js

View workflow job for this annotation

GitHub Actions / test

[macos] › email-autofill.macos.spec.js:156:9 › macos › auto filling a signup form › with an identity only - filling firstName + generated password 

  1) [macos] › email-autofill.macos.spec.js:156:9 › macos › auto filling a signup form › with an identity only - filling firstName + generated password 
    Error: unreachable - password must not be empty

       at ../helpers/pages.js:173

      171 |
      172 |             if (!generatedPassword.trim()) {
    > 173 |                 throw new Error('unreachable - password must not be empty')
          |                       ^
      174 |             }
      175 |
      176 |             await passwordBtn.click({ force: true })

        at SignupPage.selectGeneratedPassword (/home/runner/work/duckduckgo-autofill/duckduckgo-autofill/integration-test/helpers/pages.js:173:23)
        at /home/runner/work/duckduckgo-autofill/duckduckgo-autofill/integration-test/tests/email-autofill.macos.spec.js:169:13

Check failure on line 173 in integration-test/helpers/pages.js

View workflow job for this annotation

GitHub Actions / test

[macos] › email-autofill.macos.spec.js:239:9 › macos › auto filling a signup form › with no input types 

  2) [macos] › email-autofill.macos.spec.js:239:9 › macos › auto filling a signup form › with no input types 
    Error: unreachable - password must not be empty

       at ../helpers/pages.js:173

      171 |
      172 |             if (!generatedPassword.trim()) {
    > 173 |                 throw new Error('unreachable - password must not be empty')
          |                       ^
      174 |             }
      175 |
      176 |             await passwordBtn.click({ force: true })

        at SignupPage.selectGeneratedPassword (/home/runner/work/duckduckgo-autofill/duckduckgo-autofill/integration-test/helpers/pages.js:173:23)
        at /home/runner/work/duckduckgo-autofill/duckduckgo-autofill/integration-test/tests/email-autofill.macos.spec.js:247:13
}

await passwordBtn.click({ force: true })
Expand Down
4 changes: 2 additions & 2 deletions integration-test/tests/email-autofill.extension.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ test.describe('chrome extension', () => {
await emailPage.clickIntoInput()

// buttons, unique to the extension
const personalAddressBtn = await page.locator(`text=Use ${personalAddress} Blocks email trackers`)
const privateAddressBtn = await page.locator(`text=Generate a Private Duck Address Blocks email trackers and hides your address`)
const personalAddressBtn = await page.locator(`text=Use ${personalAddress} Block email trackers`)
const privateAddressBtn = await page.locator(`text=Generate a Private Duck Address Block email trackers & hide address`)

// click first option
await personalAddressBtn.click({timeout: 500})
Expand Down
2 changes: 1 addition & 1 deletion integration-test/tests/email-autofill.macos.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test.describe('macos', () => {
await emailPage.clickIntoInput()

// these are mac specific - different to the extension because they use different tooltips (currently)
const personalAddressBtn = await page.locator(`button:has-text("${personalAddress} Blocks email trackers")`)
const personalAddressBtn = await page.locator(`button:has-text("${personalAddress} Block email trackers")`)
const privateAddressBtn = await page.locator(`button:has-text("Generate Private Duck Address 0@duck.com")`)

// select the first option
Expand Down
4 changes: 2 additions & 2 deletions src/DeviceInterface/InterfacePrototype.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ class InterfacePrototype {
newIdentities.push({
id: 'personalAddress',
emailAddress: personalAddress,
title: 'Blocks email trackers'
title: 'Block email trackers'
})
}

newIdentities.push({
id: 'privateAddress',
emailAddress: privateAddress,
title: 'Blocks email trackers and hides your address'
title: 'Block email trackers & hide address'
})

return [...identities, ...newIdentities]
Expand Down
4 changes: 2 additions & 2 deletions src/UI/EmailHTMLTooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ ${this.options.css}
<span class="tooltip__button--email__primary-text">
Use <span class="js-address">${formatDuckAddress(escapeXML(this.addresses.personalAddress))}</span>
</span>
<span class="tooltip__button--email__secondary-text">Blocks email trackers</span>
<span class="tooltip__button--email__secondary-text">Block email trackers</span>
</button>
<button class="tooltip__button tooltip__button--email js-use-private">
<span class="tooltip__button--email__primary-text">Generate a Private Duck Address</span>
<span class="tooltip__button--email__secondary-text">Blocks email trackers and hides your address</span>
<span class="tooltip__button--email__secondary-text">Block email trackers & hide address</span>
</button>
</div>
<div class="tooltip--email__caret"></div>
Expand Down
6 changes: 3 additions & 3 deletions swift-package/Resources/assets/autofill-debug.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions swift-package/Resources/assets/autofill.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading