Skip to content

[pull] master from monkeytypegame:master #946

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

Merged
pull merged 3 commits into from
Jul 6, 2026
Merged

[pull] master from monkeytypegame:master #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aec4df
chore: release v26.28.0
Miodec Jul 6, 2026
13bed94
fix: merch banner showing out of stock keycap
Miodec Jul 6, 2026
e543397
fix: unable to clear social profiles
Miodec Jul 6, 2026
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 frontend/src/ts/components/modals/EditProfileModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ export function EditProfile() {
bio: value.bio,
keyboard: value.keyboard,
socialProfiles: {
twitter: value.twitter || undefined,
github: value.github || undefined,
website: value.website || undefined,
twitter: value.twitter,
github: value.github,
website: value.website,
},
showActivityOnPublicProfile: value.showActivityOnPublicProfile,
};
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/ts/elements/merch-banner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ export function showIfNotClosedBefore(): void {
icon: "fas fa-fw fa-shopping-bag",
customContent: (
<>
New merch store now open, including a limited edition metal keycap!{" "}
Check out our merch store!{" "}
<a target="_blank" rel="noopener" href="https://mktp.co/merch">
monkeytype.store
</a>
</>
),
imagePath: "/images/merch3.png",
imagePath: "/images/merch2.png",
onClose: () => {
closed.set(true);
},
Expand Down
Loading
Loading