diff --git a/src/common/components/FeatureDapps/FeatureDapps.module.scss b/src/common/components/FeatureDapps/FeatureDapps.module.scss index 1819a15..990e3c9 100644 --- a/src/common/components/FeatureDapps/FeatureDapps.module.scss +++ b/src/common/components/FeatureDapps/FeatureDapps.module.scss @@ -25,6 +25,9 @@ flex-direction: column; margin: 0 calculateRem(20) calculateRem(20) calculateRem(20); text-decoration: none; + @media (min-width: 412px) { + min-width: 360px; + } } .bannerWrapper { diff --git a/src/common/components/Modal/Modal.module.scss b/src/common/components/Modal/Modal.module.scss index 7ac1a62..8dc115f 100644 --- a/src/common/components/Modal/Modal.module.scss +++ b/src/common/components/Modal/Modal.module.scss @@ -45,6 +45,7 @@ background: #939ba1; cursor: pointer; transform: rotate(45deg); + z-index: 99; } } diff --git a/src/common/redux/reducers.js b/src/common/redux/reducers.js index 94523dc..e6bf061 100644 --- a/src/common/redux/reducers.js +++ b/src/common/redux/reducers.js @@ -6,7 +6,7 @@ import vote from '../../modules/Vote/Vote.reducer' import profile from '../../modules/Profile/Profile.reducer' import submit from '../../modules/Submit/Submit.reducer' import desktopMenu from '../../modules/DesktopMenu/DesktopMenu.reducer' -import transactionStatus from '../../modules/TransactionStatus/TransactionStatus.recuder' +import transactionStatus from '../../modules/TransactionStatus/TransactionStatus.reducer' import alert from '../../modules/Alert/Alert.reducer' import howToSubmit from '../../modules/HowToSubmit/HowToSubmit.reducer' import withdraw from '../../modules/Withdraw/Withdraw.reducer' diff --git a/src/modules/Alert/Alert.container.js b/src/modules/Alert/Alert.container.js index cf9eb76..11bc386 100644 --- a/src/modules/Alert/Alert.container.js +++ b/src/modules/Alert/Alert.container.js @@ -1,10 +1,12 @@ import { connect } from 'react-redux' import Alert from './Alert' import { hideAlertAction } from './Alert.reducer' +import { hideAction } from '../TransactionStatus/TransactionStatus.reducer' const mapStateToProps = state => state.alert const mapDispatchToProps = dispatch => ({ hideAlert: () => dispatch(hideAlertAction()), + hideTransaction: () => dispatch(hideAction()), }) export default connect( diff --git a/src/modules/Alert/Alert.jsx b/src/modules/Alert/Alert.jsx index e6e9570..ff90a6e 100644 --- a/src/modules/Alert/Alert.jsx +++ b/src/modules/Alert/Alert.jsx @@ -9,13 +9,15 @@ class Alert extends React.Component { this.onClickNegative = this.onClickNegative.bind(this) } onClickPositive() { - const { hideAlert, positiveListener } = this.props + const { hideAlert, positiveListener, hideTransaction } = this.props hideAlert() + hideTransaction() if (positiveListener !== null) positiveListener() } onClickNegative() { - const { hideAlert, negativeListener } = this.props + const { hideAlert, negativeListener, hideTransaction } = this.props hideAlert() + hideTransaction() if (negativeListener !== null) negativeListener() } render() { diff --git a/src/modules/HowToSubmit/HowToSubmit.jsx b/src/modules/HowToSubmit/HowToSubmit.jsx index 02a4896..1e82c9a 100644 --- a/src/modules/HowToSubmit/HowToSubmit.jsx +++ b/src/modules/HowToSubmit/HowToSubmit.jsx @@ -37,83 +37,87 @@ class HowToSubmit extends React.Component { {visible_how_to_submit && ( <>
- You need not stake anything to be included - your DApp just - won’t appear in the “Highest Ranked” section. If you do stake - SNT, your DApp will appear in that section immediately. The - DApp with the highest effective balance (that is, SNT staked - plus/minus votes cast for/against) ranks highest. -
-- SNT you stake is locked in the Discover contract. You can, at - any time, withdraw a percentage of what you have staked. The - more you stake, the lower the percentage you can withdraw. - Withdrawals must be made from the same wallet as you submitted - with, so PLEASE SECURE THIS ADDRESS. -
-- Furthermore, the operators of{' '} - https://dap.ps reserve the right - to remove any DApp from the UI for reasons including, but not - limited to: -
-- Anyone is welcome to fork the software and implement different - UI choices for the same underlying contract. Note that - Discover is not affiliated with Status directly, we have - simply chosen to use SNT as a token of value, to abide by{' '} - Status’ principles, and - to take a mobile-first approach to development. -
++ You need not stake anything to be included - your DApp just + won’t appear in the “Highest Ranked” section. If you do + stake SNT, your DApp will appear in that section + immediately. The DApp with the highest effective balance + (that is, SNT staked plus/minus votes cast for/against) + ranks highest. +
++ SNT you stake is locked in the Discover contract. You can, + at any time, withdraw a percentage of what you have staked. + The more you stake, the lower the percentage you can + withdraw. Withdrawals must be made from the same wallet as + you submitted with, so PLEASE SECURE THIS ADDRESS. +
++ Furthermore, the operators of{' '} + https://dap.ps reserve the + right to remove any DApp from the UI for reasons including, + but not limited to: +
++ Anyone is welcome to fork the software and implement + different UI choices for the same underlying contract. Note + that Discover is not affiliated with Status directly, we + have simply chosen to use SNT as a token of value, to abide + by Status’ principles + , and to take a mobile-first approach to development. +
+- SNT you spend to upvote is locked in the contract and - contributes directly to {dapp.name}'s ranking.{' '} - Learn more↗ -
- )} - {!isUpvote && ( -- SNT you spend to downvote goes directly back to {dapp.name}. - Downvoting moves their DApp down by 1% of the current ranking. - The cost is fixed by our unique bonded curve.{' '} - Learn more↗ -
- )} -+ SNT you spend to upvote is locked in the contract and + contributes directly to {dapp.name}'s ranking.{' '} + Learn more↗ +
+ )} + {!isUpvote && ( ++ SNT you spend to downvote goes directly back to {dapp.name}. + Downvoting moves their DApp down by 1% of the current + ranking. The cost is fixed by our unique bonded curve.{' '} + Learn more↗ +
+ )} +