diff --git a/src/actions/tomoAction.js b/src/actions/tomoAction.js index 7702a25..9f8f8f2 100644 --- a/src/actions/tomoAction.js +++ b/src/actions/tomoAction.js @@ -563,7 +563,13 @@ export const getAliasBalance = () => async (dispatch, getState) => { if (aliasBalance.includes('.')) { let interger = aliasBalance.split('.', 2)[0]; let fractional = aliasBalance.split('.', 2)[1].substr(0, 4); - aliasBalance = interger.concat('.', fractional, ' '); + if (interger === '0' && fractional === '0000') { + aliasBalance = '0 '; + } else if (fractional === '0000') { + aliasBalance = interger + ' '; + } else { + aliasBalance = interger.concat('.', fractional, ' '); + } } dispatch({ diff --git a/src/component/ModalDeposit.js b/src/component/ModalDeposit.js index 8b493bb..4cea95d 100644 --- a/src/component/ModalDeposit.js +++ b/src/component/ModalDeposit.js @@ -83,7 +83,7 @@ class ModalDeposit extends React.Component { - + { ranking: state.tomo.ranking, wincount: state.tomo.winCount, questionCount: state.tomo.questionCount, - tomo: state.tomo + tomo: state.tomo, + aliasBalance: state.tomo.aliasBalance }; }; diff --git a/src/component/PlayerLayout/QuesArea.js b/src/component/PlayerLayout/QuesArea.js index faff32f..a025767 100644 --- a/src/component/PlayerLayout/QuesArea.js +++ b/src/component/PlayerLayout/QuesArea.js @@ -31,7 +31,9 @@ class QuesArea extends Component { // auto scroll name='fixedScrol' when loading page componentDidMount() { - Scroll.scroller.scrollTo('fixedScroll'); + if (this.props.winCount < 10) { + Scroll.scroller.scrollTo('fixedScroll'); + } } shouldComponentUpdate(nextProps) { @@ -245,7 +247,8 @@ const mapStatetoProps = (state) => { aliasBalance: state.tomo.aliasBalance, aliasAddress: state.tomo.aliasAccount.address, account: state.tomo.account, - questionCount: state.tomo.questionCount + questionCount: state.tomo.questionCount, + winCount: state.tomo.winCount }; }; diff --git a/src/style/App.css b/src/style/App.css index 62ca483..7af397f 100644 --- a/src/style/App.css +++ b/src/style/App.css @@ -380,3 +380,11 @@ canvas { .font-number-question { font-weight: 600 !important; } + +.congrat { + background: linear-gradient(to left, violet, indigo, blue, green, orange, red); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + font-weight: bold; + font-size: 20px; +} diff --git a/src/style/button.css b/src/style/button.css index 23b2a28..8b202bb 100644 --- a/src/style/button.css +++ b/src/style/button.css @@ -84,6 +84,13 @@ button.answer_box:focus { padding-right: 4%; } +@media only screen and (min-width: 768px) { + .button-start, + .button-withdraw { + width: 14%; + } +} + @media only screen and (max-width: 700px) { .switchSmall { position: absolute;