Merge pull request #1038 from gnosis/master

Update develop branch with release/v2.6.0
gnosis · Feb 8, 2022 · 3a8378a · 3a8378a
2 parents e9a4e31 + 8a04e29
commit 3a8378a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gnosis.pm/gp-v1",
-  "version": "2.6.0-rc.0",
+  "version": "2.6.0",
   "description": "",
   "main": "src/index.js",
   "sideEffects": false,

diff --git a/src/apps/explorer/components/TransactionsTableWidget/index.tsx b/src/apps/explorer/components/TransactionsTableWidget/index.tsx
@@ -29,7 +29,7 @@ const tabItems = (isLoadingOrders: boolean): TabItemInterface[] => {
       id: 1,
       tab: (
         <>
-          Transactions
+          Orders
           <StyledTabLoader>{isLoadingOrders && <Spinner spin size="1x" />}</StyledTabLoader>
         </>
       ),

diff --git a/src/apps/explorer/layout/Header.tsx b/src/apps/explorer/layout/Header.tsx
@@ -63,6 +63,11 @@ export const Header: React.FC = () => {
               Community
             </ExternalLink>
           </li>
+          <li>
+            <ExternalLink target={'_blank'} href={'https://dune.xyz/gnosis.protocol/Gnosis-Protocol-V2'}>
+              Analytics
+            </ExternalLink>
+          </li>
         </Navigation>
       </FlexWrap>
     </GenericHeader>

diff --git a/src/apps/explorer/styled.ts b/src/apps/explorer/styled.ts
@@ -1,6 +1,5 @@
-import styled from 'styled-components'
+import styled, { createGlobalStyle } from 'styled-components'
 import { media } from 'theme/styles/media'
-import { createGlobalStyle } from 'styled-components'
 
 export const GlobalStyle = createGlobalStyle`
   html {
@@ -46,10 +45,7 @@ export const MainWrapper = styled.div`
   ${media.xSmallDown} {
     max-width: 100%;
     flex-grow: 1;
-    header {
-      margin-left: auto;
-      margin-right: auto;
-    }
+
     footer {
       flex-direction: column;
       flex-wrap: nowrap;

diff --git a/src/components/NetworkSelector/NetworkSelector.styled.ts b/src/components/NetworkSelector/NetworkSelector.styled.ts
@@ -1,6 +1,7 @@
 import styled from 'styled-components'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { COLOURS } from 'styles'
+import { media } from 'theme/styles/media'
 
 const { fadedGreyishWhiteOpacity, white, gnosisChainColor } = COLOURS
 
@@ -21,6 +22,9 @@ export const SelectorContainer = styled.div`
       transition: transform 0.1s linear;
     }
   }
+  ${media.xSmallDown} {
+    padding-right: 2rem;
+  }
 `
 
 export const OptionsContainer = styled.div<{ width: number }>`
@@ -98,8 +102,8 @@ export const NetworkLabel = styled.span`
   }
 
   &.gnosischain {
-    background: ${(): string => `rgb(4 121 91 / 15%);`};
-    color: ${(): string => gnosisChainColor};
+    background: ${(): string => `rgba(7,121,91,1.00);`};
+    color: ${(): string => white};
   }
 `
 

diff --git a/src/components/layout/GenericLayout/Header/index.tsx b/src/components/layout/GenericLayout/Header/index.tsx
@@ -54,6 +54,12 @@ const Logo = styled(Link)`
     justify-content: center;
     color: ${({ theme }): string => theme.textPrimary1};
   }
+
+  ${media.xSmallDown} {
+    > img {
+      max-width: 11.5rem;
+    }
+  }
 `
 
 type Props = PropsWithChildren<{

diff --git a/src/components/orders/OrdersUserDetailsTable/index.tsx b/src/components/orders/OrdersUserDetailsTable/index.tsx
@@ -169,7 +169,7 @@ const RowOrder: React.FC<RowProps> = ({ order, isPriceInverted }) => {
             className="span-copybtn-wrap"
             textToCopy={uid}
             contentsToDisplay={
-              <LinkWithPrefixNetwork to={`/orders/${order.uid}`} rel="noopener noreferrer" target="_blank">
+              <LinkWithPrefixNetwork to={`/orders/${order.uid}`} rel="noopener noreferrer" target="_self">
                 {shortId}
               </LinkWithPrefixNetwork>
             }

diff --git a/src/components/transaction/TransactionTable/index.tsx b/src/components/transaction/TransactionTable/index.tsx
@@ -171,7 +171,7 @@ const RowTransaction: React.FC<RowProps> = ({ order, isPriceInverted, invertLimi
             className="span-copybtn-wrap"
             textToCopy={uid}
             contentsToDisplay={
-              <LinkWithPrefixNetwork to={`/orders/${order.uid}`} rel="noopener noreferrer" target="_blank">
+              <LinkWithPrefixNetwork to={`/orders/${order.uid}`} rel="noopener noreferrer" target="_self">
                 {getShortOrderId(shortId)}
               </LinkWithPrefixNetwork>
             }

diff --git a/src/styles/colours.ts b/src/styles/colours.ts
@@ -3,7 +3,7 @@ export const COLOURS = {
   whiteDark: '#e9e9f0',
   blue: '#3F77FF',
   blueDark: '#185afb',
-  gnosisChainColor: '#04795b',
+  gnosisChainColor: '#07795b',
   purple: '#8958FF',
   bgLight: '#edf2f7',
   bgDark: 'linear-gradient(0deg, #21222E 0.05%, #2C2D3F 100%)',
-Original file line number
+Diff line change
@@ Expand Up @@
           id: 1,
           tab: (
             <>
-              Transactions
+              Orders
               <StyledTabLoader>{isLoadingOrders && <Spinner spin size="1x" />}</StyledTabLoader>
             </>
           ),
@@ Expand Down @@