Skip to content

Ensure the ToS can be accepted / rejected following an initial rejection.#12795

Merged
techanvil merged 1 commit into
mainfrom
enhancement/12377-fix-tos-resubmission
May 27, 2026
Merged

Ensure the ToS can be accepted / rejected following an initial rejection.#12795
techanvil merged 1 commit into
mainfrom
enhancement/12377-fix-tos-resubmission

Conversation

@techanvil

@techanvil techanvil commented May 26, 2026

Copy link
Copy Markdown
Collaborator

Summary

Addresses issue:

Relevant technical choices

This is a fix to ensure that the ToS screen can be accepted / rejected in the case where the user initially rejects the ToS, is returned to the Analytics setup screen with an error, and then goes back to the ToS screen to resubmit the form.

The solution is to ensure the account ticket ID transient isn't deleted in the case of an error, as we'll still need it when returning to the Analytics setup screen after the user revisits the ToS screen.

This change isn't behind the setupFlowRefresh feature flag, as it won't impact the non-SFR flow - the transient will expire after 15 mins, and is overridden when entering the account creation flow again anyway.

PR Author Checklist

  • My code is tested and passes existing unit tests.
  • My code has an appropriate set of unit tests which all pass.
  • My code is backward-compatible with WordPress 5.2 and PHP 7.4.
  • My code follows the WordPress coding standards.
  • My code has proper inline documentation.
  • I have added a QA Brief on the issue linked above.
  • I have signed the Contributor License Agreement (see https://cla.developers.google.com/).

Do not alter or remove anything below. The following sections will be managed by moderators only.

Code Reviewer Checklist

  • Run the code.
  • Ensure the acceptance criteria are satisfied.
  • Reassess the implementation with the IB.
  • Ensure no unrelated changes are included.
  • Ensure CI checks pass.
  • Check Storybook where applicable.
  • Ensure there is a QA Brief.
  • Ensure there are no unexpected significant changes to file sizes.

Merge Reviewer Checklist

  • Ensure the PR has the correct target branch.
  • Double-check that the PR is okay to be merged.
  • Ensure the corresponding issue has a ZenHub release assigned.
  • Add a changelog message to the issue.

@github-actions

github-actions Bot commented May 26, 2026

Copy link
Copy Markdown

🤖 This comment is automatically updated by CI workflows. Each section is managed independently.

📦 Build files for acfa613:

  • Build files have been deleted.

🎭 Playwright reports for acfa613:

📚 Storybook for acfa613:

@techanvil techanvil changed the title Don't delete the account ticket transient when an error occurs during provisioning. Ensure the ToS can be accepted / rejected following an initial rejection. May 26, 2026
@techanvil techanvil force-pushed the enhancement/12377-fix-tos-resubmission branch from 1647a46 to acfa613 Compare May 26, 2026 17:46
@techanvil techanvil changed the base branch from develop to main May 26, 2026 17:47
@github-actions

Copy link
Copy Markdown

Size Change: 0 B

Total Size: 2.39 MB

ℹ️ View Unchanged
Filename Size Change
dist/assets/blocks/reader-revenue-manager/block-editor-plugin/editor-styles.css 124 B 0 B
dist/assets/blocks/reader-revenue-manager/block-editor-plugin/editor-styles.js 0 B 0 B 🆕
dist/assets/blocks/reader-revenue-manager/block-editor-plugin/index.js 42.7 kB 0 B
dist/assets/blocks/reader-revenue-manager/common/editor-styles.css 307 B 0 B
dist/assets/blocks/reader-revenue-manager/common/editor-styles.js 0 B 0 B 🆕
dist/assets/blocks/reader-revenue-manager/contribute-with-google/index.js 5.8 kB 0 B
dist/assets/blocks/reader-revenue-manager/contribute-with-google/non-site-kit-user.js 5.01 kB 0 B
dist/assets/blocks/reader-revenue-manager/subscribe-with-google/index.js 5.81 kB 0 B
dist/assets/blocks/reader-revenue-manager/subscribe-with-google/non-site-kit-user.js 5 kB 0 B
dist/assets/blocks/sign-in-with-google/editor-styles.css 84 B 0 B
dist/assets/blocks/sign-in-with-google/editor-styles.js 0 B 0 B 🆕
dist/assets/blocks/sign-in-with-google/index.js 18.5 kB 0 B
dist/assets/css/googlesitekit-admin-css-********************.min.css 70.3 kB -15 B (-0.02%)
dist/assets/css/googlesitekit-adminbar-css-********************.min.css 12.3 kB 0 B
dist/assets/css/googlesitekit-authorize-application-css-********************.min.css 851 B 0 B
dist/assets/css/googlesitekit-wp-dashboard-css-********************.min.css 8.9 kB 0 B
dist/assets/js/146-********************.js 960 B 0 B
dist/assets/js/201-********************.js 2.85 kB 0 B
dist/assets/js/273-********************.js 52.5 kB 0 B
dist/assets/js/314-********************.js 100 kB 0 B
dist/assets/js/315-********************.js 3.08 kB 0 B
dist/assets/js/379-********************.js 3.7 kB 0 B
dist/assets/js/590-********************.js 1.88 kB 0 B
dist/assets/js/640-********************.js 2.35 kB 0 B
dist/assets/js/909-********************.js 1.01 kB 0 B
dist/assets/js/analytics-advanced-tracking-********************.js 404 B 0 B
dist/assets/js/googlesitekit-activation-********************.js 24.9 kB 0 B
dist/assets/js/googlesitekit-ad-blocking-recovery-********************.js 60.6 kB 0 B
dist/assets/js/googlesitekit-admin-pointers-tracking-********************.js 5.36 kB 0 B
dist/assets/js/googlesitekit-adminbar-********************.js 35.9 kB 0 B
dist/assets/js/googlesitekit-api-********************.js 8.03 kB 0 B
dist/assets/js/googlesitekit-block-tracking-********************.js 5.56 kB 0 B
dist/assets/js/googlesitekit-components-********************.js 5.63 kB 0 B
dist/assets/js/googlesitekit-consent-mode-********************.js 26 kB 0 B
dist/assets/js/googlesitekit-data-********************.js 1.76 kB 0 B
dist/assets/js/googlesitekit-datastore-forms-********************.js 7.2 kB 0 B
dist/assets/js/googlesitekit-datastore-location-********************.js 1.52 kB 0 B
dist/assets/js/googlesitekit-datastore-pdf-********************.js 1.09 kB 0 B
dist/assets/js/googlesitekit-datastore-site-********************.js 18.7 kB 0 B
dist/assets/js/googlesitekit-datastore-ui-********************.js 7.36 kB 0 B
dist/assets/js/googlesitekit-datastore-user-********************.js 23.3 kB 0 B
dist/assets/js/googlesitekit-entity-dashboard-********************.js 74 kB 0 B
dist/assets/js/googlesitekit-events-provider-contact-form-7-********************.js 2.31 kB 0 B
dist/assets/js/googlesitekit-events-provider-easy-digital-downloads-********************.js 1.08 kB 0 B
dist/assets/js/googlesitekit-events-provider-mailchimp-********************.js 2.31 kB 0 B
dist/assets/js/googlesitekit-events-provider-ninja-forms-********************.js 2.15 kB 0 B
dist/assets/js/googlesitekit-events-provider-optin-monster-********************.js 2.19 kB 0 B
dist/assets/js/googlesitekit-events-provider-popup-maker-********************.js 2.31 kB 0 B
dist/assets/js/googlesitekit-events-provider-woocommerce-********************.js 1.06 kB 0 B
dist/assets/js/googlesitekit-events-provider-wpforms-********************.js 2.3 kB 0 B
dist/assets/js/googlesitekit-i18n-********************.js 4.43 kB 0 B
dist/assets/js/googlesitekit-key-metrics-setup-********************.js 54 kB 0 B
dist/assets/js/googlesitekit-main-dashboard-********************.js 170 kB 0 B
dist/assets/js/googlesitekit-metric-selection-********************.js 59.8 kB 0 B
dist/assets/js/googlesitekit-modules-********************.js 25.9 kB 0 B
dist/assets/js/googlesitekit-modules-ads-********************.js 47.9 kB 0 B
dist/assets/js/googlesitekit-modules-adsense-********************.js 138 kB 0 B
dist/assets/js/googlesitekit-modules-analytics-4-********************.js 195 kB 0 B
dist/assets/js/googlesitekit-modules-pagespeed-insights-********************.js 23.3 kB 0 B
dist/assets/js/googlesitekit-modules-reader-revenue-manager-********************.js 52.7 kB 0 B
dist/assets/js/googlesitekit-modules-search-console-********************.js 65.4 kB 0 B
dist/assets/js/googlesitekit-modules-sign-in-with-google-********************.js 33.7 kB 0 B
dist/assets/js/googlesitekit-modules-tagmanager-********************.js 30.1 kB 0 B
dist/assets/js/googlesitekit-notifications-********************.js 67.7 kB 0 B
dist/assets/js/googlesitekit-polyfills-********************.js 228 B 0 B
dist/assets/js/googlesitekit-settings-********************.js 136 kB 0 B
dist/assets/js/googlesitekit-splash-********************.js 80.6 kB 0 B
dist/assets/js/googlesitekit-user-input-********************.js 52.3 kB 0 B
dist/assets/js/googlesitekit-vendor-********************.js 314 kB 0 B
dist/assets/js/googlesitekit-widgets-********************.js 104 kB 0 B
dist/assets/js/googlesitekit-wp-dashboard-********************.js 61.5 kB 0 B
dist/assets/js/runtime-********************.js 1.88 kB 0 B

compressed-size-action

@ankitrox ankitrox left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM 💯

Moving this to QA and assigning this to @mohitwp for another pass.

@techanvil techanvil merged commit 3c10e6b into main May 27, 2026
42 of 43 checks passed
@techanvil techanvil deleted the enhancement/12377-fix-tos-resubmission branch May 27, 2026 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants