Skip to content

Commit

Permalink
Merge pull request #711 from artsy/main
Browse files Browse the repository at this point in the history
[pull] main from artsy:main
  • Loading branch information
pull[bot] committed May 30, 2024
2 parents cb63b3c + 8be6fb1 commit 75738c6
Show file tree
Hide file tree
Showing 9 changed files with 277 additions and 215 deletions.
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"appName": "eigen",
"version": "8.40.0",
"version": "8.42.0",
"isAndroidBeta": false,
"codePushReleaseName": "none",
"codePushDist": "none"
Expand Down
25 changes: 25 additions & 0 deletions data/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2645,6 +2645,7 @@ type Artwork implements Node & Searchable & Sellable {
show(active: Boolean, atAFair: Boolean, sort: ShowSorts): Show
shows(active: Boolean, atAFair: Boolean, size: Int, sort: ShowSorts): [Show]
signature(format: Format): String
signatureDetails: String
signatureInfo: ArtworkInfoRow

# size bucket assigned to an artwork based on its dimensions
Expand Down Expand Up @@ -2972,6 +2973,26 @@ type ArtworksCollectionsBatchUpdateSuccess {
removedFromCollections: [Collection]
}

enum ArtworkSignatureTypeEnum {
# The artwork is hand signed by the artist
HAND_SIGNED_BY_ARTIST

# The artwork is not signed
NOT_SIGNED

# The artwork has another type of signature
OTHER

# The artwork is signed in the plate
SIGNED_IN_PLATE

# The artwork is stamped by the artist's estate
STAMPED_BY_ARTIST_ESTATE

# The artwork has a sticker label
STICKER_LABEL
}

enum ArtworkSizes {
LARGE
MEDIUM
Expand Down Expand Up @@ -13516,6 +13537,8 @@ input MyCollectionCreateArtworkInput {
pricePaidCents: Long
pricePaidCurrency: String
provenance: String
signatureDetails: String
signatureTypes: [ArtworkSignatureTypeEnum]
submissionId: String
title: String!
width: String
Expand Down Expand Up @@ -13601,6 +13624,8 @@ input MyCollectionUpdateArtworkInput {
pricePaidCents: Long
pricePaidCurrency: String
provenance: String
signatureDetails: String
signatureTypes: [ArtworkSignatureTypeEnum]
submissionId: String
title: String
width: String
Expand Down
11 changes: 10 additions & 1 deletion fastlane/monkey_patches/supply_custom_promote.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,16 @@ def custom_promote_track
release.user_fraction = nil
end

track_to.releases << release
if track_to
# Its okay to set releases to an array containing the newest release
# Google Play will keep previous releases there this release is a partial rollout
track_to.releases = [release]
else
track_to = AndroidPublisher::Track.new(
track: Supply.config[:track_promote_to],
releases: [release]
)
end

client.update_track(Supply.config[:track_promote_to], track_to)
end
Expand Down
6 changes: 5 additions & 1 deletion src/app/Components/LocationAutocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export const LocationAutocomplete: React.FC<LocationAutocompleteProps> = ({
placeholder,
initialLocation,
onChange,
onFocus,
displayLocation = "",
floating,
FooterComponent,
Expand Down Expand Up @@ -121,7 +122,10 @@ export const LocationAutocomplete: React.FC<LocationAutocompleteProps> = ({
title={title}
placeholder={placeholder}
onChangeText={setQuery}
onFocus={reset}
onFocus={(e) => {
onFocus?.(e)
reset()
}}
onBlur={handleBlur}
value={selectedLocation ? selectedLocation.name : query}
/>
Expand Down
Loading

0 comments on commit 75738c6

Please sign in to comment.