Skip to content

Commit 97853d5

Browse files
Merge pull request #10 from MiquelRForgeFlow/main-truly-get-correct-name
[FIX] Truly get correct pokemon name (fixup)
2 parents e8e7ead + 06fb5fb commit 97853d5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pokemon-detail.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export class PokemonDetails {
4646
try {
4747
const response = await fetch(`https://pokeapi.co/api/v2/pokemon/${id}`);
4848
const data = await response.json();
49-
const response2 = await fetch(`https://pokeapi.co/api/v2/pokemon-species/${id}`);
50-
const data2 = await response2.json();
49+
const speciesResponse = await fetch(`https://pokeapi.co/api/v2/pokemon-species/${id}`);
50+
const speciesData = await speciesResponse.json();
5151
const imageUrl = data.sprites.front_default;
5252
const officialArtworkUrl = data.sprites.other["official-artwork"].front_default;
5353
const height = data.height;
@@ -71,7 +71,7 @@ export class PokemonDetails {
7171
const damageRelations = await getPokemonDamageRelations(id);
7272
const pokedexDescriptions = await getPokemonDescriptions(id);
7373
const codename = data.species.name;
74-
const nameEntry = data2.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
74+
const nameEntry = speciesData.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
7575
const name = nameEntry ? nameEntry.name : codename.charAt(0).toUpperCase() + codename.slice(1);
7676
return new PokemonDetails(
7777
id,

pokemon.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class Pokemon {
3535
const is_legendary = speciesData.is_legendary;
3636
const is_mythical = speciesData.is_mythical;
3737
const codename = data.species.name;
38-
const nameEntry = data2.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
38+
const nameEntry = speciesData.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
3939
const name = nameEntry ? nameEntry.name : codename.charAt(0).toUpperCase() + codename.slice(1);
4040

4141
pokemons.push(new Pokemon(i, name, codename, imageUrl, types, is_baby, is_legendary, is_mythical));

0 commit comments

Comments
 (0)