diff --git a/pokedex/.eslintcache b/pokedex/.eslintcache
index aac71ba..6bcb120 100644
--- a/pokedex/.eslintcache
+++ b/pokedex/.eslintcache
@@ -1 +1 @@
-[{"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/reportWebVitals.js":"1","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalStateContext.js":"2","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/HomePage/index.js":"3","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/assets/img/PokeLogo.js":"4","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/DetailsCard/index.js":"5","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalState.js.js":"6","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Router.js":"7","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/constants/urls/index.js":"8","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Coordinator.js":"9","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/PokeCard/PokeCard.js":"10","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/PokeDexPage/index.js":"11","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/styles/styles.js":"12","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/App.js":"13","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/DetailsPage/index.js":"14"},{"size":362,"mtime":1606440818921,"results":"15","hashOfConfig":"16"},{"size":113,"mtime":1606477072422,"results":"17","hashOfConfig":"16"},{"size":2019,"mtime":1606480293434,"results":"18","hashOfConfig":"16"},{"size":128,"mtime":1606477072422,"results":"19","hashOfConfig":"16"},{"size":2445,"mtime":1606484787498,"results":"20","hashOfConfig":"16"},{"size":854,"mtime":1606477072422,"results":"21","hashOfConfig":"16"},{"size":684,"mtime":1606481348685,"results":"22","hashOfConfig":"16"},{"size":59,"mtime":1606477072426,"results":"23","hashOfConfig":"16"},{"size":310,"mtime":1606481364273,"results":"24","hashOfConfig":"16"},{"size":1269,"mtime":1606480788508,"results":"25","hashOfConfig":"16"},{"size":819,"mtime":1606477072426,"results":"26","hashOfConfig":"16"},{"size":3429,"mtime":1606477072426,"results":"27","hashOfConfig":"16"},{"size":277,"mtime":1606477072422,"results":"28","hashOfConfig":"16"},{"size":1407,"mtime":1606481552824,"results":"29","hashOfConfig":"16"},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"6ny1o2",{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"39"},{"filePath":"40","messages":"41","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"44"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"47"},{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"47"},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"44"},{"filePath":"52","messages":"53","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":"54","usedDeprecatedRules":"47"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":"57","usedDeprecatedRules":"44"},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"60","messages":"61","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"47"},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/reportWebVitals.js",[],["64","65"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalStateContext.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/HomePage/index.js",["66","67"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/assets/img/PokeLogo.js",[],["68","69"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/DetailsCard/index.js",["70"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalState.js.js",[],["71","72"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Router.js",[],["73","74"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/constants/urls/index.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Coordinator.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/PokeCard/PokeCard.js",["75"],"import React, { useEffect, useState } from 'react'\nimport { DetailsBtnContainer,PokeCardContainer} from '../../styles/styles'\nimport {Button} from '@material-ui/core'\nimport { useHistory } from \"react-router-dom\";\nimport {goToDetailsPage} from '../../router/Coordinator'\nimport axios from 'axios'\n\nexport default function PokeCard (props) {\n  const history = useHistory();\n\n  const [photo, setPhoto] = useState ([])\n\n  const pokemonPhoto = () => {\n    axios.get(props.pokemon.url).then((response) => {\n        setPhoto(response.data.sprites.front_default)\n    }).catch((error) => {\n      console.log(error.message)\n    })\n  }\n\n  useEffect(() => {\n    pokemonPhoto()\n  }, [])\n\n  return(\n    <div>\n      <PokeCardContainer >\n          <img \n          src={photo}\n           alt={props.pokemon.name}/>\n          <p>{props.pokemon.name}</p>    \n        <DetailsBtnContainer>\n            <Button Button variant=\"outlined\">\n              Adicionar\n            </Button>\n      </DetailsBtnContainer>\n\n      <DetailsBtnContainer>\n            <Button  variant=\"outlined\"\n                onClick={()=>goToDetailsPage(history, props.pokemon.name)}>\n                Ver detalhes\n               </Button>\n      </DetailsBtnContainer>\n      </PokeCardContainer>\n      </ div>\n  )\n} \n","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/PokeDexPage/index.js",["76"],"import React from 'react'\nimport {Header} from '../../styles/styles'\nimport { useHistory } from \"react-router-dom\";\nimport {Button} from '@material-ui/core'\nimport {ButtonContainer, HomeFlexBox} from '../../styles/styles'\nimport {goToHomePage } from '../../router/Coordinator'\nimport {PokeLogo} from '../../assets/img/PokeLogo'\n\nconst PokeDexPage = () => {\n  const history = useHistory();\n\n  return(\n    <div>\n      <Header>\n      <ButtonContainer>\n              <Button variant=\"contained\" color=\"secondary\"\n                    onClick={()=>goToHomePage(history)} >\n                    Voltar para home\n              </Button>\n          </ButtonContainer>\n\n          <h1>PokeDex</h1>\n          <img src={PokeLogo} />\n      </Header>\n      <HomeFlexBox>\n      </HomeFlexBox>\n    </div>\n  )\n}\nexport default PokeDexPage;","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/styles/styles.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/App.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/DetailsPage/index.js",[],{"ruleId":"77","replacedBy":"78"},{"ruleId":"79","replacedBy":"80"},{"ruleId":"81","severity":1,"message":"82","line":17,"column":8,"nodeType":"83","endLine":17,"endColumn":10,"suggestions":"84"},{"ruleId":"85","severity":1,"message":"86","line":42,"column":19,"nodeType":"87","endLine":42,"endColumn":41},{"ruleId":"77","replacedBy":"88"},{"ruleId":"79","replacedBy":"89"},{"ruleId":"81","severity":1,"message":"90","line":19,"column":6,"nodeType":"83","endLine":19,"endColumn":8,"suggestions":"91"},{"ruleId":"77","replacedBy":"92"},{"ruleId":"79","replacedBy":"93"},{"ruleId":"77","replacedBy":"94"},{"ruleId":"79","replacedBy":"95"},{"ruleId":"81","severity":1,"message":"96","line":23,"column":6,"nodeType":"83","endLine":23,"endColumn":8,"suggestions":"97"},{"ruleId":"85","severity":1,"message":"86","line":23,"column":11,"nodeType":"87","endLine":23,"endColumn":33},"no-native-reassign",["98"],"no-negated-in-lhs",["99"],"react-hooks/exhaustive-deps","React Hook useEffect has a missing dependency: 'requests'. Either include it or remove the dependency array.","ArrayExpression",["100"],"jsx-a11y/alt-text","img elements must have an alt prop, either with meaningful text, or an empty string for decorative images.","JSXOpeningElement",["98"],["99"],"React Hook useEffect has a missing dependency: 'getPokeDetails'. Either include it or remove the dependency array.",["101"],["98"],["99"],["98"],["99"],"React Hook useEffect has a missing dependency: 'pokemonPhoto'. Either include it or remove the dependency array.",["102"],"no-global-assign","no-unsafe-negation",{"desc":"103","fix":"104"},{"desc":"105","fix":"106"},{"desc":"107","fix":"108"},"Update the dependencies array to be: [requests]",{"range":"109","text":"110"},"Update the dependencies array to be: [getPokeDetails]",{"range":"111","text":"112"},"Update the dependencies array to be: [pokemonPhoto]",{"range":"113","text":"114"},[632,634],"[requests]",[592,594],"[getPokeDetails]",[671,673],"[pokemonPhoto]"]
\ No newline at end of file
+[{"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/reportWebVitals.js":"1","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalStateContext.js":"2","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/HomePage/index.js":"3","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/assets/img/PokeLogo.js":"4","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/DetailsCard/index.js":"5","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalState.js.js":"6","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Router.js":"7","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/constants/urls/index.js":"8","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Coordinator.js":"9","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/PokeCard/PokeCard.js":"10","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/PokeDexPage/index.js":"11","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/styles/styles.js":"12","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/App.js":"13","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/DetailsPage/index.js":"14","/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/index.js":"15"},{"size":362,"mtime":1606440818921,"results":"16","hashOfConfig":"17"},{"size":113,"mtime":1606477072422,"results":"18","hashOfConfig":"17"},{"size":1955,"mtime":1606485863547,"results":"19","hashOfConfig":"17"},{"size":128,"mtime":1606477072422,"results":"20","hashOfConfig":"17"},{"size":2389,"mtime":1606501046175,"results":"21","hashOfConfig":"17"},{"size":894,"mtime":1606501599481,"results":"22","hashOfConfig":"17"},{"size":684,"mtime":1606485863547,"results":"23","hashOfConfig":"17"},{"size":59,"mtime":1606477072426,"results":"24","hashOfConfig":"17"},{"size":310,"mtime":1606485863547,"results":"25","hashOfConfig":"17"},{"size":1700,"mtime":1606505062664,"results":"26","hashOfConfig":"17"},{"size":1212,"mtime":1606506825775,"results":"27","hashOfConfig":"17"},{"size":3429,"mtime":1606477072426,"results":"28","hashOfConfig":"17"},{"size":277,"mtime":1606477072422,"results":"29","hashOfConfig":"17"},{"size":1407,"mtime":1606485863547,"results":"30","hashOfConfig":"17"},{"size":500,"mtime":1606440818921,"results":"31","hashOfConfig":"17"},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},"6ny1o2",{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":"39","usedDeprecatedRules":"40"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"43"},{"filePath":"44","messages":"45","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"54"},{"filePath":"55","messages":"56","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"57","messages":"58","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"63"},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"66"},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"40"},"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/reportWebVitals.js",[],["69","70"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalStateContext.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/HomePage/index.js",["71","72"],"import React, { useContext, useEffect } from 'react'\nimport {Header,ButtonContainer, HomeFlexBox} from '../../styles/styles'\nimport { useHistory } from \"react-router-dom\";\nimport {goToPokeDexPage} from '../../router/Coordinator'\nimport {Button} from '@material-ui/core'\nimport PokeCard from '../../components/PokeCard/PokeCard';\nimport GlobalStateContext from '../../Global/GlobalStateContext';\nimport {PokeLogo} from '../../assets/img/PokeLogo'\n\nconst HomePage = () => {\n  const history = useHistory();\n\nconst {states, setters, requests} = useContext(GlobalStateContext)\n\n    useEffect(()=>{\n      requests.getPokemonList()\n    }, [])\n    const addToPokedex = (newPokemon) => {\n          const pokemonInPokedex = states.pokedex.find((pokemon) => newPokemon.name === pokemon.name)\n      if (!pokemonInPokedex) {\n          const pokemonToAdd = states.pokemonList.find((pokemon) => newPokemon.name === pokemon.name)\n          const newPokedex = [...states.pokedex, pokemonToAdd]\n          setters.setPokedex(newPokedex)\n      }\n    }\n    // const renderedPokemons = () => {\n    //   pokemonList.map((pokemon) => {\n    //     return (<PokeCard key={pokemon.name} photo={photo} name={pokemon.name}/>)\n    //   })\n    // }\n    return(\n          <div>\n            <Header>\n            <ButtonContainer>\n                        <Button variant=\"contained\" color=\"primary\" onClick={()=>goToPokeDexPage(history)}>\n                          Ver minha pokedex\n                        </Button>\n                  </ButtonContainer>\n                  <h1>Lista de Pokemons</h1>\n                  <img src={PokeLogo} />\n              </Header>\n              <HomeFlexBox>\n\n        {states.pokemonList && \n          states.pokemonList.map((pokemon) => {\n            return (<PokeCard key={pokemon.name} pokemon={pokemon} addToPokedex={() => addToPokedex(pokemon)}/>)\n          })\n        }\n        </HomeFlexBox>\n\n            </div>\n      )\n}\n  export default HomePage;\n",["73","74"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/assets/img/PokeLogo.js",[],["75","76"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/DetailsCard/index.js",["77","78"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/Global/GlobalState.js.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Router.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/constants/urls/index.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/router/Coordinator.js",[],["79","80"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/components/PokeCard/PokeCard.js",["81","82","83"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/PokeDexPage/index.js",["84","85","86"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/styles/styles.js",[],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/App.js",[],["87","88"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/screens/DetailsPage/index.js",[],["89","90"],"/home/alvarojr/Labenu/dumont-pokedex7/pokedex/src/index.js",[],{"ruleId":"91","replacedBy":"92"},{"ruleId":"93","replacedBy":"94"},{"ruleId":"95","severity":1,"message":"96","line":17,"column":8,"nodeType":"97","endLine":17,"endColumn":10,"suggestions":"98"},{"ruleId":"99","severity":1,"message":"100","line":40,"column":19,"nodeType":"101","endLine":40,"endColumn":41},{"ruleId":"91","replacedBy":"102"},{"ruleId":"93","replacedBy":"103"},{"ruleId":"91","replacedBy":"104"},{"ruleId":"93","replacedBy":"105"},{"ruleId":"95","severity":1,"message":"106","line":20,"column":6,"nodeType":"97","endLine":20,"endColumn":8,"suggestions":"107"},{"ruleId":"95","severity":1,"message":"108","line":34,"column":6,"nodeType":"97","endLine":34,"endColumn":12,"suggestions":"109"},{"ruleId":"91","replacedBy":"110"},{"ruleId":"93","replacedBy":"111"},{"ruleId":"112","severity":1,"message":"113","line":14,"column":18,"nodeType":"114","messageId":"115","endLine":14,"endColumn":25},{"ruleId":"112","severity":1,"message":"116","line":14,"column":27,"nodeType":"114","messageId":"115","endLine":14,"endColumn":35},{"ruleId":"95","severity":1,"message":"117","line":32,"column":6,"nodeType":"97","endLine":32,"endColumn":8,"suggestions":"118"},{"ruleId":"112","severity":1,"message":"113","line":15,"column":18,"nodeType":"114","messageId":"115","endLine":15,"endColumn":25},{"ruleId":"112","severity":1,"message":"116","line":15,"column":27,"nodeType":"114","messageId":"115","endLine":15,"endColumn":35},{"ruleId":"99","severity":1,"message":"100","line":28,"column":11,"nodeType":"101","endLine":28,"endColumn":33},{"ruleId":"91","replacedBy":"119"},{"ruleId":"93","replacedBy":"120"},{"ruleId":"91","replacedBy":"121"},{"ruleId":"93","replacedBy":"122"},"no-native-reassign",["123"],"no-negated-in-lhs",["124"],"react-hooks/exhaustive-deps","React Hook useEffect has a missing dependency: 'requests'. Either include it or remove the dependency array.","ArrayExpression",["125"],"jsx-a11y/alt-text","img elements must have an alt prop, either with meaningful text, or an empty string for decorative images.","JSXOpeningElement",["123"],["124"],["123"],["124"],"React Hook useEffect has a missing dependency: 'getPokeDetails'. Either include it or remove the dependency array.",["126"],"React Hook useEffect has a missing dependency: 'renderMoves'. Either include it or remove the dependency array.",["127"],["123"],["124"],"no-unused-vars","'setters' is assigned a value but never used.","Identifier","unusedVar","'requests' is assigned a value but never used.","React Hook useEffect has a missing dependency: 'pokemonPhoto'. Either include it or remove the dependency array.",["128"],["123"],["124"],["123"],["124"],"no-global-assign","no-unsafe-negation",{"desc":"129","fix":"130"},{"desc":"131","fix":"132"},{"desc":"133","fix":"134"},{"desc":"135","fix":"136"},"Update the dependencies array to be: [requests]",{"range":"137","text":"138"},"Update the dependencies array to be: [getPokeDetails]",{"range":"139","text":"140"},"Update the dependencies array to be: [data, renderMoves]",{"range":"141","text":"142"},"Update the dependencies array to be: [pokemonPhoto]",{"range":"143","text":"144"},[632,634],"[requests]",[633,635],"[getPokeDetails]",[908,914],"[data, renderMoves]",[1035,1037],"[pokemonPhoto]"]
\ No newline at end of file
diff --git a/pokedex/package-lock.json b/pokedex/package-lock.json
index b6dc1e9..4d3506e 100644
--- a/pokedex/package-lock.json
+++ b/pokedex/package-lock.json
@@ -5234,9 +5234,9 @@
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
     },
     "electron-to-chromium": {
-      "version": "1.3.609",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.609.tgz",
-      "integrity": "sha512-kcmRWmlHsUKKLfsSKSf7VqeTX4takM5ndjVTM3et3qpDCceITYI1DixvIfSDIngALoaTnpoMXD3SXSMpzHkYKA=="
+      "version": "1.3.610",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz",
+      "integrity": "sha512-eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="
     },
     "elliptic": {
       "version": "6.5.3",
@@ -14490,9 +14490,9 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         },
         "terser": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.0.tgz",
-          "integrity": "sha512-eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==",
+          "version": "5.5.1",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
+          "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
           "requires": {
             "commander": "^2.20.0",
             "source-map": "~0.7.2",
diff --git a/pokedex/src/Global/GlobalState.js.js b/pokedex/src/Global/GlobalState.js.js
index e788ed8..7741679 100644
--- a/pokedex/src/Global/GlobalState.js.js
+++ b/pokedex/src/Global/GlobalState.js.js
@@ -12,6 +12,7 @@ const GlobalState = (props) => {
 
     axios.get(baseURL).then(response => {
       setPokemonList(response.data.results)
+      setPokedex(response.data.results)
   })
   .catch(error =>{console.log(error)})
 }
diff --git a/pokedex/src/components/DetailsCard/index.js b/pokedex/src/components/DetailsCard/index.js
index c905bc1..70b8fae 100644
--- a/pokedex/src/components/DetailsCard/index.js
+++ b/pokedex/src/components/DetailsCard/index.js
@@ -5,6 +5,7 @@ import { baseURL } from '../../constants/urls'
 
 const DetailsCard = (props) => {
   const [data, setData] = useState({})
+  const [moves, setMoves] = useState([])
 
   const getPokeDetails = () => {
     axios.get(`${baseURL}/${props.pokemon.pokemon}`).then((res)=>{
@@ -18,6 +19,20 @@ const DetailsCard = (props) => {
     getPokeDetails()
   }, [])
 
+  const renderMoves = () => {
+    const newMoves = []
+    if (data.moves) {
+      for (let i=0; (i < 7 && i < data.moves.length); i++){
+        newMoves.push(data.moves[i].move.name)
+      }
+      setMoves(newMoves)
+    }
+  }
+
+  useEffect(() => {
+    renderMoves()
+  }, [data])
+
   return(
     <div>
           <DetailsFlexBox>
@@ -51,16 +66,9 @@ const DetailsCard = (props) => {
               </PokeTypeContainer>
               <PokeMovesContainer>
                   <h3>Moves</h3>
-                  {data.moves && <div>
-                    <p>{data.moves[0].move.name}</p>
-                    <p>{data.moves[1].move.name}</p>
-                    <p>{data.moves[2].move.name}</p>
-                    <p>{data.moves[3].move.name}</p>
-                    <p>{data.moves[4].move.name}</p>
-                    <p>{data.moves[5].move.name}</p>
-                    <p>{data.moves[6].move.name}</p>
-                    <p>{data.moves[7].move.name}</p>
-                    </div>}
+                  {moves && moves.map((moves) => {
+                    return <p>{moves}</p>
+                  })}
             </PokeMovesContainer>
           </TypeMovesFlexBox>
       </DetailsFlexBox>
diff --git a/pokedex/src/components/PokeCard/PokeCard.js b/pokedex/src/components/PokeCard/PokeCard.js
index 819a3ec..836270c 100644
--- a/pokedex/src/components/PokeCard/PokeCard.js
+++ b/pokedex/src/components/PokeCard/PokeCard.js
@@ -1,15 +1,24 @@
-import React, { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import { DetailsBtnContainer,PokeCardContainer} from '../../styles/styles'
 import {Button} from '@material-ui/core'
 import { useHistory } from "react-router-dom";
 import {goToDetailsPage} from '../../router/Coordinator'
 import axios from 'axios'
+import GlobalStateContext from '../../Global/GlobalStateContext';
 
 export default function PokeCard (props) {
   const history = useHistory();
 
   const [photo, setPhoto] = useState ([])
 
+  const {states, setters, requests} = useContext(GlobalStateContext)
+
+  const removePokeFromPokedex = (poke) => {
+    const index = states.pokedex.findIndex((pokemon) => poke.name === pokemon.name)
+    const newPokedex = states.pokedex.splice(index, 1)
+    console.log(newPokedex)
+  }
+
   const pokemonPhoto = () => {
     axios.get(props.pokemon.url).then((response) => {
         setPhoto(response.data.sprites.front_default)
@@ -30,7 +39,8 @@ export default function PokeCard (props) {
            alt={props.pokemon.name}/>
           <p>{props.pokemon.name}</p>    
         <DetailsBtnContainer>
-            <Button Button variant="outlined">
+            <Button Button variant="outlined"
+              onCLick={() => removePokeFromPokedex(props.pokemon)}>
               Adicionar
             </Button>
       </DetailsBtnContainer>
diff --git a/pokedex/src/screens/PokeDexPage/index.js b/pokedex/src/screens/PokeDexPage/index.js
index a1e1498..6cdc544 100644
--- a/pokedex/src/screens/PokeDexPage/index.js
+++ b/pokedex/src/screens/PokeDexPage/index.js
@@ -3,12 +3,17 @@ import {Header} from '../../styles/styles'
 import { useHistory } from "react-router-dom";
 import {Button} from '@material-ui/core'
 import {ButtonContainer, HomeFlexBox} from '../../styles/styles'
-import {goToHomePage } from '../../router/Coordinator'
+import {goToHomePage} from '../../router/Coordinator'
 import {PokeLogo} from '../../assets/img/PokeLogo'
+import PokeCard from '../../components/PokeCard/PokeCard';
+import { useContext } from 'react';
+import GlobalStateContext from '../../Global/GlobalStateContext';
 
 const PokeDexPage = () => {
   const history = useHistory();
 
+  const {states, setters, requests} = useContext(GlobalStateContext)
+
   return(
     <div>
       <Header>
@@ -23,6 +28,11 @@ const PokeDexPage = () => {
           <img src={PokeLogo} />
       </Header>
       <HomeFlexBox>
+      {states.pokedex && 
+          states.pokedex.map((pokemon) => {
+            return (<PokeCard key={pokemon.name} pokemon={pokemon}/>)
+          })
+        }
       </HomeFlexBox>
     </div>
   )