Merge pull request #1856 from artsy/black60

[Artwork view] - Uses black60 for reserve met
artsy · Sep 12, 2019 · ff8ff59 · ff8ff59
2 parents c0ea85a + b005bd7
commit ff8ff59
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Example/Emission/ARRootViewController.m b/Example/Emission/ARRootViewController.m
@@ -280,7 +280,7 @@ - (ARCellData *)jumpToArtworkWithInquireable
 - (ARCellData *)jumpToArtworkInAuction
 {
   return [self tappableCellDataWithTitle:@"Artwork In Auction" selection:^{
-    id viewController = [[ARArtworkComponentViewController alloc] initWithArtworkID:@"paul-cadden-painting"];
+    id viewController = [[ARArtworkComponentViewController alloc] initWithArtworkID:@"lucha-rodriguez-untitled"];
     [self.navigationController pushViewController:viewController animated:YES];
   }];
 }

diff --git a/src/lib/Scenes/Artwork/Components/AuctionPrice.tsx b/src/lib/Scenes/Artwork/Components/AuctionPrice.tsx
@@ -30,7 +30,6 @@ export class AuctionPrice extends React.Component<AuctionPriceProps> {
       }
     }
     if (reserveMessage) {
-      reserveMessage = reserveMessage + "."
       bidTextParts.push(reserveMessage)
     }
     return bidTextParts.join(", ")
@@ -82,7 +81,7 @@ export class AuctionPrice extends React.Component<AuctionPriceProps> {
           </Sans>
         </Flex>
         <Flex flexDirection="row" flexWrap="nowrap" justifyContent="space-between">
-          <Sans size="2" pr={1}>
+          <Sans size="2" pr={1} color="black60">
             {this.bidText(bidsPresent, bidsCount)}
           </Sans>
           {myMaxBid && (

diff --git a/src/lib/Scenes/Artwork/Components/__tests__/AuctionPrice-tests.tsx b/src/lib/Scenes/Artwork/Components/__tests__/AuctionPrice-tests.tsx
@@ -99,7 +99,7 @@ describe("AuctionPrice", () => {
       const texts = wrapper.find(Sans).map(x => x.text())
 
       expect(texts).toContain("Starting bid")
-      expect(texts).toContain("This work has a reserve.")
+      expect(texts).toContain("This work has a reserve")
       expect(texts).toContain("$3,000")
     })
   })
@@ -110,7 +110,7 @@ describe("AuctionPrice", () => {
       const texts = wrapper.find(Sans).map(x => x.text())
 
       expect(texts).toContain("Current bid")
-      expect(texts).toContain("2 bids, reserve not met.")
+      expect(texts).toContain("2 bids, reserve not met")
       expect(texts).toContain("$10,000")
     })
   })
@@ -121,7 +121,7 @@ describe("AuctionPrice", () => {
       const texts = wrapper.find(Sans).map(x => x.text())
 
       expect(texts).toContain("Current bid")
-      expect(texts).toContain("2 bids, reserve met.")
+      expect(texts).toContain("2 bids, reserve met")
       expect(texts).toContain("$500")
     })
   })