diff --git a/src/renderer/page/rewards/view.jsx b/src/renderer/page/rewards/view.jsx index aaa82ce96..0ad449606 100644 --- a/src/renderer/page/rewards/view.jsx +++ b/src/renderer/page/rewards/view.jsx @@ -49,7 +49,7 @@ class RewardsPage extends PureComponent { ); } return ( -
+

{__( 'This account must undergo review before you can participate in the rewards program.' @@ -70,7 +70,7 @@ class RewardsPage extends PureComponent {

+ ); } @@ -100,17 +100,14 @@ class RewardsPage extends PureComponent {

{__('Disabled')}

-
- -
-

+

{__( 'Rewards are currently disabled for your account. Turn on diagnostic data sharing, in' )}{' '}

+
); } else if (fetching) { @@ -121,16 +118,16 @@ class RewardsPage extends PureComponent { ); } else if (user === null) { return ( -
+

{__('This application is unable to earn rewards due to an authentication failure.')}

-
+ ); } else if (!rewards || rewards.length <= 0) { return ( -
+

{__('No Rewards Available')}

{claimed && claimed.length @@ -139,9 +136,9 @@ class RewardsPage extends PureComponent { ) : __('There are no rewards available at this time, please check back later.')}

-
+ -
{this.renderCustomRewardCode()}
+
{this.renderCustomRewardCode()}
); } @@ -155,9 +152,7 @@ class RewardsPage extends PureComponent { 'card--disabled': isNotEligible, })} > - {rewards.map(reward => ( - - ))} + {rewards.map(reward => )} {this.renderCustomRewardCode()} ); diff --git a/src/renderer/redux/reducers/navigation.js b/src/renderer/redux/reducers/navigation.js index e4544b4cc..dd3bf8625 100644 --- a/src/renderer/redux/reducers/navigation.js +++ b/src/renderer/redux/reducers/navigation.js @@ -3,7 +3,7 @@ import * as ACTIONS from 'constants/action_types'; const getCurrentPath = () => { const { hash } = document.location; if (hash !== '') return hash.replace(/^#/, ''); - return '/discover'; + return '/rewards'; }; const reducers = {}; diff --git a/src/renderer/scss/component/_card.scss b/src/renderer/scss/component/_card.scss index a1b6412da..8818cc736 100644 --- a/src/renderer/scss/component/_card.scss +++ b/src/renderer/scss/component/_card.scss @@ -118,6 +118,18 @@ grid-gap: var(--spacing-vertical-medium); } +.card__list--rewards { + column-count: 2; + column-gap: var(--spacing-vertical-medium); + margin-bottom: var(--spacing-vertical-large); + + .card { + display: inline-block; + margin: 0 0 var(--spacing-vertical-medium); + width: 100%; + } +} + // C A R D // M E T A @@ -167,12 +179,6 @@ bottom: -0.12rem; position: relative; } - - &.card-row__scrollhouse--sub-component { - .card:first-of-type { - margin-left: 0; - } - } } // C A R D