Skip to content

feat: enable 24.04 upgrades for 22.04#380

Open
mmstick wants to merge 10 commits intomasterfrom
upgrade
Open

feat: enable 24.04 upgrades for 22.04#380
mmstick wants to merge 10 commits intomasterfrom
upgrade

Conversation

@mmstick
Copy link
Member

@mmstick mmstick commented Jan 15, 2026

Currently testing. It would be ideal to merge this as master_jammy and then allow master to target >=24.04. Then we can drop the GTK library entirely on 24.04 and make changes that are required by pop-upgrade integrations into cosmic-settings.

@jacobgkau jacobgkau requested a review from a team January 15, 2026 20:07
Copy link
Member

@jacobgkau jacobgkau left a comment

Choose a reason for hiding this comment

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

When running through this for the first time in a virtual machine, I saw the first upgrade dialog open with a lot of empty space at the bottom:

Screenshot_2026-01-15_13-04-37

Let's also try to better match the text to what's shown in the Figma file linked in #379:

Screenshot_2026-01-15_13-06-23

In particular, the first line shouldn't be there, and the paragraph doesn't need to be a bullet point. Are we able to have hyperlinks in this dialog?

The second dialog also looks identical to the first at this point, where they should be different dialogs per the mockup.

@jacobgkau
Copy link
Member

I'm assuming Michael's aware of these things, but just to keep a record of where it's at:

  • The link in the dialog isn't rendering as a link (and the dialog still has blank space at the bottom).
Screenshot_2026-01-21_10-48-42
  • Looks like this is currently stuck in a loop going to the first dialog. The button always says "Start Upgrade", and the progress bar always says it's downloading.

@mmstick mmstick requested review from a team and jacobgkau February 3, 2026 15:52
Copy link
Member

@jacobgkau jacobgkau left a comment

Choose a reason for hiding this comment

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

The good news is that this is generally working now!

Both of the upgrade dialogs still have a lot of empty space beneath them when opened:

Image Image

I checked a physical machine to confirm this isn't just a quirk with my VM, but it happened there, too:

Image

So that will need to be fixed.

@jacobgkau
Copy link
Member

Also, this is the main page in the Figma mockup:

Screenshot_2026-02-03_11-59-36

This is what it actually looks like right now:

Screenshot from 2026-02-03 12-00-14

It looks like we need to add a period to both the subtext for the main upgrade row and the subtext for the recovery upgrade row (and change "keeping" to "retaining" in the latter).

@pop-os/ux Would you be open to making the subtext for the upgrade Includes the COSMIC desktop environment. instead of Includes COSMIC desktop environment.? The latter sounds a little broken to me without the definite article.

@jacobgkau
Copy link
Member

That fixed the oversized dialogs:

Screenshot_2026-02-04_10-40-23 Screenshot_2026-02-04_10-51-11

The first one has to scroll now, but that's better than having all that empty space.

@jacobgkau
Copy link
Member

Maria approved changing the new sublabel to Includes the COSMIC desktop environment. in Mattermost. Also needs the other copy tweaks mentioned in #380 (comment).

I think we should fix #370 and #371 before releasing this, since they're both low-hanging fruit with logically easy solutions that several people were hit with doing early upgrades. I've got a fix for the latter in progress at #382.

@jacobgkau
Copy link
Member

jacobgkau commented Feb 10, 2026

This is what the mockup looks like for the final dialog:

Screenshot_2026-02-10_13-05-36

This is what the dialog currently looks like on a laptop on battery power (the first sentence doesn't show up if it's plugged in when the dialog's opened):

Screenshot from 2026-02-10 14-53-12

@pop-os/ux Is this close enough, or should we add the line break and remove the bold to better match the mockup?

@maria-komarova
Copy link
Contributor

Bold is fine as is. The line break would help since there is an icon on the left. I don't know if we can make the dialog a bit narrower but that might help too.

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.

3 participants