Skip to content

chore: cp-7.59.0 revert font preloader changes from #21199 #22342

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
merged 2 commits into from
Nov 11, 2025
+278 −615
Merged

chore: cp-7.59.0 revert font preloader changes from #21199 #22342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3908a4
Revert "fix: font rendering issues by updating font preloader to prel…
georgewrmarshall Nov 7, 2025
09ccad9
chore: updating snapshot
georgewrmarshall Nov 11, 2025
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
4 changes: 2 additions & 2 deletions app/component-library/components/Form/TextField/foundation/Input/Input.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ const styleSheet = (params: { theme: Theme; vars: InputStyleSheetVars }) => {
// Fix for placeholder text shifting with custom Geist fonts
// Use minimal padding that works cross-platform with preloaded fonts
paddingVertical: Platform.OS === 'ios' ? 2 : 1,
// Ensure consistent line height for custom font baseline alignment
lineHeight: Platform.OS === 'ios' ? 20 : 22,
// Ensure consistent line height for custom font baseline alignment lineHeight: Platform.OS === 'ios' ? 20 : 22,
Copy link
Contributor Author

@georgewrmarshall georgewrmarshall Nov 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This seems like a mistake that we want to keep I'll create a follow up PR to fix the inputs specifically

Copy link

@cursor cursor bot Nov 10, 2025

Choose a reason for hiding this comment

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

Bug: Merged Comments Break Code

The comment and code are merged on the same line without proper line break. The comment // Ensure consistent line height for custom font baseline alignment is concatenated directly with the code lineHeight: Platform.OS === 'ios' ? 20 : 22, on line 48, which will cause a syntax error. The newline character between the comment and the code statement was accidentally removed during the revert.

Fix in Cursor Fix in Web

fontFamily: getFontFamily(textVariant),
fontWeight: theme.typography[textVariant].fontWeight,
fontSize: theme.typography[textVariant].fontSize,
letterSpacing: theme.typography[textVariant].letterSpacing,
// iOS-specific fix for custom font baseline alignment
Expand Down
2 changes: 1 addition & 1 deletion ...nent-library/components/Form/TextField/foundation/Input/__snapshots__/Input.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ exports[`Input should render correctly 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 24,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
2 changes: 1 addition & 1 deletion app/components/Snaps/SnapUIAddressInput/__snapshots__/SnapUIAddressInput.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@ exports[`SnapUIAddressInput renders with an invalid CAIP Account ID 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
14 changes: 7 additions & 7 deletions app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ exports[`SnapUIRenderer prefills interactive inputs with existing state 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -448,9 +448,9 @@ exports[`SnapUIRenderer re-renders when the interface changes 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -542,9 +542,9 @@ exports[`SnapUIRenderer re-renders when the interface changes 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -699,9 +699,9 @@ exports[`SnapUIRenderer re-syncs state when the interface changes 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -792,9 +792,9 @@ exports[`SnapUIRenderer re-syncs state when the interface changes 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -1941,9 +1941,9 @@ exports[`SnapUIRenderer supports fields with multiple components 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -2136,9 +2136,9 @@ exports[`SnapUIRenderer supports interactive inputs 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
4 changes: 2 additions & 2 deletions app/components/Snaps/SnapUIRenderer/components/__snapshots__/form.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ exports[`SnapUIForm will render 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -362,9 +362,9 @@ exports[`SnapUIForm will render with fields 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
4 changes: 2 additions & 2 deletions app/components/Snaps/SnapUIRenderer/components/__snapshots__/input.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ exports[`SnapUIInput handles disabled input 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -288,9 +288,9 @@ exports[`SnapUIInput renders with initial value 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
4 changes: 4 additions & 0 deletions app/components/UI/Bridge/Views/BridgeView/__snapshots__/BridgeView.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ exports[`BridgeView Bottom Content blurs input when opening QuoteExpiredModal 1`
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 40,
"fontWeight": "400",
"height": 50,
"letterSpacing": 0,
"lineHeight": 50,
Expand Down Expand Up @@ -803,6 +804,7 @@ exports[`BridgeView Bottom Content blurs input when opening QuoteExpiredModal 1`
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 40,
"fontWeight": "400",
"height": 50,
"letterSpacing": 0,
"lineHeight": 50,
Expand Down Expand Up @@ -2079,6 +2081,7 @@ exports[`BridgeView renders 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 40,
"fontWeight": "400",
"height": 50,
"letterSpacing": 0,
"lineHeight": 50,
Expand Down Expand Up @@ -2463,6 +2466,7 @@ exports[`BridgeView renders 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 40,
"fontWeight": "400",
"height": 50,
"letterSpacing": 0,
"lineHeight": 50,
Expand Down
2 changes: 1 addition & 1 deletion ...ge/components/BridgeDestTokenSelector/__snapshots__/BridgeDestTokenSelector.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,9 +867,9 @@ exports[`BridgeDestTokenSelector renders with initial state and displays tokens
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
2 changes: 1 addition & 1 deletion ...omponents/BridgeSourceTokenSelector/__snapshots__/BridgeSourceTokenSelector.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,9 +872,9 @@ exports[`BridgeSourceTokenSelector renders with initial state and displays token
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
4 changes: 2 additions & 2 deletions ...omponents/UI/Card/Views/CardAuthentication/__snapshots__/CardAuthentication.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,9 +658,9 @@ exports[`CardAuthentication Component Login Step - Component Rendering matches l
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -771,9 +771,9 @@ exports[`CardAuthentication Component Login Step - Component Rendering matches l
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 46,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
4 changes: 2 additions & 2 deletions ...omponents/UI/Ramp/Aggregator/Views/Settings/__snapshots__/ActivationKeyForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,9 @@ exports[`AddActivationKey renders correctly 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -695,9 +695,9 @@ exports[`AddActivationKey renders correctly 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
8 changes: 4 additions & 4 deletions ...amp/Aggregator/components/FiatSelectorModal/__snapshots__/FiatSelectorModal.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,9 +619,9 @@ exports[`FiatSelectorModal renders the modal with currency list 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -1557,9 +1557,9 @@ exports[`FiatSelectorModal search displays filtered currencies when search strin
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -2495,9 +2495,9 @@ exports[`FiatSelectorModal search displays filtered currencies when search strin
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down Expand Up @@ -3433,9 +3433,9 @@ exports[`FiatSelectorModal search displays max 20 results 1`] = `
"color": "#121314",
"fontFamily": "Geist Regular",
"fontSize": 16,
"fontWeight": "400",
"height": 38,
"letterSpacing": 0,
"lineHeight": 20,
"opacity": 1,
"paddingVertical": 2,
"textAlignVertical": "center",
Expand Down
Loading