Skip to content
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.

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

your bets #3359

Merged
merged 8 commits into from
Jan 17, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
changes
ingawei committed Jan 16, 2025
commit fa3fc67b7dbd01c5afb3f0455c187db0b82741b8
4 changes: 2 additions & 2 deletions mani/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -93,8 +93,8 @@ android {
applicationId 'com.manifold.mani'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 66
versionName "2.0.58"
versionCode 67
versionName "2.0.59"
missingDimensionStrategy 'store', 'play'
}
signingConfigs {
10 changes: 9 additions & 1 deletion mani/app.json
Original file line number Diff line number Diff line change
@@ -22,7 +22,11 @@
"slug": "mani",
"owner": "manifold-markets",
"jsEngine": "hermes",
<<<<<<< HEAD
"version": "2.0.58",
=======
"version": "2.0.59",
>>>>>>> main
"orientation": "portrait",
"icon": "./assets/images/logo.png",
"userInterfaceStyle": "light",
@@ -78,7 +82,7 @@
"backgroundColor": "#4337C9"
},
"package": "com.manifold.mani",
"versionCode": 66
"versionCode": 67
},
"ios": {
"infoPlist": {
@@ -94,7 +98,11 @@
"applinks:manifold.markets",
"webcredentials:manifold.markets"
],
<<<<<<< HEAD
"buildNumber": "1.0.53"
=======
"buildNumber": "1.0.54"
>>>>>>> main
},
"experiments": {
"tsconfigPaths": true,
3 changes: 1 addition & 2 deletions mani/app/[contractSlug].tsx
Original file line number Diff line number Diff line change
@@ -45,8 +45,7 @@ function ContractPageLoadingContent(props: { contractSlug: string }) {
})

const { manaContract, cashContract } = data ?? {}

if (!data || ![manaContract?.id, cashContract?.id].includes(contractId))
if (!data || ![manaContract?.slug, cashContract?.slug].includes(contractSlug))
return <ContractPageLoading />

return <ContractPageContent contractProps={data} />
6 changes: 5 additions & 1 deletion mani/ios/Mani/Info.plist
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>2.0.58</string>
<string>2.0.59</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -40,7 +40,11 @@
</dict>
</array>
<key>CFBundleVersion</key>
<<<<<<< HEAD
<string>1.0.53</string>
=======
<string>1.0.54</string>
>>>>>>> main
<key>LSMinimumSystemVersion</key>
<string>12.0</string>
<key>LSRequiresIPhoneOS</key>
You are viewing a condensed version of this merge commit. You can view the full changes here.