From 942abf5a89d1c02ce818d6a6de3c833aafa8e8de Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Thu, 2 Feb 2023 03:03:57 -0800 Subject: [PATCH] Fix updating uncap and transcendence This was broken because when we made anonymous parties editable, we moved to using a `editable` boolean passed down through props and forgot to edit these methods --- components/CharacterGrid/index.tsx | 13 ++----------- components/SummonGrid/index.tsx | 13 ++----------- components/UncapIndicator/index.scss | 2 +- components/UncapIndicator/index.tsx | 2 +- components/WeaponGrid/index.tsx | 7 +------ 5 files changed, 7 insertions(+), 30 deletions(-) diff --git a/components/CharacterGrid/index.tsx b/components/CharacterGrid/index.tsx index bed247ca..9cd2d54f 100644 --- a/components/CharacterGrid/index.tsx +++ b/components/CharacterGrid/index.tsx @@ -16,7 +16,6 @@ import type { DetailsObject, JobSkillObject, SearchableObject } from '~types' import api from '~utils/api' import { appState } from '~utils/appState' -import { accountState } from '~utils/accountState' import './index.scss' @@ -330,11 +329,7 @@ const CharacterGrid = (props: Props) => { position: number, uncapLevel: number ) { - if ( - party.user && - accountState.account.user && - party.user.id === accountState.account.user.id - ) { + if (props.editable) { memoizeUncapAction(id, position, uncapLevel) // Optimistically update UI @@ -430,11 +425,7 @@ const CharacterGrid = (props: Props) => { position: number, stage: number ) { - if ( - party.user && - accountState.account.user && - party.user.id === accountState.account.user.id - ) { + if (props.editable) { memoizeTranscendenceAction(id, position, stage) // Optimistically update UI diff --git a/components/SummonGrid/index.tsx b/components/SummonGrid/index.tsx index 94139df2..2df000a2 100644 --- a/components/SummonGrid/index.tsx +++ b/components/SummonGrid/index.tsx @@ -13,7 +13,6 @@ import ExtraSummons from '~components/ExtraSummons' import api from '~utils/api' import { appState } from '~utils/appState' -import { accountState } from '~utils/accountState' import type { DetailsObject, SearchableObject } from '~types' import './index.scss' @@ -184,11 +183,7 @@ const SummonGrid = (props: Props) => { position: number, uncapLevel: number ) { - if ( - party.user && - accountState.account.user && - party.user.id === accountState.account.user.id - ) { + if (props.editable) { memoizeUncapAction(id, position, uncapLevel) // Optimistically update UI @@ -294,11 +289,7 @@ const SummonGrid = (props: Props) => { position: number, stage: number ) { - if ( - party.user && - accountState.account.user && - party.user.id === accountState.account.user.id - ) { + if (props.editable) { memoizeTranscendenceAction(id, position, stage) // Optimistically update UI diff --git a/components/UncapIndicator/index.scss b/components/UncapIndicator/index.scss index 42e1dcd8..758f4750 100644 --- a/components/UncapIndicator/index.scss +++ b/components/UncapIndicator/index.scss @@ -1,4 +1,4 @@ -.Uncap { +.UncapWrapper { position: relative; } diff --git a/components/UncapIndicator/index.tsx b/components/UncapIndicator/index.tsx index 821769cf..5e8aa8e8 100644 --- a/components/UncapIndicator/index.tsx +++ b/components/UncapIndicator/index.tsx @@ -149,7 +149,7 @@ const UncapIndicator = (props: Props) => { } return ( -
+
    {Array.from(Array(numStars)).map((x, i) => { if (props.type === 'character' && i > 4) { diff --git a/components/WeaponGrid/index.tsx b/components/WeaponGrid/index.tsx index 1c5730e9..1c9f72c1 100644 --- a/components/WeaponGrid/index.tsx +++ b/components/WeaponGrid/index.tsx @@ -14,7 +14,6 @@ import WeaponConflictModal from '~components/WeaponConflictModal' import api from '~utils/api' import { appState } from '~utils/appState' -import { accountState } from '~utils/accountState' import type { DetailsObject, SearchableObject } from '~types' @@ -265,11 +264,7 @@ const WeaponGrid = (props: Props) => { position: number, uncapLevel: number ) { - if ( - party.user && - accountState.account.user && - party.user.id === accountState.account.user.id - ) { + if (props.editable) { memoizeAction(id, position, uncapLevel) // Optimistically update UI