From cee3f68ef13b9d41c7d514afbdd1521141c5c78d Mon Sep 17 00:00:00 2001 From: Tim Glasgow Date: Tue, 16 Aug 2022 19:29:05 -0500 Subject: [PATCH 1/2] fixed an issue where score screen calculated score based on previous user state --- squarenotsquare/src/redux/actions/UserActions.js | 4 ++-- squarenotsquare/src/screens/Score.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/squarenotsquare/src/redux/actions/UserActions.js b/squarenotsquare/src/redux/actions/UserActions.js index 9675097..0d96a6e 100644 --- a/squarenotsquare/src/redux/actions/UserActions.js +++ b/squarenotsquare/src/redux/actions/UserActions.js @@ -26,7 +26,6 @@ export function squareStartPressed(mode, username) { export function squareFinished(answers, finalTime) { return (dispatch, getState) => { - squareNav('Score'); const userState = getState().user; let newUser = {...userState}; newUser.lastGameTime = finalTime; @@ -34,6 +33,7 @@ export function squareFinished(answers, finalTime) { let finalScore = calculateSquareScore(answers, finalTime); DbAPI.createScore(userState.username, finalScore); + setTimeout(() => squareNav('Score'), 500); dispatch({ type: SQUARE_FINISHED, user: newUser @@ -43,7 +43,6 @@ export function squareFinished(answers, finalTime) { export function addFinished(answers, finalTime) { return (dispatch, getState) => { - squareNav('Score'); const userState = getState().user; let newUser = {...userState}; newUser.lastGameTime = finalTime; @@ -51,6 +50,7 @@ export function addFinished(answers, finalTime) { let finalScore = calculateSquareScore(answers, finalTime); DbAPI.createScore(userState.username, finalScore); + setTimeout(() => squareNav('Score'), 500); dispatch({ type: ADDITION_FINISHED, user: newUser diff --git a/squarenotsquare/src/screens/Score.js b/squarenotsquare/src/screens/Score.js index acdfbe8..62023aa 100644 --- a/squarenotsquare/src/screens/Score.js +++ b/squarenotsquare/src/screens/Score.js @@ -20,7 +20,7 @@ function Score(props){ function calculateTimerScore(user = userRedux){ if (user !== null){ - let score = Math.round((60 - user.lastGameTime) * 1000); + let score = Math.round((60 - parseFloat(user.lastGameTime)) * 1000); if (score < 0) { return 0; } else { -- 2.20.1 From 2d8270304d1b04e67fa9e8f1d539c58a6f9937a2 Mon Sep 17 00:00:00 2001 From: Tim Glasgow Date: Tue, 16 Aug 2022 19:29:44 -0500 Subject: [PATCH 2/2] build version --- squarenotsquare/src/screens/Home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squarenotsquare/src/screens/Home.js b/squarenotsquare/src/screens/Home.js index 94bfb7c..3fef628 100644 --- a/squarenotsquare/src/screens/Home.js +++ b/squarenotsquare/src/screens/Home.js @@ -93,7 +93,7 @@ function Home(){ - 0.0.2a Atonal Software Aug 11 2022 + 0.0.3a Atonal Software Aug 16 2022 -- 2.20.1