diff --git a/common/app/flux/Store.js b/common/app/flux/Store.js
index 2914bc268c..49f7cb342d 100644
--- a/common/app/flux/Store.js
+++ b/common/app/flux/Store.js
@@ -49,7 +49,6 @@ export default Store({
const {
toggleQuestions,
fetchHikes,
- hideInfo,
resetHike,
grabQuestion,
releaseQuestion,
@@ -61,7 +60,6 @@ export default Store({
fromMany(
toggleQuestions,
fetchHikes,
- hideInfo,
resetHike,
grabQuestion,
releaseQuestion,
diff --git a/common/app/routes/Hikes/components/Questions.jsx b/common/app/routes/Hikes/components/Questions.jsx
index bedb202a57..0ac01fb9ee 100644
--- a/common/app/routes/Hikes/components/Questions.jsx
+++ b/common/app/routes/Hikes/components/Questions.jsx
@@ -1,13 +1,7 @@
import React, { PropTypes } from 'react';
import { spring, Motion } from 'react-motion';
import { contain } from 'thundercats-react';
-import {
- Button,
- Col,
- Modal,
- Panel,
- Row
-} from 'react-bootstrap';
+import { Button, Col, Panel, Row } from 'react-bootstrap';
const answerThreshold = 100;
@@ -23,7 +17,6 @@ export default contain(
isCorrect = false,
delta = [0, 0],
isPressed = false,
- showInfo = false,
shake = false
} = hikesApp;
return {
@@ -33,7 +26,6 @@ export default contain(
isCorrect,
delta,
isPressed,
- showInfo,
shake,
isSignedIn: !!username
};
@@ -49,13 +41,12 @@ export default contain(
isCorrect: PropTypes.bool,
delta: PropTypes.array,
isPressed: PropTypes.bool,
- showInfo: PropTypes.bool,
shake: PropTypes.bool,
isSignedIn: PropTypes.bool,
hikesActions: PropTypes.object
},
- handleMouseUp(e, answer) {
+ handleMouseUp(e, answer, info) {
e.stopPropagation();
if (!this.props.isPressed) {
return null;
@@ -76,6 +67,7 @@ export default contain(
delta,
currentQuestion,
isSignedIn,
+ info,
threshold: answerThreshold
});
},
@@ -89,7 +81,7 @@ export default contain(
hikesActions.moveQuestion({ e, delta });
},
- onAnswer(answer, userAnswer) {
+ onAnswer(answer, userAnswer, info) {
const { isSignedIn, hike, currentQuestion, hikesActions } = this.props;
return (e) => {
if (e && e.preventDefault) {
@@ -101,40 +93,15 @@ export default contain(
userAnswer,
currentQuestion,
hike,
+ info,
isSignedIn
});
};
},
- renderInfo(showInfo, info, hideInfo) {
- if (!info) {
- return null;
- }
- return (
-
- { info }
-
-