Skip to content

fix add-on store merge conflicts between #18816 and #18974#18992

Merged
seanbudd merged 1 commit into
masterfrom
fix-18991
Sep 25, 2025
Merged

fix add-on store merge conflicts between #18816 and #18974#18992
seanbudd merged 1 commit into
masterfrom
fix-18991

Conversation

@seanbudd
Copy link
Copy Markdown
Member

@seanbudd seanbudd commented Sep 25, 2025

Link to issue number:

Fixes #18991
Fixes a bad merge conflict fix between #18816 and #18974

Summary of the issue:

add-on store cannot open

Description of user facing changes:

add-on store can open again

Description of developer facing changes:

none

Description of development approach:

fix merge conflict

Testing strategy:

add-on store can open again

Known issues with pull request:

Code Review Checklist:

  • Documentation:
    • Change log entry
    • User Documentation
    • Developer / Technical Documentation
    • Context sensitive help for GUI changes
  • Testing:
    • Unit tests
    • System (end to end) tests
    • Manual testing
  • UX of all users considered:
    • Speech
    • Braille
    • Low Vision
    • Different web browsers
    • Localization in other languages / culture than English
  • API is compatible with existing add-ons.
  • Security precautions taken.

Copilot AI review requested due to automatic review settings September 25, 2025 04:21
@seanbudd seanbudd requested a review from a team as a code owner September 25, 2025 04:21
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR fixes the add-on store functionality that was broken due to a merge conflict between previous pull requests. The fix addresses an issue where the add-on store could not open properly.

  • Adds missing actionTarget parameter to an AddonActionVM instance
  • Restores functionality that was lost during a merge conflict resolution

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@seanbudd seanbudd changed the title fix add-on store fix add-on store merge conflicts between #18816 and #18974 Sep 25, 2025
@seanbudd seanbudd merged commit 339af3e into master Sep 25, 2025
71 of 73 checks passed
@seanbudd seanbudd deleted the fix-18991 branch September 25, 2025 05:34
@github-actions github-actions Bot added this to the 2026.1 milestone Sep 25, 2025
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.

alpha-52795,808bf5d0: Add-on Store cannot be opened

2 participants