Skip to content

Commit

Permalink
fix tests, fix baseId calculation, bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
hunterjm committed Feb 14, 2017
1 parent c0d3f30 commit ff07928
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 17 deletions.
32 changes: 18 additions & 14 deletions app/containers/Players.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,20 +195,24 @@ export class Players extends Component {

return (
<div className="containers">
{ this.props.skipTutorial ? null :
<Joyride
ref={c => (this.joyride = c)}
steps={steps}
stepIndex={0}
autoStart={!Object.keys(players).length}
type="continuous"
showSkipButton
showStepsProgress
disableOverlay
run
locale={{ back: 'Back', close: 'Close', last: 'Done', next: 'Next', skip: 'Skip' }}
/>
}
{
this.props.skipTutorial
?
null
:
<Joyride
ref={c => (this.joyride = c)}
steps={steps}
stepIndex={0}
autoStart={!Object.keys(players).length}
type="continuous"
showSkipButton
showStepsProgress
disableOverlay
run
locale={{ back: 'Back', close: 'Close', last: 'Done', next: 'Next', skip: 'Skip' }}
/>
}
<ConnectedHeader hideLogin={false} />
<div className="containers-body">
<div className="sidebar">
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fifa-autobuyer",
"productName": "FIFA Autobuyer",
"version": "0.4.1",
"version": "0.4.2",
"description": "Autobuyer for FIFA 17 Ultimate Team",
"main": "./main.js",
"author": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fifa-autobuyer",
"productName": "FIFA Autobuyer",
"version": "0.4.1",
"version": "0.4.2",
"description": "Autobuyer for FIFA 17 Ultimate Team",
"main": "main.js",
"scripts": {
Expand Down Expand Up @@ -162,7 +162,7 @@
"electron-auto-updater": "^0.9.2",
"electron-debug": "^1.1.0",
"font-awesome": "^4.7.0",
"fut-promise": "^1.1.0",
"fut-promise": "^1.1.1",
"highcharts": "^5.0.6",
"jquery": "^3.1.1",
"lodash": "^4.16.3",
Expand Down
1 change: 1 addition & 0 deletions test/reducers/settings.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ describe('reducers', () => {
maxCard: '10',
autoStop: '0',
snipeOnly: false,
skipTutorial: false,
autoUpdate: true,
buy: '90',
sell: '100',
Expand Down

0 comments on commit ff07928

Please sign in to comment.