Skip to content

Commit 505718b

Browse files
OGPoyrazOGPoyraz
authored
Merge branch 'main' into ogp/22135
2 parents 7ab4bed + e1acbc5 commit 505718b

File tree

186 files changed

+12853
-2602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+12853
-2602
lines changed

‎.js.env.example‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,5 +164,8 @@ export MM_PERPS_HIP3_ENABLED="true"
164164
export MM_PERPS_HIP3_ALLOWLIST_MARKETS="" # Allowlist: Empty = enable all markets. Examples: "xyz:XYZ100,xyz:TSLA" or "xyz:*,abc:TSLA"
165165
export MM_PERPS_HIP3_BLOCKLIST_MARKETS="" # Blocklist: Empty = no blocking. Examples: "BTC,ETH" or "xyz:*"
166166

167+
## Predict
168+
export MM_PREDICT_ENABLED="true"
169+
167170
## Card
168171
export MM_CARD_BAANX_API_CLIENT_KEY_DEV=""

‎.yarn/patches/@metamask-network-enablement-controller-npm-3.1.0-1c0cfefdc3.patch‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/dist/NetworkEnablementController.cjs b/dist/NetworkEnablementController.cjs
2+
index d4a40bea9e4ed3c28e347d96e309efe1ff889e81..fab280760de6bd5cdfdbecf01495c2d5616b2e16 100644
3+
--- a/dist/NetworkEnablementController.cjs
4+
+++ b/dist/NetworkEnablementController.cjs
5+
@@ -25,6 +25,11 @@ const getDefaultNetworkEnablementControllerState = () => ({
6+
[controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.Mainnet]]: true,
7+
[controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.LineaMainnet]]: true,
8+
[controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.BaseMainnet]]: true,
9+
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.ArbitrumOne]]: true,
10+
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.BscMainnet]]: true,
11+
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.OptimismMainnet]]: true,
12+
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.PolygonMainnet]]: true,
13+
+ [controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.SeiMainnet]]: true,
14+
},
15+
[utils_1.KnownCaipNamespace.Solana]: {
16+
[keyring_api_1.SolScope.Mainnet]: true,

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ android {
188188
minSdkVersion rootProject.ext.minSdkVersion
189189
targetSdkVersion rootProject.ext.targetSdkVersion
190190
versionName "7.60.0"
191-
versionCode 2818
191+
versionCode 2993
192192
testBuildType System.getProperty('testBuildType', 'debug')
193193
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
194194
manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"

‎app/component-library/components/Form/TextField/foundation/Input/Input.styles.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ const styleSheet = (params: { theme: Theme; vars: InputStyleSheetVars }) => {
4545
// Fix for placeholder text shifting with custom Geist fonts
4646
// Use minimal padding that works cross-platform with preloaded fonts
4747
paddingVertical: Platform.OS === 'ios' ? 2 : 1,
48-
// Ensure consistent line height for custom font baseline alignment
49-
lineHeight: Platform.OS === 'ios' ? 20 : 22,
48+
// Ensure consistent line height for custom font baseline alignment lineHeight: Platform.OS === 'ios' ? 20 : 22,
5049
fontFamily: getFontFamily(textVariant),
50+
fontWeight: theme.typography[textVariant].fontWeight,
5151
fontSize: theme.typography[textVariant].fontSize,
5252
letterSpacing: theme.typography[textVariant].letterSpacing,
5353
// iOS-specific fix for custom font baseline alignment

‎app/component-library/components/Form/TextField/foundation/Input/__snapshots__/Input.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ exports[`Input should render correctly 1`] = `
1414
"color": "#121314",
1515
"fontFamily": "Geist Regular",
1616
"fontSize": 16,
17+
"fontWeight": "400",
1718
"height": 24,
1819
"letterSpacing": 0,
19-
"lineHeight": 20,
2020
"opacity": 1,
2121
"paddingVertical": 2,
2222
"textAlignVertical": "center",

‎app/components/Base/StatusText.js‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,50 @@ const styles = StyleSheet.create({
1515
},
1616
});
1717

18-
export const ConfirmedText = ({ testID, ...props }) => (
19-
<Text testID={testID} bold green style={styles.status} {...props} />
18+
export const ConfirmedText = ({ testID, style: styleProp, ...props }) => (
19+
<Text
20+
testID={testID}
21+
bold
22+
green
23+
style={[styles.status, styleProp]}
24+
{...props}
25+
/>
2026
);
2127
ConfirmedText.propTypes = {
2228
testID: PropTypes.string,
29+
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
2330
};
2431

25-
export const PendingText = ({ testID, ...props }) => {
32+
export const PendingText = ({ testID, style: styleProp, ...props }) => {
2633
const { colors } = useTheme();
2734
return (
2835
<Text
2936
testID={testID}
3037
bold
31-
style={[styles.status, { color: colors.warning.default }]}
38+
style={[styles.status, { color: colors.warning.default }, styleProp]}
3239
{...props}
3340
/>
3441
);
3542
};
3643
PendingText.propTypes = {
3744
testID: PropTypes.string,
45+
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
3846
};
3947

40-
export const FailedText = ({ testID, ...props }) => {
48+
export const FailedText = ({ testID, style: styleProp, ...props }) => {
4149
const { colors } = useTheme();
4250
return (
4351
<Text
4452
testID={testID}
4553
bold
46-
style={[styles.status, { color: colors.error.default }]}
54+
style={[styles.status, { color: colors.error.default }, styleProp]}
4755
{...props}
4856
/>
4957
);
5058
};
5159
FailedText.propTypes = {
5260
testID: PropTypes.string,
61+
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
5362
};
5463

5564
function StatusText({ status, context, testID, ...props }) {
@@ -65,6 +74,8 @@ function StatusText({ status, context, testID, ...props }) {
6574
case 'pending':
6675
case 'Submitted':
6776
case 'submitted':
77+
case 'Unconfirmed':
78+
case 'unconfirmed':
6879
case TransactionStatus.signed:
6980
return (
7081
<PendingText testID={testID} {...props}>

‎app/components/Snaps/SnapUIAddressInput/__snapshots__/SnapUIAddressInput.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ exports[`SnapUIAddressInput renders with an invalid CAIP Account ID 1`] = `
215215
"color": "#121314",
216216
"fontFamily": "Geist Regular",
217217
"fontSize": 16,
218+
"fontWeight": "400",
218219
"height": 46,
219220
"letterSpacing": 0,
220-
"lineHeight": 20,
221221
"opacity": 1,
222222
"paddingVertical": 2,
223223
"textAlignVertical": "center",

‎app/components/Snaps/SnapUIRenderer/__snapshots__/SnapUIRenderer.test.ts.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ exports[`SnapUIRenderer prefills interactive inputs with existing state 1`] = `
290290
"color": "#121314",
291291
"fontFamily": "Geist Regular",
292292
"fontSize": 16,
293+
"fontWeight": "400",
293294
"height": 46,
294295
"letterSpacing": 0,
295-
"lineHeight": 20,
296296
"opacity": 1,
297297
"paddingVertical": 2,
298298
"textAlignVertical": "center",
@@ -448,9 +448,9 @@ exports[`SnapUIRenderer re-renders when the interface changes 1`] = `
448448
"color": "#121314",
449449
"fontFamily": "Geist Regular",
450450
"fontSize": 16,
451+
"fontWeight": "400",
451452
"height": 46,
452453
"letterSpacing": 0,
453-
"lineHeight": 20,
454454
"opacity": 1,
455455
"paddingVertical": 2,
456456
"textAlignVertical": "center",
@@ -542,9 +542,9 @@ exports[`SnapUIRenderer re-renders when the interface changes 1`] = `
542542
"color": "#121314",
543543
"fontFamily": "Geist Regular",
544544
"fontSize": 16,
545+
"fontWeight": "400",
545546
"height": 46,
546547
"letterSpacing": 0,
547-
"lineHeight": 20,
548548
"opacity": 1,
549549
"paddingVertical": 2,
550550
"textAlignVertical": "center",
@@ -699,9 +699,9 @@ exports[`SnapUIRenderer re-syncs state when the interface changes 1`] = `
699699
"color": "#121314",
700700
"fontFamily": "Geist Regular",
701701
"fontSize": 16,
702+
"fontWeight": "400",
702703
"height": 46,
703704
"letterSpacing": 0,
704-
"lineHeight": 20,
705705
"opacity": 1,
706706
"paddingVertical": 2,
707707
"textAlignVertical": "center",
@@ -792,9 +792,9 @@ exports[`SnapUIRenderer re-syncs state when the interface changes 1`] = `
792792
"color": "#121314",
793793
"fontFamily": "Geist Regular",
794794
"fontSize": 16,
795+
"fontWeight": "400",
795796
"height": 46,
796797
"letterSpacing": 0,
797-
"lineHeight": 20,
798798
"opacity": 1,
799799
"paddingVertical": 2,
800800
"textAlignVertical": "center",
@@ -1941,9 +1941,9 @@ exports[`SnapUIRenderer supports fields with multiple components 1`] = `
19411941
"color": "#121314",
19421942
"fontFamily": "Geist Regular",
19431943
"fontSize": 16,
1944+
"fontWeight": "400",
19441945
"height": 46,
19451946
"letterSpacing": 0,
1946-
"lineHeight": 20,
19471947
"opacity": 1,
19481948
"paddingVertical": 2,
19491949
"textAlignVertical": "center",
@@ -2136,9 +2136,9 @@ exports[`SnapUIRenderer supports interactive inputs 1`] = `
21362136
"color": "#121314",
21372137
"fontFamily": "Geist Regular",
21382138
"fontSize": 16,
2139+
"fontWeight": "400",
21392140
"height": 46,
21402141
"letterSpacing": 0,
2141-
"lineHeight": 20,
21422142
"opacity": 1,
21432143
"paddingVertical": 2,
21442144
"textAlignVertical": "center",

‎app/components/Snaps/SnapUIRenderer/components/__snapshots__/form.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ exports[`SnapUIForm will render 1`] = `
144144
"color": "#121314",
145145
"fontFamily": "Geist Regular",
146146
"fontSize": 16,
147+
"fontWeight": "400",
147148
"height": 46,
148149
"letterSpacing": 0,
149-
"lineHeight": 20,
150150
"opacity": 1,
151151
"paddingVertical": 2,
152152
"textAlignVertical": "center",
@@ -362,9 +362,9 @@ exports[`SnapUIForm will render with fields 1`] = `
362362
"color": "#121314",
363363
"fontFamily": "Geist Regular",
364364
"fontSize": 16,
365+
"fontWeight": "400",
365366
"height": 46,
366367
"letterSpacing": 0,
367-
"lineHeight": 20,
368368
"opacity": 1,
369369
"paddingVertical": 2,
370370
"textAlignVertical": "center",

‎app/components/Snaps/SnapUIRenderer/components/__snapshots__/input.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ exports[`SnapUIInput handles disabled input 1`] = `
131131
"color": "#121314",
132132
"fontFamily": "Geist Regular",
133133
"fontSize": 16,
134+
"fontWeight": "400",
134135
"height": 46,
135136
"letterSpacing": 0,
136-
"lineHeight": 20,
137137
"opacity": 1,
138138
"paddingVertical": 2,
139139
"textAlignVertical": "center",
@@ -288,9 +288,9 @@ exports[`SnapUIInput renders with initial value 1`] = `
288288
"color": "#121314",
289289
"fontFamily": "Geist Regular",
290290
"fontSize": 16,
291+
"fontWeight": "400",
291292
"height": 46,
292293
"letterSpacing": 0,
293-
"lineHeight": 20,
294294
"opacity": 1,
295295
"paddingVertical": 2,
296296
"textAlignVertical": "center",

0 commit comments

Comments
 (0)