From c7869cf39389d413eaf61f2e1d146e1f10586a9b Mon Sep 17 00:00:00 2001 From: Mati Dastugue Date: Mon, 7 Feb 2022 17:59:13 -0300 Subject: [PATCH 1/3] Remove BetaWrapper component --- .../layout/GenericLayout/Footer/index.tsx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/components/layout/GenericLayout/Footer/index.tsx b/src/components/layout/GenericLayout/Footer/index.tsx index 987609113..03417eeec 100644 --- a/src/components/layout/GenericLayout/Footer/index.tsx +++ b/src/components/layout/GenericLayout/Footer/index.tsx @@ -37,19 +37,6 @@ const FooterStyled = styled.footer` } ` -const BetaWrapper = styled.div` - display: flex; - margin: 0; - height: 100%; - align-items: center; - padding: 0 1rem 0 0; - position: relative; - - ${media.mediumDown} { - margin: 0 0 1.6rem; - } -` - const ContractsWrapper = styled.div` display: flex; @@ -99,13 +86,12 @@ export interface FooterType { } export const Footer: React.FC = (props) => { - const { isBeta = footerConfig.isBeta, url = footerConfig.url } = props + const { url = footerConfig.url } = props const networkId = useNetworkId() || Network.Mainnet const settlementContractAddress = getGpV2ContractAddress(networkId, 'GPv2Settlement') const vaultRelayerContractAddress = getGpV2ContractAddress(networkId, 'GPv2VaultRelayer') return ( - {isBeta && 'This project is in beta. Use at your own risk.'} {settlementContractAddress && ( Date: Tue, 8 Feb 2022 11:20:32 -0300 Subject: [PATCH 2/3] Revert changes to original + Set isBeta to false in footerConfig --- .../layout/GenericLayout/Footer/config.ts | 2 +- .../layout/GenericLayout/Footer/index.tsx | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/layout/GenericLayout/Footer/config.ts b/src/components/layout/GenericLayout/Footer/config.ts index 15c87576e..34d2fa360 100644 --- a/src/components/layout/GenericLayout/Footer/config.ts +++ b/src/components/layout/GenericLayout/Footer/config.ts @@ -1,5 +1,5 @@ export const footerConfig = { - isBeta: true, + isBeta: false, url: { web: 'https://github.com/gnosis/gp-ui/tree/v', // TODO: Pending to move and adapt the wiki diff --git a/src/components/layout/GenericLayout/Footer/index.tsx b/src/components/layout/GenericLayout/Footer/index.tsx index 03417eeec..987609113 100644 --- a/src/components/layout/GenericLayout/Footer/index.tsx +++ b/src/components/layout/GenericLayout/Footer/index.tsx @@ -37,6 +37,19 @@ const FooterStyled = styled.footer` } ` +const BetaWrapper = styled.div` + display: flex; + margin: 0; + height: 100%; + align-items: center; + padding: 0 1rem 0 0; + position: relative; + + ${media.mediumDown} { + margin: 0 0 1.6rem; + } +` + const ContractsWrapper = styled.div` display: flex; @@ -86,12 +99,13 @@ export interface FooterType { } export const Footer: React.FC = (props) => { - const { url = footerConfig.url } = props + const { isBeta = footerConfig.isBeta, url = footerConfig.url } = props const networkId = useNetworkId() || Network.Mainnet const settlementContractAddress = getGpV2ContractAddress(networkId, 'GPv2Settlement') const vaultRelayerContractAddress = getGpV2ContractAddress(networkId, 'GPv2VaultRelayer') return ( + {isBeta && 'This project is in beta. Use at your own risk.'} {settlementContractAddress && ( Date: Wed, 9 Feb 2022 12:44:00 -0300 Subject: [PATCH 3/3] fix betawrapper position --- src/components/layout/GenericLayout/Footer/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/layout/GenericLayout/Footer/index.tsx b/src/components/layout/GenericLayout/Footer/index.tsx index 987609113..d98af2f6b 100644 --- a/src/components/layout/GenericLayout/Footer/index.tsx +++ b/src/components/layout/GenericLayout/Footer/index.tsx @@ -22,7 +22,7 @@ const FooterStyled = styled.footer` flex: 1 1 auto; color: ${({ theme }): string => theme.textSecondary2}; width: 100%; - justify-content: space-between; + justify-content: space-around; margin: 0 auto; ${media.mediumDown} { @@ -105,7 +105,7 @@ export const Footer: React.FC = (props) => { const vaultRelayerContractAddress = getGpV2ContractAddress(networkId, 'GPv2VaultRelayer') return ( - {isBeta && 'This project is in beta. Use at your own risk.'} + {isBeta && This project is in beta. Use at your own risk.} {settlementContractAddress && (