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

Consolidate accounts onboarding: Connect to existing Google Ads account via the combo card #2640

Merged
merged 57 commits into from
Oct 31, 2024
Merged

Consolidate accounts onboarding: Connect to existing Google Ads account via the combo card #2640

merged 57 commits into from
Oct 31, 2024
+437 −62

Commits on Oct 4, 2024

  1. Onboarding: Connect to existing Ads account in Google Accounts Card

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    63b182b View commit details
    Browse the repository at this point in the history

  2. Conflict resolution

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    f73c4b2 View commit details
    Browse the repository at this point in the history

  3. Add rendering condition.

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    96e3ef2 View commit details
    Browse the repository at this point in the history

  4. Separate components for body and footer.

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    7e73f98 View commit details
    Browse the repository at this point in the history

  5. Connected label styling

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    ba5ca7b View commit details
    Browse the repository at this point in the history

  6. Pass isVisible prop to card component.

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    df93a29 View commit details
    Browse the repository at this point in the history

  7. Use ref for keeping connected account selected.

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    6fce3e6 View commit details
    Browse the repository at this point in the history

  8. Add E2E tests.

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4173593 View commit details
    Browse the repository at this point in the history

  9. Fix lint css.

    @ankitrox
    ankitrox committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    2466f7e View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Fix: E2E tests.

    @ankitrox
    ankitrox committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    a4d0eb4 View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts and merge base branch.

    @ankitrox
    ankitrox committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    f4fb5c2 View commit details
    Browse the repository at this point in the history

  3. Add styling for select.

    @ankitrox
    ankitrox committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    4ef6d25 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. CR feedback.

    @ankitrox
    ankitrox committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    32864c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Resolve conflicts and merge base branch.

    @ankitrox
    ankitrox committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2e6bcfe View commit details
    Browse the repository at this point in the history

  2. Update tests.

    @ankitrox
    ankitrox committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2b7c811 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Resolve conflicts and merge base branch.

    @ankitrox
    ankitrox committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    aa6a670 View commit details
    Browse the repository at this point in the history

  2. CR feedback.

    @ankitrox
    ankitrox committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    fbb199f View commit details
    Browse the repository at this point in the history

  3. Fix: E2E tests.

    @ankitrox
    ankitrox committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    c20fbea View commit details
    Browse the repository at this point in the history

  4. CR feedback.

    @ankitrox
    ankitrox committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    7c9c848 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Resolve conflicts and merge base branch.

    @ankitrox
    ankitrox committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    57023bc View commit details
    Browse the repository at this point in the history

  2. CR feedback round 2.

    @ankitrox
    ankitrox committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    9617a63 View commit details
    Browse the repository at this point in the history

  3. Fix: lint js.

    @ankitrox
    ankitrox committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    9475fa2 View commit details
    Browse the repository at this point in the history

  4. Rename ConnectCTA to ConnectButton.

    @asvinb
    asvinb committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    8a562d1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/2567-kickoff-mc-ads-account-creation' into upda… 

    …te/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    693efd2 View commit details
    Browse the repository at this point in the history

  6. Add nonInteractive prop to app-select.

    @asvinb
    asvinb committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    63c4fba View commit details
    Browse the repository at this point in the history

  7. Merge branch 'update/2596-connect-ads-account' of github.com:woocomme… 

    …rce/google-listings-and-ads into update/2596-connect-ads-account
    @asvinb
    asvinb committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    a83c242 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/2567-kickoff-mc-ads-account-creation' into upda… 

    …te/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    73350ef View commit details
    Browse the repository at this point in the history

  9. Fix: E2E.

    @ankitrox
    ankitrox committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    d58278e View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Resolve conflicts and merge base branch.

    @ankitrox
    ankitrox committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    5c3c5c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2567-kickoff-mc-ads-account-creation' into upda… 

    …te/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    47a0c3d View commit details
    Browse the repository at this point in the history

  3. Remove redundant prop.

    @ankitrox
    ankitrox committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    713afc0 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Fix: E2E failing test.

    @ankitrox
    ankitrox committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    5dd622e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2567-kickoff-mc-ads-account-creation' into upda… 

    …te/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    87c0686 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/2567-kickoff-mc-ads-account-creation' into upda… 

    …te/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    1299ad1 View commit details
    Browse the repository at this point in the history

  4. Resolve conflicts and merge base branch.

    @ankitrox
    ankitrox committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    efe843a View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Merge branch 'feature/2567-kickoff-mc-ads-account-creation' into upda… 

    …te/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    da1a10e View commit details
    Browse the repository at this point in the history

  2. Fix: styling the tertiary link.

    @ankitrox
    ankitrox committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    690067d View commit details
    Browse the repository at this point in the history

  3. Fix: lint css error.

    @ankitrox
    ankitrox committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    fe1b2ec View commit details
    Browse the repository at this point in the history

  4. Resolve conflicts and merge base branch.

    @ankitrox
    ankitrox committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6f85011 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Merge branch 'feature/2567-kickoff-mc-ads-account-creation' into upda… 

    …te/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    60a101a View commit details
    Browse the repository at this point in the history

  2. Fix: failing E2E test

    @ankitrox
    ankitrox committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    098b886 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Fix: E2E tests.

    @ankitrox
    ankitrox committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0046434 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/2509-consolidate-google-account-cards' into upd… 

    …ate/2596-connect-ads-account
    @ankitrox
    ankitrox committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    b449092 View commit details
    Browse the repository at this point in the history

  3. CR feedback.

    @ankitrox
    ankitrox committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    31c35a8 View commit details
    Browse the repository at this point in the history

  4. Update condition for isConnected google ads account.

    @ankitrox
    ankitrox committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    f12e5e3 View commit details
    Browse the repository at this point in the history

  5. Use useGoogleAdsAccountReady hook.

    @ankitrox
    ankitrox committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    5632913 View commit details
    Browse the repository at this point in the history

  6. Revert the css change.

    @ankitrox
    ankitrox committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    2724b0f View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Update AccountCard component

    @joemcgill
    joemcgill committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e5edd82 View commit details
    Browse the repository at this point in the history

  2. Update ConnectAds to use new AccountCard

    @joemcgill
    joemcgill committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4901758 View commit details
    Browse the repository at this point in the history

  3. Update docblocks to AccountCard

    @joemcgill
    joemcgill committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    0b23082 View commit details
    Browse the repository at this point in the history

  4. Delete ConnectAccountCard

    @joemcgill
    joemcgill committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    c7e0e70 View commit details
    Browse the repository at this point in the history

  5. Delete ConnectAccountCard (realy)

    @joemcgill
    joemcgill committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4c9bb4b View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Use ConnectButton component.

    @asvinb
    asvinb committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    79a66ff View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2658 from woocommerce/update/2596-connect-ads-ref… 

    …actor

2596: Refactor ConnectAds with updated AccountCard
    @asvinb
    asvinb authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    b77f799 View commit details
    Browse the repository at this point in the history

  3. Add render conditions in the connected combo card.

    @asvinb
    asvinb committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    e3bbd83 View commit details
    Browse the repository at this point in the history

  4. Update E2E tests.

    @asvinb
    asvinb committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    84811bd View commit details
    Browse the repository at this point in the history

  5. Make label non interactive.

    @asvinb
    asvinb committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    4cba145 View commit details
    Browse the repository at this point in the history