Adding signature pending orderStatus

src/api/operator/types.ts

@@ -19,7 +19,8 @@ export interface FeeInformation {
 
 export type OrderKind = 'sell' | 'buy'
 
-export type OrderStatus = 'open' | 'filled' | 'canceled' | 'expired'
+export type OrderStatus = 'open' | 'filled' | 'cancelled' | 'expired' | 'signing'
+export type RawOrderStatusFromAPI = 'presignaturePending' | 'open' | 'fullfilled' | 'cancelled' | 'expired'
 
 // Raw API response
 export type RawOrder = {

src/apps/explorer/const.ts

@@ -2,7 +2,7 @@ import { AnalyticsDimension, Network } from 'types'
 
 /** Explorer app constants */
 export const ORDER_QUERY_INTERVAL = 10000 // in ms
-export const ORDERS_QUERY_INTERVAL = 30000 // in ms
+export const ORDERS_QUERY_INTERVAL = 25000 // in ms
 export const ORDERS_HISTORY_MINUTES_AGO = 10 // in minutes
 
 export const DISPLAY_TEXT_COPIED_CHECK = 1000 // in ms

src/components/orders/StatusLabel/StatusLabel.stories.tsx

@@ -20,15 +20,18 @@ Filled.args = { status: 'filled' }
 export const Expired = Template.bind({})
 Expired.args = { status: 'expired' }
 
-export const Canceled = Template.bind({})
-Canceled.args = { status: 'canceled' }
+export const Cancelled = Template.bind({})
+Cancelled.args = { status: 'cancelled' }
 
 export const Open = Template.bind({})
 Open.args = { status: 'open' }
 
+export const Signing = Template.bind({})
+Signing.args = { status: 'signing' }
+
 export const OpenPartiallyFilled = Template.bind({})
 OpenPartiallyFilled.args = { status: 'open', partiallyFilled: true }
 export const ExpiredPartiallyFilled = Template.bind({})
 ExpiredPartiallyFilled.args = { status: 'expired', partiallyFilled: true }
-export const CanceledPartiallyFilled = Template.bind({})
-CanceledPartiallyFilled.args = { status: 'canceled', partiallyFilled: true }
+export const CancelledPartiallyFilled = Template.bind({})
+CancelledPartiallyFilled.args = { status: 'cancelled', partiallyFilled: true }

src/components/orders/StatusLabel/index.tsx

@@ -1,7 +1,14 @@
 import React from 'react'
-import styled, { DefaultTheme } from 'styled-components'
+import styled, { DefaultTheme, css, keyframes, FlattenSimpleInterpolation } from 'styled-components'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faCheckCircle, faCircleNotch, faClock, faTimesCircle, IconDefinition } from '@fortawesome/free-solid-svg-icons'
+import {
+  faCheckCircle,
+  faCircleNotch,
+  faClock,
+  faTimesCircle,
+  IconDefinition,
+  faKey,
+} from '@fortawesome/free-solid-svg-icons'
 
 import { OrderStatus } from 'api/operator'
 
@@ -12,7 +19,7 @@ function setStatusColors({ theme, status }: { theme: DefaultTheme; status: Order
 
   switch (status) {
     case 'expired':
-    case 'canceled':
+    case 'cancelled':
       text = theme.orange
       background = theme.orangeOpacity
       break
@@ -21,6 +28,7 @@ function setStatusColors({ theme, status }: { theme: DefaultTheme; status: Order
       background = theme.greenOpacity
       break
     case 'open':
+    case 'signing':
       text = theme.labelTextOpen
       background = theme.labelBgOpen
       break
@@ -37,8 +45,16 @@ const Wrapper = styled.div`
   align-items: center;
   font-size: ${({ theme }): string => theme.fontSizeDefault};
 `
+const frameAnimation = keyframes`
+    100% {
+      -webkit-mask-position: left;
+    }
+`
+type ShimmingProps = {
+  shimming?: boolean
+}
 
-const Label = styled.div<DisplayProps>`
+const Label = styled.div<DisplayProps & ShimmingProps>`
   font-weight: ${({ theme }): string => theme.fontBold};
   text-transform: capitalize;
   border-radius: 0.4rem;
@@ -47,6 +63,17 @@ const Label = styled.div<DisplayProps>`
   display: flex;
   align-items: center;
   ${({ theme, status }): string => setStatusColors({ theme, status })}
+  ${({ shimming }): FlattenSimpleInterpolation | null =>
+    shimming
+      ? css`
+          display: inline-block;
+          -webkit-mask: linear-gradient(-60deg, #000 30%, #0005, #000 70%) right/300% 100%;
+          mask: linear-gradient(-60deg, #000 30%, #0005, #000 70%) right/300% 100%;
+          background-repeat: no-repeat;
+          animation: shimmer 1.5s infinite;
+          animation-name: ${frameAnimation};
+        `
+      : null}
 `
 
 const StyledFAIcon = styled(FontAwesomeIcon)`
@@ -65,8 +92,10 @@ function getStatusIcon(status: OrderStatus): IconDefinition {
       return faClock
     case 'filled':
       return faCheckCircle
-    case 'canceled':
+    case 'cancelled':
       return faTimesCircle
+    case 'signing':
+      return faKey
     case 'open':
       return faCircleNotch
   }
@@ -83,10 +112,11 @@ export type Props = DisplayProps & { partiallyFilled: boolean }
 
 export function StatusLabel(props: Props): JSX.Element {
   const { status, partiallyFilled } = props
+  const shimming = status === 'signing'
 
   return (
     <Wrapper>
-      <Label status={status}>
+      <Label status={status} shimming={shimming}>
         <StatusIcon status={status} />
         {status}
       </Label>

src/utils/operator.ts

@@ -5,7 +5,7 @@ import { calculatePrice, invertPrice, TokenErc20 } from '@gnosis.pm/dex-js'
 
 import { FILLED_ORDER_EPSILON, ONE_BIG_NUMBER, ZERO_BIG_NUMBER } from 'const'
 
-import { Order, OrderStatus, RawOrder, RawTrade, Trade } from 'api/operator/types'
+import { Order, OrderStatus, RawOrderStatusFromAPI, RawOrder, RawTrade, Trade } from 'api/operator/types'
 
 import { formattingAmountPrecision, formatSmartMaxPrecision } from 'utils'
 
@@ -40,13 +40,23 @@ function isOrderPartiallyFilled(order: RawOrder): boolean {
   }
 }
 
+export interface RawOrderWithStatus extends RawOrder {
+  status: RawOrderStatusFromAPI
+}
+
+function isOrderPresigning(order: RawOrder): boolean {
+  return (order as RawOrderWithStatus).status === 'presignaturePending'
+}
+
 export function getOrderStatus(order: RawOrder): OrderStatus {
   if (isOrderFilled(order)) {
     return 'filled'
   } else if (order.invalidated) {
-    return 'canceled'
+    return 'cancelled'
   } else if (isOrderExpired(order)) {
     return 'expired'
+  } else if (isOrderPresigning(order)) {
+    return 'signing'
   } else {
     return 'open'
   }

test/utils/operator/orderStatus.test.ts

@@ -1,6 +1,6 @@
-import { RawOrder } from 'api/operator'
+import { RawOrder, RawOrderStatusFromAPI } from 'api/operator'
 
-import { getOrderStatus } from 'utils'
+import { getOrderStatus, RawOrderWithStatus } from 'utils'
 
 import { RAW_ORDER } from '../../data'
 import { mockTimes, DATE } from '../../testHelpers'
@@ -121,7 +121,7 @@ describe('Canceled status', () => {
       buyAmount: '10000',
       invalidated: true,
     }
-    expect(getOrderStatus(order)).toEqual('canceled')
+    expect(getOrderStatus(order)).toEqual('cancelled')
   })
   test('Sell order', () => {
     const order: RawOrder = {
@@ -130,7 +130,7 @@ describe('Canceled status', () => {
       sellAmount: '10000',
       invalidated: true,
     }
-    expect(getOrderStatus(order)).toEqual('canceled')
+    expect(getOrderStatus(order)).toEqual('cancelled')
   })
   test('Expired and invalidated', () => {
     const order: RawOrder = {
@@ -140,7 +140,7 @@ describe('Canceled status', () => {
       invalidated: true,
       validTo: _getPastTimestamp(),
     }
-    expect(getOrderStatus(order)).toEqual('canceled')
+    expect(getOrderStatus(order)).toEqual('cancelled')
   })
 })
 
@@ -241,3 +241,49 @@ describe('Open status', () => {
     })
   })
 })
+
+describe('Presignature pending status', () => {
+  describe('Buy order', () => {
+    test('signature is pending', () => {
+      const statusFetched: RawOrderStatusFromAPI = 'presignaturePending'
+
+      const order: RawOrderWithStatus = {
+        ...RAW_ORDER,
+        kind: 'buy',
+        status: statusFetched,
+        buyAmount: '10000',
+        executedBuyAmount: '0',
+        validTo: _getCurrentTimestamp(),
+      }
+      expect(getOrderStatus(order)).toEqual('signing')
+    })
+    test('signature is not pending', () => {
+      const statusFetched: RawOrderStatusFromAPI = 'open'
+
+      const order: RawOrderWithStatus = {
+        ...RAW_ORDER,
+        kind: 'buy',
+        status: statusFetched,
+        buyAmount: '10000',
+        executedBuyAmount: '0',
+        validTo: _getCurrentTimestamp(),
+      }
+      expect(getOrderStatus(order)).not.toEqual('signing')
+    })
+  })
+  describe('Sell order', () => {
+    test('signature is pending', () => {
+      const statusFetched: RawOrderStatusFromAPI = 'presignaturePending'
+
+      const order: RawOrderWithStatus = {
+        ...RAW_ORDER,
+        kind: 'sell',
+        status: statusFetched,
+        sellAmount: '10000',
+        executedSellAmount: '0',
+        validTo: _getCurrentTimestamp(),
+      }
+      expect(getOrderStatus(order)).toEqual('signing')
+    })
+  })
+})