diff --git a/app/screens/Settings/components/ModalBody.js b/app/screens/Settings/components/ModalBody.js index 9f6e5c5..3f2e06c 100644 --- a/app/screens/Settings/components/ModalBody.js +++ b/app/screens/Settings/components/ModalBody.js @@ -80,6 +80,7 @@ const specieSortByOptions = [ 'name', 'nickname', 'cp', + 'level', 'iv', ] diff --git a/app/screens/Table/components/Pokemon.js b/app/screens/Table/components/Pokemon.js index 25f4ba3..b659473 100644 --- a/app/screens/Table/components/Pokemon.js +++ b/app/screens/Table/components/Pokemon.js @@ -12,6 +12,7 @@ import { import renderModal from '../../Detail' import Tooltip from '../../Tooltip' +import utils from '../../../utils' const favoriteGlyph = 'fa fa-star favorite-yellow' const emptyFavoriteGlyph = 'fa fa-star-o' @@ -106,6 +107,17 @@ const Pokemon = React.createClass({ > CP + + Level + ) const isChecked = pokemonState[String(pokemon.id)].check + const level = utils.getLevelFromCpMultiplier(pokemon.cp_multiplier + pokemon.additional_cp_multiplier) return ( @@ -210,6 +223,9 @@ const Pokemon = React.createClass({ {pokemon.cp} + + {level} +