From a95c6e5ab32a0784c97a7fcc93a29b6dc6acc6a8 Mon Sep 17 00:00:00 2001 From: Vincent Taverna Date: Mon, 2 Jan 2017 17:44:17 -0500 Subject: [PATCH 1/2] fix #178 move highlight --- app/screens/Detail/components/CinematicMove.js | 2 +- app/screens/Detail/components/QuickMove.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/screens/Detail/components/CinematicMove.js b/app/screens/Detail/components/CinematicMove.js index a0485bd..5492c39 100644 --- a/app/screens/Detail/components/CinematicMove.js +++ b/app/screens/Detail/components/CinematicMove.js @@ -37,7 +37,7 @@ const CinematicMove = React.createClass({ {`Crit Chance: ${critChance.toFixed(2)}%`} ) - const thisMove = move === myMove ? 'pokemon-move-item mine' : 'pokemon-move-item notmine' + const thisMove = move.movement_id === myMove.movement_id ? 'pokemon-move-item mine' : 'pokemon-move-item notmine' return (
diff --git a/app/screens/Detail/components/QuickMove.js b/app/screens/Detail/components/QuickMove.js index 07b65f9..c7d801e 100644 --- a/app/screens/Detail/components/QuickMove.js +++ b/app/screens/Detail/components/QuickMove.js @@ -30,7 +30,7 @@ const QuickMove = React.createClass({ {`EGPS: ${move.egps.toFixed(2)}`} ) - const thisMove = move === myMove ? 'pokemon-move-item mine' : 'pokemon-move-item notmine' + const thisMove = move.movement_id === myMove.movement_id ? 'pokemon-move-item mine' : 'pokemon-move-item notmine' return (
From a8f4dfc0951edd5c9b668751c7d7e3fd267a9d8d Mon Sep 17 00:00:00 2001 From: Vincent Taverna Date: Mon, 2 Jan 2017 17:44:52 -0500 Subject: [PATCH 2/2] prepare v1.7.2 --- README.md | 10 +++++----- app/package.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 07ccc31..bc8cefa 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ **PokéNurse** is a desktop application for Windows and Mac that allows you to manage your pokémon from Pokémon Go without the need for a mobile device. You can now favorite, transfer, and evolve from the comfort of your own home! -## Downloads for v1.7.1 +## Downloads for v1.7.2 You may view all the releases [here](https://github.com/vinnymac/PokeNurse/releases) -* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.1/PokeNurse.dmg) -* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.1/PokeNurse.exe) -* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.1/PokeNurse-ia32.deb) -* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.1/PokeNurse-x64.deb) +* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse.dmg) +* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse.exe) +* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse-ia32.deb) +* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse-x64.deb) ## Examples ![Login Window](app/loginExample.png) diff --git a/app/package.json b/app/package.json index da9d7f7..1b279ff 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "PokeNurse", "productName": "PokeNurse", - "version": "1.7.1", + "version": "1.7.2", "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon", "main": "./main.js", "author": { diff --git a/package.json b/package.json index 8b6fdd4..60c8891 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PokeNurse", - "version": "1.7.1", + "version": "1.7.2", "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon", "main": "main.js", "scripts": {