Skip to content

Commit 61ad835

Browse files
chloeYuecursoragent
andcommitted
Merge branch 'release/7.74.3-ota' into release-changelog/7.74.3
Co-authored-by: Cursor <cursoragent@cursor.com>
2 parents 02419d9 + 7421758 commit 61ad835

6 files changed

Lines changed: 25 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
- Fix polymarket adapter contract addresses for Android
1515

16+
## [7.74.2]
17+
18+
### Fixed
19+
20+
- Updated Polymarket adapter contracts so Polymarket prediction transactions continue working after the relayer migration. (#29573)
21+
22+
## [7.74.1]
23+
24+
### Fixed
25+
26+
- Fixed the environmental issue that push notifications not received on Android
27+
1628
## [7.74.0]
1729

1830
### Added

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.74.1"
191-
versionCode 4709
191+
versionCode 4713
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/components/UI/Predict/providers/polymarket/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ export const COLLATERAL_OFFRAMP_ADDRESS =
101101
'0x2957922Eb93258b93368531d39fAcCA3B4dC5854';
102102

103103
export const CTF_COLLATERAL_ADAPTER_ADDRESS =
104-
'0xADa100874d00e3331D00F2007a9c336a65009718';
104+
'0xAdA100Db00Ca00073811820692005400218FcE1f';
105105

106106
export const NEG_RISK_CTF_COLLATERAL_ADAPTER_ADDRESS =
107-
'0xAdA200001000ef00D07553cEE7006808F895c6F1';
107+
'0xadA2005600Dec949baf300f4C6120000bDB6eAab';
108108

109109
export const POLYGON_USDC_CAIP_ASSET_ID =
110110
`${POLYGON_MAINNET_CAIP_CHAIN_ID}/erc20:${MATIC_CONTRACTS.collateral}` as const;

bitrise.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3558,13 +3558,13 @@ app:
35583558
VERSION_NAME: 7.74.1
35593559
- opts:
35603560
is_expand: false
3561-
VERSION_NUMBER: 4709
3561+
VERSION_NUMBER: 4713
35623562
- opts:
35633563
is_expand: false
35643564
FLASK_VERSION_NAME: 7.74.1
35653565
- opts:
35663566
is_expand: false
3567-
FLASK_VERSION_NUMBER: 4709
3567+
FLASK_VERSION_NUMBER: 4713
35683568
- opts:
35693569
is_expand: false
35703570
ANDROID_APK_LINK: ''

ios/MetaMask.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@
12811281
CODE_SIGN_IDENTITY = "Apple Development";
12821282
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
12831283
CODE_SIGN_STYLE = Manual;
1284-
CURRENT_PROJECT_VERSION = 4709;
1284+
CURRENT_PROJECT_VERSION = 4713;
12851285
DEAD_CODE_STRIPPING = YES;
12861286
DEBUG_INFORMATION_FORMAT = dwarf;
12871287
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1350,7 +1350,7 @@
13501350
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
13511351
CODE_SIGN_IDENTITY = "iPhone Distribution";
13521352
CODE_SIGN_STYLE = Manual;
1353-
CURRENT_PROJECT_VERSION = 4709;
1353+
CURRENT_PROJECT_VERSION = 4713;
13541354
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13551355
DEVELOPMENT_TEAM = 48XVW22RCG;
13561356
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1416,7 +1416,7 @@
14161416
CODE_SIGN_IDENTITY = "Apple Development";
14171417
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14181418
CODE_SIGN_STYLE = Manual;
1419-
CURRENT_PROJECT_VERSION = 4709;
1419+
CURRENT_PROJECT_VERSION = 4713;
14201420
DEAD_CODE_STRIPPING = YES;
14211421
DEBUG_INFORMATION_FORMAT = dwarf;
14221422
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1483,7 +1483,7 @@
14831483
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
14841484
CODE_SIGN_IDENTITY = "iPhone Distribution";
14851485
CODE_SIGN_STYLE = Manual;
1486-
CURRENT_PROJECT_VERSION = 4709;
1486+
CURRENT_PROJECT_VERSION = 4713;
14871487
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14881488
DEVELOPMENT_TEAM = 48XVW22RCG;
14891489
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1646,7 +1646,7 @@
16461646
CODE_SIGN_IDENTITY = "Apple Development";
16471647
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16481648
CODE_SIGN_STYLE = Manual;
1649-
CURRENT_PROJECT_VERSION = 4709;
1649+
CURRENT_PROJECT_VERSION = 4713;
16501650
DEAD_CODE_STRIPPING = YES;
16511651
DEBUG_INFORMATION_FORMAT = dwarf;
16521652
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1716,7 +1716,7 @@
17161716
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
17171717
CODE_SIGN_IDENTITY = "iPhone Distribution";
17181718
CODE_SIGN_STYLE = Manual;
1719-
CURRENT_PROJECT_VERSION = 4709;
1719+
CURRENT_PROJECT_VERSION = 4713;
17201720
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
17211721
DEVELOPMENT_TEAM = 48XVW22RCG;
17221722
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;

tests/smoke/predict/predict-open-position.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ const PredictionMarketFeature = async (mockServer: Mockttp) => {
5656
await POLYMARKET_POSITIONS_WITH_WINNINGS_MOCKS(mockServer, false); // do not include winnings. Claim Button is animated and problematic for e2e
5757
};
5858

59-
describe(SmokePredictions('Predictions'), () => {
59+
// Disabling because of https://consensys.slack.com/archives/C02U025CVU4/p1777884336901849
60+
describe.skip(SmokePredictions('Predictions'), () => {
6061
it('opens position on Celtics vs. Nets market', async () => {
6162
await withFixtures(
6263
{

0 commit comments

Comments
 (0)