diff --git a/src/components/Header/index.js b/src/components/Header/index.js index f4b970c45..82812e214 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -98,10 +98,12 @@ class Header extends Component { } = this.props let walletConnected = hasWallet - if (tournamentEnabled && useMetamask) { - walletConnected = hasWallet && mainnetAddress + + if (tournamentEnabled && useMetamask && requireRegistration) { + walletConnected = hasWallet && !!mainnetAddress } + const logoVars = {} if (tournamentEnabled) { logoVars['--logoAnnotation'] = "'Powered by Gnosis'" diff --git a/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/OutcomesSection/OutcomeSectionScalar/ScalarSlider/scalarSlider.mod.scss b/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/OutcomesSection/OutcomeSectionScalar/ScalarSlider/scalarSlider.mod.scss index 0b47dcd39..9e1431dab 100644 --- a/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/OutcomesSection/OutcomeSectionScalar/ScalarSlider/scalarSlider.mod.scss +++ b/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/OutcomesSection/OutcomeSectionScalar/ScalarSlider/scalarSlider.mod.scss @@ -129,9 +129,9 @@ $scalarSliderBackground: #d6d8d8; } .lowerBound, .upperBound { - width: 20%; + width: 44%; min-width: 120px; - padding: 0 12px; + padding: 0 18px; .boundLabel { text-transform: uppercase; diff --git a/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/index.js b/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/index.js index 1e4757385..660fd72b8 100644 --- a/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/index.js +++ b/src/routes/MarketDetails/components/ExpandableViews/MarketBuySharesForm/index.js @@ -128,7 +128,7 @@ class MarketBuySharesForm extends Component { ) - const returnSign = maximumWin > 0 ? '' : '+' + const returnSign = maximumWin > 0 ? '+' : '' maxReturnField = ( {returnSign} diff --git a/src/routes/MarketDetails/components/ExpandableViews/index.js b/src/routes/MarketDetails/components/ExpandableViews/index.js index 0a47c3121..091f75872 100644 --- a/src/routes/MarketDetails/components/ExpandableViews/index.js +++ b/src/routes/MarketDetails/components/ExpandableViews/index.js @@ -13,10 +13,15 @@ const showExpandableTournament = (props) => { if (!isFeatureEnabled('tournament')) { return true } + const requireRegistration = isFeatureEnabled('registration') const providerConfig = getProviderConfig() let showExpandable = false - if (providerConfig.default === WALLET_PROVIDER.METAMASK && !!props.defaultAccount && !!props.mainnetAddress) { + if ( + providerConfig.default === WALLET_PROVIDER.METAMASK && + !!props.defaultAccount && + (requireRegistration ? !!props.mainnetAddress : true) + ) { showExpandable = true } else if (providerConfig === WALLET_PROVIDER.UPORT && !!props.defaultAccount) { showExpandable = true