From a9984138706a832c19a27e736f44a8c6e580f4dd Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sun, 18 Jun 2023 23:08:47 -0700 Subject: [PATCH] Update WeaponUnit for Grand weapon awakenings --- components/weapon/WeaponUnit/index.tsx | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/components/weapon/WeaponUnit/index.tsx b/components/weapon/WeaponUnit/index.tsx index 806cf8b6..8c2c260f 100644 --- a/components/weapon/WeaponUnit/index.tsx +++ b/components/weapon/WeaponUnit/index.tsx @@ -19,7 +19,6 @@ import Button from '~components/common/Button' import type { SearchableObject } from '~types' import ax from '~data/ax' -import { weaponAwakening } from '~data/awakening' import PlusIcon from '~public/icons/Add.svg' import SettingsIcon from '~public/icons/Settings.svg' @@ -88,7 +87,7 @@ const WeaponUnit = ({ return ( weapon.ax || - weapon.awakening || + weapon.awakenings || (weapon.series && [2, 3, 17, 22, 24].includes(weapon.series)) ) } @@ -190,21 +189,16 @@ const WeaponUnit = ({ function awakeningImage() { if ( gridWeapon && - gridWeapon.object.awakening && + gridWeapon.object.awakenings && gridWeapon.awakening && - gridWeapon.awakening.type > 0 && - gridWeapon.awakening.type != null + gridWeapon.awakening.type ) { - const awakening = weaponAwakening.find( - (awakening) => awakening.id === gridWeapon?.awakening?.type - ) - const name = awakening?.name[locale] - + const awakening = gridWeapon.awakening return ( {`${name} ) }