Merge pull request #1011 from gnosis/release/2.6.0

Release/2.6.0-RC.1

.mergify.yml

@@ -1,13 +1,18 @@
+queue_rules:
+  - name: default
+    conditions:
+      - check-success=Deploy
+
 pull_request_rules:
   - name: Merge approved and green PRs when tagged with 'Auto-merge'
     conditions:
       - "#approved-reviews-by>=2"
       - label="Auto-merge"
       - check-success=Deploy
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart+fasttrack
+        name: default
         commit_message: title+body
   - name: automatic merge for Dependabot pull requests
     conditions:
@@ -17,8 +22,8 @@ pull_request_rules:
       - check-success=Deploy
       - base=develop
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart+fasttrack
+        name: default
         commit_message: title+body
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnosis.pm/gp-v1",
-  "version": "2.5.1",
+  "version": "2.6.0-rc.1",
   "description": "",
   "main": "src/index.js",
   "sideEffects": false,
@@ -54,7 +54,7 @@
     "@apollo/client": "^3.1.5",
     "@fortawesome/fontawesome-svg-core": "^1.2.26",
     "@fortawesome/free-regular-svg-icons": "^5.12.0",
-    "@fortawesome/free-solid-svg-icons": "^5.12.0",
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.1.8",
     "@gnosis.pm/dex-js": "^0.10.0",
     "@gnosis.pm/gp-v2-contracts": "^1.0.2",

src/api/operator/index.ts

@@ -13,6 +13,7 @@ export const {
   getOrder,
   getOrders,
   getAccountOrders,
+  getTxOrders,
   getTrades,
   // functions that do not have a mock
   getOrderLink = realApi.getOrderLink,

src/api/operator/operatorApi.ts

@@ -14,6 +14,7 @@ import {
   OrderPostError,
   RawOrder,
   RawTrade,
+  GetTxOrdersParams,
 } from './types'
 
 function getOperatorUrl(): Partial<Record<Network, string>> {
@@ -240,6 +241,19 @@ export async function getAccountOrders(params: GetAccountOrdersParams): Promise<
   return _fetchQuery(networkId, queryString)
 }
 
+/**
+ * Gets a order list within Tx
+ */
+export async function getTxOrders(params: GetTxOrdersParams): Promise<RawOrder[]> {
+  const { networkId, txHash } = params
+
+  console.log(`[getTxOrders] Fetching tx orders on network ${networkId}`)
+
+  const queryString = `/transactions/${txHash}/orders`
+
+  return _fetchQuery(networkId, queryString)
+}
+
 /**
  * Gets a list of trades
  *

src/api/operator/operatorMock.ts

@@ -1,4 +1,12 @@
-import { GetOrderParams, GetOrdersParams, GetAccountOrdersParams, GetTradesParams, RawOrder, RawTrade } from './types'
+import {
+  GetOrderParams,
+  GetOrdersParams,
+  GetAccountOrdersParams,
+  GetTxOrdersParams,
+  GetTradesParams,
+  RawOrder,
+  RawTrade,
+} from './types'
 
 import { RAW_ORDER, RAW_TRADE } from '../../../test/data'
 
@@ -31,6 +39,14 @@ export async function getAccountOrders(params: GetAccountOrdersParams): Promise<
   return [order]
 }
 
+export async function getTxOrders(params: GetTxOrdersParams): Promise<RawOrder[]> {
+  const { networkId } = params
+
+  const order = await getOrder({ networkId, orderId: 'whatever' })
+
+  return [order]
+}
+
 export async function getTrades(params: GetTradesParams): Promise<RawTrade[]> {
   const { owner, orderId } = params
 

src/api/operator/types.ts

@@ -5,6 +5,7 @@ import { TokenErc20 } from '@gnosis.pm/dex-js'
 import { Network } from 'types'
 
 export type OrderID = string
+export type TxHash = string
 
 export interface OrderPostError {
   errorType: 'MissingOrderData' | 'InvalidSignature' | 'DuplicateOrder' | 'InsufficientFunds'
@@ -114,7 +115,7 @@ export type Trade = Pick<RawTrade, 'blockNumber' | 'logIndex' | 'owner' | 'txHas
   surplusPercentage?: BigNumber
 }
 
-type WithNetworkId = { networkId: Network }
+export type WithNetworkId = { networkId: Network }
 
 export type GetOrderParams = WithNetworkId & {
   orderId: string
@@ -133,6 +134,10 @@ export type GetOrdersParams = WithNetworkId & {
   buyToken?: string
 }
 
+export type GetTxOrdersParams = WithNetworkId & {
+  txHash: TxHash
+}
+
 export type GetTradesParams = WithNetworkId & {
   owner?: string
   orderId?: string

src/api/wallet/WalletApi.ts

@@ -564,7 +564,7 @@ export class WalletApiImpl implements WalletApi {
     return {
       isConnected,
       userAddress: accounts[0],
-      networkId: isConnected ? +chainId : undefined,
+      networkId: +chainId,
     }
   }
 

src/apps/explorer/ExplorerApp.tsx

@@ -7,10 +7,8 @@ import useNetworkCheck from 'hooks/useNetworkCheck'
 import Console from 'Console'
 import { rootReducer, INITIAL_STATE } from 'apps/explorer/state'
 
-import styled from 'styled-components'
 import { GenericLayout } from 'components/layout'
 import { Header } from './layout/Header'
-import { media } from 'theme/styles/media'
 
 import { NetworkUpdater, RedirectMainnet, RedirectXdai } from 'state/network'
 import { initAnalytics } from 'api/analytics'
@@ -21,6 +19,7 @@ import * as Sentry from '@sentry/react'
 import { Integrations } from '@sentry/tracing'
 import { environmentName } from 'utils/env'
 import { version } from '../../../package.json'
+import { GlobalStyle, MainWrapper } from './styled'
 
 const SENTRY_DSN = process.env.REACT_APP_SENTRY_DSN
 const SENTRY_TRACES_SAMPLE_RATE = process.env.REACT_APP_SENTRY_TRACES_SAMPLE_RATE
@@ -89,6 +88,14 @@ const UserDetails = React.lazy(
     ),
 )
 
+const TransactionDetails = React.lazy(
+  () =>
+    import(
+      /* webpackChunkName: "TransactionDetails_chunk"*/
+      './pages/TransactionDetails'
+    ),
+)
+
 /**
  * Update the global state
  */
@@ -117,12 +124,13 @@ const AppContent = (): JSX.Element => {
         <Switch>
           <Route path={pathPrefix + '/'} exact component={Home} />
           <Route
-            path={[pathPrefix + '/address/', pathPrefix + '/orders/']}
+            path={[pathPrefix + '/address/', pathPrefix + '/orders/', pathPrefix + '/tx/']}
             exact
             component={(): JSX.Element => <Redirect to={pathPrefix + '/search/'} />}
           />
           <Route path={pathPrefix + '/orders/:orderId'} exact component={Order} />
           <Route path={pathPrefix + '/address/:address'} exact component={UserDetails} />
+          <Route path={pathPrefix + '/tx/:txHash'} exact component={TransactionDetails} />
           <Route path={pathPrefix + '/search/:searchString?'} exact component={SearchNotFound} />
           <Route component={NotFound} />
         </Switch>
@@ -131,20 +139,6 @@ const AppContent = (): JSX.Element => {
   )
 }
 
-const Wrapper = styled.div`
-  max-width: 118rem;
-  margin: 0 auto;
-
-  ${media.mediumDown} {
-    max-width: 94rem;
-    flex-flow: column wrap;
-  }
-
-  ${media.mobile} {
-    max-width: 100%;
-  }
-`
-
 /**
  * Render Explorer App
  */
@@ -153,17 +147,20 @@ export const ExplorerApp: React.FC = () => {
   useNetworkCheck()
 
   return (
-    <Wrapper>
-      <Router basename={process.env.BASE_URL}>
-        <StateUpdaters />
-        <Switch>
-          <Route path="/mainnet" component={RedirectMainnet} />
-          <Route path="/xdai" component={RedirectXdai} />
-          <Route path={['/gc', '/rinkeby', '/']} component={AppContent} />
-        </Switch>
-      </Router>
-      {process.env.NODE_ENV === 'development' && <Console />}
-    </Wrapper>
+    <>
+      <GlobalStyle />
+      <MainWrapper>
+        <Router basename={process.env.BASE_URL}>
+          <StateUpdaters />
+          <Switch>
+            <Route path="/mainnet" component={RedirectMainnet} />
+            <Route path="/xdai" component={RedirectXdai} />
+            <Route path={['/gc', '/rinkeby', '/']} component={AppContent} />
+          </Switch>
+        </Router>
+        {process.env.NODE_ENV === 'development' && <Console />}
+      </MainWrapper>
+    </>
   )
 }
 

src/apps/explorer/components/OrdersTableWidget/index.tsx

@@ -2,12 +2,12 @@ import React from 'react'
 import styled from 'styled-components'
 
 import ExplorerTabs from 'apps/explorer/components/common/ExplorerTabs/ExplorerTab'
-import { useGetOrders } from './useGetOrders'
 import { TabItemInterface } from 'components/common/Tabs/Tabs'
 import { useTable } from './useTable'
 import { OrdersTableWithData } from './OrdersTableWithData'
 import { OrdersTableContext, BlockchainNetwork } from './context/OrdersTableContext'
 import PaginationOrdersTable from './PaginationOrdersTable'
+import { useGetAccountOrders } from 'hooks/useGetOrders'
 import Spinner from 'components/common/Spinner'
 
 const StyledTabLoader = styled.span`
@@ -58,7 +58,7 @@ const OrdersTableWidget: React.FC<Props> = ({ ownerAddress, networkId }) => {
     isLoading: isOrdersLoading,
     error,
     isThereNext: isThereNextOrder,
-  } = useGetOrders(ownerAddress, tableState.pageSize, tableState.pageOffset, tableState.pageIndex)
+  } = useGetAccountOrders(ownerAddress, tableState.pageSize, tableState.pageOffset, tableState.pageIndex)
   tableState['hasNextPage'] = isThereNextOrder
   const addressAccountParams = { ownerAddress, networkId }