fixed conflicts

CHANGELOG.md

@@ -1,3 +1,23 @@
+# v25.32.6 (Wed Mar 18 2020)
+
+#### 🐛  Bug Fix
+
+- Update remaining mediator calls [#3283](https://github.com/artsy/reaction/pull/3283) ([@eessex](https://github.com/eessex))
+- [AUCT-930] static id verification processing page [#3274](https://github.com/artsy/reaction/pull/3274) ([@bhoggard](https://github.com/bhoggard))
+
+#### 🏠  Internal
+
+- Update dep @artsy/palette from 7.1.2 to v7.2.0 [#3254](https://github.com/artsy/reaction/pull/3254) ([@renovate-bot](https://github.com/renovate-bot) [@renovate[bot]](https://github.com/renovate[bot]))
+
+#### Authors: 4
+
+- [@renovate[bot]](https://github.com/renovate[bot])
+- Barry Hoggard ([@bhoggard](https://github.com/bhoggard))
+- Eve Essex ([@eessex](https://github.com/eessex))
+- WhiteSource Renovate ([@renovate-bot](https://github.com/renovate-bot))
+
+---
+
 # v25.32.5 (Wed Mar 18 2020)
 
 #### 🐛  Bug Fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artsy/reaction",
-  "version": "25.32.5",
+  "version": "25.32.8",
   "description": "Force’s React Components",
   "main": "dist/index.js",
   "repository": "https://github.com/artsy/reaction.git",
@@ -52,7 +52,7 @@
   "devDependencies": {
     "@artsy/auto-config": "1.0.2",
     "@artsy/lint-changed": "3.0.3",
-    "@artsy/palette": "7.1.2",
+    "@artsy/palette": "7.2.0",
     "@babel/cli": "7.0.0",
     "@babel/core": "7.7.2",
     "@babel/plugin-proposal-class-properties": "7.3.4",

src/Apps/Artist/Routes/AuctionResults/ArtistAuctionResultItem.tsx

@@ -9,18 +9,19 @@ import {
   Row,
   Sans,
 } from "@artsy/palette"
+import { Box, Button, Flex, Separator, Spacer } from "@artsy/palette"
 import { ArtistAuctionResultItem_auctionResult } from "__generated__/ArtistAuctionResultItem_auctionResult.graphql"
 import { AnalyticsSchema, SystemContextProps } from "Artsy"
 import { Mediator, SystemContext } from "Artsy"
+import { ModalType } from "Components/Authentication/Types"
 import { DateTime } from "luxon"
 import React, { SFC, useContext, useState } from "react"
 import { createFragmentContainer, graphql } from "react-relay"
-import styled from "styled-components"
-import { Media } from "Utils/Responsive"
-
-import { Box, Button, Flex, Separator, Spacer } from "@artsy/palette"
 import { useTracking } from "react-tracking"
+import styled from "styled-components"
 import { get } from "Utils/get"
+import { openAuthModal } from "Utils/openAuthModal"
+import { Media } from "Utils/Responsive"
 import { ImageWithFallback } from "./Components/ImageWithFallback"
 
 export interface Props extends SystemContextProps {
@@ -362,8 +363,8 @@ const renderPricing = (salePrice, saleDate, user, mediator, size) => {
         mb={buttonMargin}
         onClick={() => {
           mediator &&
-            mediator.trigger("open:auth", {
-              mode: "register",
+            openAuthModal(mediator, {
+              mode: ModalType.login,
               copy: "Log in to see full auction records — for free",
             })
         }}
@@ -396,8 +397,8 @@ const renderEstimate = (estimatedPrice, user, mediator, size) => {
       <Link
         onClick={() => {
           mediator &&
-            mediator.trigger("open:auth", {
-              mode: "register",
+            openAuthModal(mediator, {
+              mode: ModalType.signup,
               copy: "Sign up to see full auction records — for free",
             })
         }}
@@ -430,8 +431,8 @@ const renderRealizedPrice = (estimatedPrice, user, mediator, size) => {
       <Link
         onClick={() => {
           mediator &&
-            mediator.trigger("open:auth", {
-              mode: "register",
+            openAuthModal(mediator, {
+              mode: ModalType.signup,
               copy: "Sign up to see full auction records — for free",
             })
         }}

src/Apps/Artwork/Components/ArtworkDetails/RequestConditionReport.tsx

@@ -20,6 +20,7 @@ import {
 import { SystemQueryRenderer as QueryRenderer } from "Artsy/Relay/SystemQueryRenderer"
 import { ErrorModal } from "Components/Modal/ErrorModal"
 import createLogger from "Utils/logger"
+import { openAuthModal } from "Utils/openAuthModal"
 
 import { RequestConditionReport_artwork } from "__generated__/RequestConditionReport_artwork.graphql"
 import { RequestConditionReport_me } from "__generated__/RequestConditionReport_me.graphql"
@@ -28,6 +29,7 @@ import {
   RequestConditionReportMutationResponse,
 } from "__generated__/RequestConditionReportMutation.graphql"
 import { RequestConditionReportQuery } from "__generated__/RequestConditionReportQuery.graphql"
+import { ModalType } from "Components/Authentication/Types"
 
 const logger = createLogger(
   "Apps/Artwork/Components/ArtworkDetails/RequestConditionReport"
@@ -93,14 +95,14 @@ export const RequestConditionReport: React.FC<RequestConditionReportProps> = pro
   }
 
   const handleLoginClick = () => {
+    // TODO: do we need this tracking?
     trackEvent({
       action_type: Schema.ActionType.Click,
       subject: Schema.Subject.Login,
       sale_artwork_id: artwork.saleArtwork.internalID,
     })
-
-    mediator.trigger("open:auth", {
-      mode: "login",
+    openAuthModal(mediator, {
+      mode: ModalType.login,
       redirectTo: location.href,
     })
   }

src/Apps/Artwork/Components/ArtworkSidebar/ArtworkSidebarCommercial.tsx

@@ -16,6 +16,7 @@ import { ArtworkSidebarCommercialOrderMutation } from "__generated__/ArtworkSide
 import { Mediator, SystemContext } from "Artsy"
 import { track } from "Artsy/Analytics"
 import * as Schema from "Artsy/Analytics/Schema"
+import { ModalType } from "Components/Authentication/Types"
 import { ErrorModal } from "Components/Modal/ErrorModal"
 import currency from "currency.js"
 import { Router } from "found"
@@ -29,6 +30,7 @@ import {
 import { ErrorWithMetadata } from "Utils/errors"
 import { get } from "Utils/get"
 import createLogger from "Utils/logger"
+import { openAuthModal } from "Utils/openAuthModal"
 import { ArtworkSidebarSizeInfoFragmentContainer as SizeInfo } from "./ArtworkSidebarSizeInfo"
 
 type EditionSet = ArtworkSidebarCommercial_artwork["edition_sets"][0]
@@ -249,8 +251,8 @@ export class ArtworkSidebarCommercialContainer extends React.Component<
         }
       })
     } else {
-      mediator.trigger("open:auth", {
-        mode: "login",
+      openAuthModal(mediator, {
+        mode: ModalType.login,
         redirectTo: location.href,
       })
     }
@@ -338,8 +340,8 @@ export class ArtworkSidebarCommercialContainer extends React.Component<
         }
       })
     } else {
-      mediator.trigger("open:auth", {
-        mode: "login",
+      openAuthModal(mediator, {
+        mode: ModalType.login,
         redirectTo: location.href,
       })
     }

src/Apps/IdentityVerification/Processing.tsx

@@ -0,0 +1,36 @@
+import { Box, Button, Sans, Serif } from "@artsy/palette"
+import { AppContainer } from "Apps/Components/AppContainer"
+import { RouterLink } from "Artsy/Router/RouterLink"
+import React from "react"
+import { Title as HeadTitle } from "react-head"
+
+export const Processing: React.FC = () => {
+  return (
+    <AppContainer>
+      <HeadTitle>Artsy | ID Verification</HeadTitle>
+
+      <Box px={[2, 3]} mb={6} mt={4}>
+        <Box mx="auto" width={[335, "80%"]} maxWidth="400px" textAlign="center">
+          <Serif size="6" color="black100">
+            Your verification is processing
+          </Serif>
+
+          <Sans size="4" color="black100" mt={2}>
+            Thank you for completing identity verification. Your verification is
+            processing and may take up to 5 minutes to complete.
+          </Sans>
+          <Sans size="4" color="black100" mt={2}>
+            In the meantime, you can still browse on Artsy.
+          </Sans>
+          <RouterLink to="/">
+            <Button block width="100%" mt={2}>
+              Return home
+            </Button>
+          </RouterLink>
+        </Box>
+      </Box>
+    </AppContainer>
+  )
+}
+
+export default Processing

src/Apps/IdentityVerification/__tests__/routes.test.tsx

@@ -42,4 +42,13 @@ describe("IdentityVerification/routes", () => {
 
     expect(status).toBe(200)
   })
+
+  it("renders the Identity Verification processing page", async () => {
+    const { status } = await render(
+      "/identity-verification/processing",
+      IdentityVerificationAppQueryResponseFixture
+    )
+
+    expect(status).toBe(200)
+  })
 })

src/Apps/IdentityVerification/routes.tsx

@@ -2,10 +2,25 @@ import loadable from "@loadable/component"
 import { RouteConfig } from "found"
 import { graphql } from "react-relay"
 
+const IdentityVerificationApp = loadable(() =>
+  import("./IdentityVerificationApp")
+)
+const Processing = loadable(() => import("./Processing"))
+
 export const routes: RouteConfig[] = [
+  {
+    path: "/identity-verification/processing",
+    getComponent: () => Processing,
+    prepare: () => {
+      Processing.preload()
+    },
+  },
   {
     path: "/identity-verification/:id",
-    getComponent: () => loadable(() => import("./IdentityVerificationApp")),
+    getComponent: () => IdentityVerificationApp,
+    prepare: () => {
+      IdentityVerificationApp.preload()
+    },
     query: graphql`
       query routes_IdentityVerificationAppQuery($id: String!)
         @raw_response_type {

yarn.lock

@@ -27,10 +27,10 @@
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
 
-"@artsy/palette@7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@artsy/palette/-/palette-7.1.2.tgz#c561dea5fbb69df90b8c09a9e00361b3be7e9851"
-  integrity sha512-/g8NZGEIdGNOSV3rlYce4qFKhkk8xdWaxE/SgFBBpPJdE4OlUZDe9sBPJkjj5EIf8XZqd177uXq7Z9lm4qVYAg==
+"@artsy/palette@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@artsy/palette/-/palette-7.2.0.tgz#2d9c77094012824ee645e6c049d8f5e7e397da2e"
+  integrity sha512-oTkc9wapnnOIWEYEWaSZLdNqGfVuscsqXB3vvIo1k0CS8kIMbiWV3M1aH5NSecrAqLRhCp1b3AO6/vMj6Iiudw==
   dependencies:
     babel-plugin-styled-components "^1.10.0"
     d3-interpolate "^1.3.2"