;
}
return (
-
+
{children}
);
diff --git a/src/components/elements/form/manageEntries.tsx b/src/components/elements/form/manageEntries.tsx
index e7cb226e..ffcb48b1 100644
--- a/src/components/elements/form/manageEntries.tsx
+++ b/src/components/elements/form/manageEntries.tsx
@@ -8,6 +8,7 @@ import {ApiResponseCode, ApiResponseCodeUtil, BaseResponse, FailedResponse} from
import {useI18n} from '../../../i18n/hook';
import {getElementCounter} from '../../../utils/counter';
import {overrideObject} from '../../../utils/override';
+import {useOnBeforeUnload} from '../../hooks/onBeforeUnload';
import {ArrayForm, ArrayFormOnChangeHandler} from './array/main';
import {UpdateStatus} from './updateStatus';
@@ -51,6 +52,8 @@ export const EntryManagement =
({
isInit: true,
});
+ const {clearUnload} = useOnBeforeUnload([state.data]);
+
const elementCounter = getElementCounter(state.data.map((entry) => getElementUniqueIdentifier(entry)));
const isValid = (
@@ -65,6 +68,7 @@ export const EntryManagement = ({
getSubmitPromise(state.data)
.then((response) => {
+ clearUnload();
setState(overrideObject(state, {updateStatus: response.code, updating: false}));
})
.catch((error) => {
diff --git a/src/components/elements/gameData/unit/filter/main.test.tsx b/src/components/elements/gameData/unit/filter/main.test.tsx
index 161f99b2..7a7844f5 100644
--- a/src/components/elements/gameData/unit/filter/main.test.tsx
+++ b/src/components/elements/gameData/unit/filter/main.test.tsx
@@ -317,4 +317,31 @@ describe('Unit filter input', () => {
expect(await screen.findByText('Title')).toBeInTheDocument();
});
+
+ it('shows ads', async () => {
+ renderReact(() => (
+ 'Unit ID'}}
+ onSearchRequested={onSearchRequested}
+ generateInputData={() => generateFilterInput('unitId')}
+ />
+ ));
+
+ expect(screen.getByTestId('ads-page-top')).toBeInTheDocument();
+ });
+
+ it('hides ads', async () => {
+ renderReact(
+ () => (
+ 'Unit ID'}}
+ onSearchRequested={onSearchRequested}
+ generateInputData={() => generateFilterInput('unitId')}
+ />
+ ),
+ {hasSession: true, user: {adsFreeExpiry: new Date()}},
+ );
+
+ expect(screen.queryByText('ads-page-top')).not.toBeInTheDocument();
+ });
});
diff --git a/src/components/elements/gameData/unit/filter/main.tsx b/src/components/elements/gameData/unit/filter/main.tsx
index c24cfdf8..4866c0b6 100644
--- a/src/components/elements/gameData/unit/filter/main.tsx
+++ b/src/components/elements/gameData/unit/filter/main.tsx
@@ -10,6 +10,7 @@ import {EnumEntry} from '../../../../../api-def/resources';
import {useI18n} from '../../../../../i18n/hook';
import {GetTranslationFunction} from '../../../../../i18n/types';
import {useUnitProps} from '../../../../hooks/unitProps';
+import {AdsPageTop, AdsUnitSearchBottom} from '../../../common/ads/main';
import {CheckOption} from '../../../common/check/types';
import {InputPanel} from '../../../input/panel/main';
import {InputEntries} from '../../../input/panel/types';
@@ -28,8 +29,7 @@ export const UnitFilter = ,
E extends CheckOption,
E2 extends EnumEntry,
- V
->({
+ V>({
onSearchRequested,
sortOrderNames,
generateInputData,
@@ -48,63 +48,67 @@ export const UnitFilter =
-
- inputData.elements,
- getUpdatedInputData: (elements) => ({...inputData, elements}),
- },
- {
- type: 'enumCheckGroup',
- options: weaponEnums.weapon,
- getValue: (inputData) => inputData.weaponTypes,
- getUpdatedInputData: (weaponTypes) => ({...inputData, weaponTypes}),
- },
- ]}
- />
- {
- additionalInputs.length > 0 &&
-
- }
-
-
+ <>
+
+
+
+ inputData.elements,
+ getUpdatedInputData: (elements) => ({...inputData, elements}),
+ },
+ {
+ type: 'enumCheckGroup',
+ options: weaponEnums.weapon,
+ getValue: (inputData) => inputData.weaponTypes,
+ getUpdatedInputData: (weaponTypes) => ({...inputData, weaponTypes}),
+ },
+ ]}
+ />
+ {
+ additionalInputs.length > 0 &&
+
+ }
+
+
+
+
);
};
diff --git a/src/components/elements/posts/form/base.tsx b/src/components/elements/posts/form/base.tsx
index b8fac9c9..a7838e3a 100644
--- a/src/components/elements/posts/form/base.tsx
+++ b/src/components/elements/posts/form/base.tsx
@@ -6,6 +6,7 @@ import {ApiResponseCode, PostEditResponse, PostMeta} from '../../../../api-def/a
import {AppReactContext} from '../../../../context/app/main';
import {useI18n} from '../../../../i18n/hook';
import {alertDispatchers} from '../../../../state/alert/dispatchers';
+import {useOnBeforeUnload} from '../../../hooks/onBeforeUnload';
import {ProtectedLayout} from '../../../pages/layout/protected';
import {ModalFlexContent} from '../../common/modal/flex';
import {ModalStateFlex} from '../../common/modal/types';
@@ -40,16 +41,7 @@ export const PostFormBase =
({
message: '',
});
- React.useEffect(() => {
- window.onbeforeunload = (e) => {
- e.preventDefault();
- return (e.returnValue = '');
- };
-
- return () => {
- window.onbeforeunload = null;
- };
- }, [formState]);
+ const {clearUnload} = useOnBeforeUnload([formState]);
const setPayload = (key: K, newValue: P[K]) => {
const payload: P = {...formState.payload, [key]: newValue};
@@ -84,7 +76,7 @@ export const PostFormBase = ({
const data = await fnSendRequest(formState.payload);
if (data.success) {
- window.onbeforeunload = null;
+ clearUnload();
if (onSubmitSuccess) {
onSubmitSuccess();
diff --git a/src/components/elements/posts/form/meta/hook.test.ts b/src/components/elements/posts/form/meta/hook.test.ts
index 9fa72c4e..eb80dc32 100644
--- a/src/components/elements/posts/form/meta/hook.test.ts
+++ b/src/components/elements/posts/form/meta/hook.test.ts
@@ -9,7 +9,6 @@ import {useFormMeta} from './hook';
describe('Form meta hook', () => {
let formState: PostFormState;
let setAvailability: jest.Mock;
- let setPayload: jest.Mock;
beforeEach(() => {
formState = {
@@ -20,7 +19,6 @@ describe('Form meta hook', () => {
},
};
setAvailability = jest.fn().mockImplementation((available) => formState.isIdAvailable = available);
- setPayload = jest.fn();
});
it('does not run the check if the user is not an admin', async () => {
@@ -30,7 +28,6 @@ describe('Form meta hook', () => {
() => useFormMeta({
formState,
setAvailability,
- setPayload,
fnIdCheck,
getEffectDependency: (payload) => [payload.lang],
}),
@@ -46,11 +43,15 @@ describe('Form meta hook', () => {
expect(setAvailability).toHaveBeenCalledWith(false);
expect(fnIdCheck).not.toHaveBeenCalled();
- expect(result.current.isValid).toBe(false);
+ expect(result.current.isValid).toBeFalsy();
});
it('loads initial validity state', async () => {
- const fnIdCheck = jest.fn();
+ const fnIdCheck = jest.fn().mockResolvedValue({
+ code: ApiResponseCode.SUCCESS,
+ success: true,
+ available: true,
+ });
const {result} = renderReactHook(
() => useFormMeta({
@@ -59,18 +60,13 @@ describe('Form meta hook', () => {
isIdAvailable: true,
},
setAvailability,
- setPayload,
fnIdCheck,
getEffectDependency: (payload) => [payload.lang],
}),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
- expect(result.current.isValid).toBe(true);
+ await waitFor(() => expect(result.current.isValid).toBeTruthy());
});
it('returns valid if the check passed', async () => {
@@ -85,7 +81,6 @@ describe('Form meta hook', () => {
() => useFormMeta({
formState,
setAvailability,
- setPayload,
fnIdCheck,
getEffectDependency: (payload) => [payload.lang],
}),
@@ -120,7 +115,6 @@ describe('Form meta hook', () => {
() => useFormMeta({
formState,
setAvailability,
- setPayload,
fnIdCheck,
getEffectDependency: (payload) => [payload.lang],
}),
diff --git a/src/components/elements/posts/form/meta/hook.tsx b/src/components/elements/posts/form/meta/hook.tsx
index ceb51fd5..f84ca862 100644
--- a/src/components/elements/posts/form/meta/hook.tsx
+++ b/src/components/elements/posts/form/meta/hook.tsx
@@ -6,7 +6,10 @@ import {DelayedCheckState} from '../../../common/types';
import {isFormStateValid, PostFormControlProps} from '../types';
-type FormMetaHookProps = PostFormControlProps
& {
+type FormMetaHookProps
= Omit<
+ PostFormControlProps
,
+ 'setPayload'
+> & {
fnIdCheck: (payload: P) => Promise,
getEffectDependency: (payload: P) => React.DependencyList,
}
@@ -33,6 +36,11 @@ export const useFormMeta = ({
const isValid = context?.session?.user.isAdmin ? isFormStateValid(formState) : false;
const checkAvailability = (payload: P) => {
+ if (!context?.session?.user.isAdmin) {
+ setAvailability(false);
+ return;
+ }
+
setCheckState({...checkState, isChecking: true});
fnIdCheck(payload)
.then((data) => setAvailability(data.available))
@@ -40,8 +48,10 @@ export const useFormMeta =
({
.finally(() => setCheckState({...checkState, isChecking: false}));
};
- // Check availability on `payload.seqId` or `payload.lang` changed
+ // Check availability on dependency changed
// - `timeout` for delaying the availability check
+ // - No need to check availability on load because it's unlikely an user will submit within 1 sec after load.
+ // Even if submitted, it's likely to fail.
React.useEffect(
() => {
if (!context?.session?.user.isAdmin) {
diff --git a/src/components/elements/posts/form/meta/sequenced.test.tsx b/src/components/elements/posts/form/meta/sequenced.test.tsx
index 9a20c51f..d966163a 100644
--- a/src/components/elements/posts/form/meta/sequenced.test.tsx
+++ b/src/components/elements/posts/form/meta/sequenced.test.tsx
@@ -63,11 +63,7 @@ describe('Sequenced form meta input', () => {
fnIdCheck={fnIdCheck}
/>
),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
const idField = screen.getByPlaceholderText(translationEN.posts.info.id);
typeInput(idField, '577', {rerender});
@@ -96,11 +92,7 @@ describe('Sequenced form meta input', () => {
fnIdCheck={fnIdCheck}
/>
),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
const idField = screen.getByPlaceholderText(translationEN.posts.info.id);
typeInput(idField, '577', {rerender});
@@ -121,11 +113,7 @@ describe('Sequenced form meta input', () => {
fnIdCheck={fnIdCheck}
/>
),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
const idField = screen.getByPlaceholderText(translationEN.posts.info.id);
typeInput(idField, '577', {rerender});
@@ -146,11 +134,7 @@ describe('Sequenced form meta input', () => {
fnIdCheck={fnIdCheck}
/>
),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
const titleField = screen.getByPlaceholderText(titlePlaceholder);
typeInput(titleField, 'Another Title', {rerender});
@@ -171,11 +155,7 @@ describe('Sequenced form meta input', () => {
fnIdCheck={fnIdCheck}
/>
),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
const langField = screen.getByTestId('langSelect');
fireEvent.change(langField, {target: {value: SupportedLanguages.JP}});
@@ -199,11 +179,7 @@ describe('Sequenced form meta input', () => {
fnIdCheck={fnIdCheck}
/>
),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
const langField = screen.getByTestId('langSelect');
fireEvent.change(langField, {target: {value: SupportedLanguages.JP}});
@@ -223,11 +199,7 @@ describe('Sequenced form meta input', () => {
fnIdCheck={fnIdCheck}
/>
),
- {
- user: {
- isAdmin: true,
- },
- },
+ {user: {isAdmin: true}},
);
const titleField = screen.getByPlaceholderText(titlePlaceholder);
typeInput(titleField, 'Another Title', {rerender});
diff --git a/src/components/elements/posts/form/meta/sequenced.tsx b/src/components/elements/posts/form/meta/sequenced.tsx
index a6285425..61a2c6c0 100644
--- a/src/components/elements/posts/form/meta/sequenced.tsx
+++ b/src/components/elements/posts/form/meta/sequenced.tsx
@@ -35,7 +35,6 @@ export const FormSequencedMeta =
(
fnIdCheck(context?.session?.user.id.toString() || '', Number(payload.seqId) || null, payload.lang)
diff --git a/src/components/elements/posts/list/page.tsx b/src/components/elements/posts/list/page.tsx
index 5e25f51d..376ad4dd 100644
--- a/src/components/elements/posts/list/page.tsx
+++ b/src/components/elements/posts/list/page.tsx
@@ -7,7 +7,7 @@ import {AppReactContext} from '../../../../context/app/main';
import {useI18n} from '../../../../i18n/hook';
import {useNextRouter} from '../../../../utils/router';
import {FunctionFetchPostList} from '../../../../utils/services/api';
-import {AdsInPostList} from '../../common/ads/main';
+import {AdsPostList} from '../../common/ads/main';
import {FetchStatusSimple, isNotFetched} from '../../common/fetch';
import {Paginator} from '../../common/pagination/paginator';
import {PaginationState} from '../../common/pagination/types';
@@ -118,7 +118,7 @@ export const PostListPage = ({
return (
<>
-
+
{title}
diff --git a/src/components/hooks/onBeforeUnload.ts b/src/components/hooks/onBeforeUnload.ts
new file mode 100644
index 00000000..e88a99a5
--- /dev/null
+++ b/src/components/hooks/onBeforeUnload.ts
@@ -0,0 +1,23 @@
+import React from 'react';
+
+
+type UseOnBeforeUnloadReturn = {
+ clearUnload: () => void,
+}
+
+export const useOnBeforeUnload = (dependencies: React.DependencyList): UseOnBeforeUnloadReturn => {
+ const clearUnload = () => {
+ window.onbeforeunload = null;
+ };
+
+ React.useEffect(() => {
+ window.onbeforeunload = (e) => {
+ e.preventDefault();
+ return (e.returnValue = '');
+ };
+
+ return clearUnload;
+ }, dependencies);
+
+ return {clearUnload};
+};
diff --git a/src/components/pages/gameData/unitInfo/lookup/in/landing.tsx b/src/components/pages/gameData/unitInfo/lookup/in/landing.tsx
index b612d044..3553c359 100644
--- a/src/components/pages/gameData/unitInfo/lookup/in/landing.tsx
+++ b/src/components/pages/gameData/unitInfo/lookup/in/landing.tsx
@@ -17,23 +17,21 @@ export const UnitInfoLookupLanding = ({analyses}: Props) => {
return (
- {
- analyses
- .flatMap((entry) => {
- const unitInfo = unitInfoMap.get(entry.unitId);
- return unitInfo ? [{entry, unitInfo}] : [];
- })
- .map(({entry, unitInfo}) => (
-
-
-
- ))
- }
+ {analyses
+ .flatMap((entry) => {
+ const unitInfo = unitInfoMap.get(entry.unitId);
+ return unitInfo ? [{entry, unitInfo}] : [];
+ })
+ .map(({entry, unitInfo}) => (
+
+
+
+ ))}
);
};
diff --git a/src/components/pages/gameData/unitInfo/lookup/main.tsx b/src/components/pages/gameData/unitInfo/lookup/main.tsx
index be96a365..6f658572 100644
--- a/src/components/pages/gameData/unitInfo/lookup/main.tsx
+++ b/src/components/pages/gameData/unitInfo/lookup/main.tsx
@@ -5,7 +5,6 @@ import {AppReactContext} from '../../../../../context/app/main';
import {useI18n} from '../../../../../i18n/hook';
import {ApiRequestSender} from '../../../../../utils/services/api/requestSender';
import {GoogleAnalytics} from '../../../../../utils/services/ga';
-import {AdsInPostList} from '../../../../elements/common/ads/main';
import {useFetchState} from '../../../../elements/common/fetch';
import {UnitInfoLookupLanding} from './in/landing';
import {UnitInfoLookupInput} from './in/main';
@@ -31,7 +30,6 @@ export const UnitInfoLookup = () => {
return (
<>
-
{
let fnIdCheck: jest.SpyInstance;
- const changeToValidUnitIdAndWaitPass = async () => {
- const unitId = screen.getByDisplayValue(0);
- userEvent.clear(unitId);
- userEvent.type(unitId, '10950101');
- jest.advanceTimersByTime(1100);
- await waitFor(() => expect(unitId).toHaveClass('is-valid'));
- };
-
beforeEach(() => {
jest.restoreAllMocks();
jest.useFakeTimers();
@@ -45,16 +37,22 @@ describe('New character analysis form', () => {
{user: {isAdmin: true}},
);
+ jest.advanceTimersByTime(1100); // Meta checks only after 1 sec
await waitFor(() => expect(fnIdCheck).toHaveBeenCalled());
});
it('shows valid after typing in ID', async () => {
- renderReact(
+ const {rerender} = renderReact(
() => ,
{user: {isAdmin: true}},
);
- await changeToValidUnitIdAndWaitPass();
+ const unitId = screen.getByDisplayValue(0);
+ userEvent.clear(unitId);
+ typeInput(unitId, '10950101', {rerender});
+
+ jest.advanceTimersByTime(1100);
+ await waitFor(() => expect(unitId).toHaveClass('is-valid'));
});
it('loads backup data', async () => {
@@ -157,6 +155,7 @@ describe('New character analysis form', () => {
});
it('clears the backup after publishing', async () => {
+ jest.useRealTimers(); // Have to call this for dispatcher spy to work properly
const fnClear = jest.spyOn(backupDispatchers, BackupDispatcherName.CLEAR_CHARA_ANALYSIS);
jest.spyOn(ApiRequestSender, 'analysisPublishChara').mockResolvedValue({
code: ApiResponseCode.SUCCESS,
@@ -172,7 +171,7 @@ describe('New character analysis form', () => {
backup: {
analysis: {
chara: {
- unitId: 10950101,
+ unitId: 10550101,
type: UnitType.CHARACTER,
lang: SupportedLanguages.CHT,
summary: 'summary',
@@ -197,7 +196,6 @@ describe('New character analysis form', () => {
const publishButton = await screen.findByText(
translationEN.posts.manage.publish,
{selector: 'button:enabled'},
- {timeout: 2000},
);
userEvent.click(publishButton);
diff --git a/src/components/pages/posts/analysis/form/dragon/new.test.tsx b/src/components/pages/posts/analysis/form/dragon/new.test.tsx
index 455c7e6a..e08616f1 100644
--- a/src/components/pages/posts/analysis/form/dragon/new.test.tsx
+++ b/src/components/pages/posts/analysis/form/dragon/new.test.tsx
@@ -45,6 +45,7 @@ describe('New dragon analysis form', () => {
{user: {isAdmin: true}},
);
+ jest.advanceTimersByTime(1100); // Meta checks only after 1 sec
await waitFor(() => expect(fnIdCheck).toHaveBeenCalled());
});
@@ -157,6 +158,7 @@ describe('New dragon analysis form', () => {
});
it('clears the backup after publishing', async () => {
+ jest.useRealTimers(); // Have to call this for dispatcher spy to work properly
const fnClear = jest.spyOn(backupDispatchers, BackupDispatcherName.CLEAR_DRAGON_ANALYSIS);
jest.spyOn(ApiRequestSender, 'analysisPublishDragon').mockResolvedValue({
code: ApiResponseCode.SUCCESS,
diff --git a/src/components/pages/posts/analysis/form/meta.tsx b/src/components/pages/posts/analysis/form/meta.tsx
index 2e0be1c4..668b5d32 100644
--- a/src/components/pages/posts/analysis/form/meta.tsx
+++ b/src/components/pages/posts/analysis/form/meta.tsx
@@ -27,7 +27,6 @@ export const FormAnalysisMeta = ({
const {isValid, isChecking} = useFormMeta({
formState,
- setPayload,
setAvailability,
fnIdCheck: (payload) => (
ApiRequestSender.analysisIdCheck(context?.session?.user.id.toString() || '', payload.unitId, payload.lang)
diff --git a/src/components/pages/posts/quest/form/new.test.tsx b/src/components/pages/posts/quest/form/new.test.tsx
index 7caefb2e..65d13cd6 100644
--- a/src/components/pages/posts/quest/form/new.test.tsx
+++ b/src/components/pages/posts/quest/form/new.test.tsx
@@ -37,6 +37,7 @@ describe('New quest post form', () => {
{user: {isAdmin: true}},
);
+ jest.advanceTimersByTime(1100); // Meta checks only after 1 sec
await waitFor(() => expect(fnIdCheck).toHaveBeenCalled());
});
@@ -157,6 +158,7 @@ describe('New quest post form', () => {
});
it('clears the backup after publishing', async () => {
+ jest.useRealTimers(); // Have to call this for dispatcher spy to work properly
const fnClear = jest.spyOn(backupDispatchers, BackupDispatcherName.CLEAR_QUEST_GUIDE);
jest.spyOn(ApiRequestSender, 'questPublish').mockResolvedValue({
code: ApiResponseCode.SUCCESS,
diff --git a/src/components/pages/tier/edit/main.tsx b/src/components/pages/tier/edit/main.tsx
index d45b5b5f..1e5921ab 100644
--- a/src/components/pages/tier/edit/main.tsx
+++ b/src/components/pages/tier/edit/main.tsx
@@ -17,6 +17,7 @@ import {ModalFlexContent} from '../../../elements/common/modal/flex';
import {ModalStateFlex} from '../../../elements/common/modal/types';
import {useUnitId} from '../../../elements/gameData/hook';
import {AutoComplete} from '../../../elements/input/autoComplete/main';
+import {useOnBeforeUnload} from '../../../hooks/onBeforeUnload';
import {ProtectedLayout} from '../../layout/protected';
import styles from '../main.module.css';
import {TierNoteDimensionEntry} from './dimension';
@@ -50,6 +51,8 @@ export const TierNoteEdit = () => {
isFetchingResources,
} = useTierNoteEditResources(unitId);
+ const {clearUnload} = useOnBeforeUnload([unitTierNote]);
+
if (isFetchingResources) {
return ;
}
@@ -83,6 +86,7 @@ export const TierNoteEdit = () => {
return;
}
+ clearUnload();
window.location.assign(makeGeneralUrl(GeneralPath.TIER_LOOKUP, {lang}));
})
.catch((e) => {
diff --git a/src/components/pages/tier/main.test.tsx b/src/components/pages/tier/main.test.tsx
index 3ee65cb6..1769bb84 100644
--- a/src/components/pages/tier/main.test.tsx
+++ b/src/components/pages/tier/main.test.tsx
@@ -73,10 +73,10 @@ describe('Tier list page', () => {
userEvent.click(searchButton);
// S tier of 10650503 CoN Solo
- expect(await screen.findByText('S')).toBeInTheDocument();
+ expect(await screen.findByText('S', undefined, {timeout: 3000})).toBeInTheDocument();
// A tier of 10950501 CoN Coop
expect(await screen.findByText('A')).toBeInTheDocument();
- });
+ }, 10000); // Takes longer to perform unconditioned search
it('shows key point edit page button for admin', async () => {
renderReact(
@@ -98,6 +98,21 @@ describe('Tier list page', () => {
});
it('shows categorized tier note if displaying certain dimension only', async () => {
+ renderReact(
+ () => ,
+ {hasSession: true, user: {isAdmin: false}},
+ );
+
+ const ssOnlyButton = screen.getByText('SS');
+ userEvent.click(ssOnlyButton);
+
+ const searchButton = screen.getByText('Search');
+ userEvent.click(searchButton);
+ // S / A / B / C should appear exactly once
+ expect(screen.queryByText('S')).toBeInTheDocument();
+ expect(screen.getByText('A')).toBeInTheDocument();
+ expect(screen.getByText('B')).toBeInTheDocument();
+ expect(screen.getByText('C')).toBeInTheDocument();
});
});
diff --git a/src/components/pages/tier/out/elements/points.tsx b/src/components/pages/tier/out/elements/points.tsx
index afdd891c..fbee0d17 100644
--- a/src/components/pages/tier/out/elements/points.tsx
+++ b/src/components/pages/tier/out/elements/points.tsx
@@ -6,6 +6,7 @@ import {KeyPointData} from '../../../../../api-def/api';
import {GeneralPath} from '../../../../../const/path/definitions';
import {AppReactContext} from '../../../../../context/app/main';
import {useI18n} from '../../../../../i18n/hook';
+import {AdsUnitKeyPointTop} from '../../../../elements/common/ads/main';
import {IconEdit} from '../../../../elements/common/icons';
import {pointTypeWrapperClassName} from '../../const';
import {PointTypeIcon} from '../../icons';
@@ -32,6 +33,7 @@ export const TierKeyPoints = ({keyPointsIds, keyPointsData}: Props) => {
return (
<>
+
{t((t) => t.game.unitTier.points.tipsOnClick)}
diff --git a/src/components/pages/tier/out/main.tsx b/src/components/pages/tier/out/main.tsx
index 7114c64b..e4fe522b 100644
--- a/src/components/pages/tier/out/main.tsx
+++ b/src/components/pages/tier/out/main.tsx
@@ -8,6 +8,7 @@ import {UnitTierData} from '../../../../api-def/api';
import {useI18n} from '../../../../i18n/hook';
import {scrollRefToTop} from '../../../../utils/scroll';
import {useUnitInfo} from '../../../../utils/services/resources/unitInfo/hooks';
+import {AdsTierResultsEnd} from '../../../elements/common/ads/main';
import {getFilteredUnitInfo} from '../../../elements/gameData/unit/filter/utils';
import {sortFunc} from '../const';
import {IconCompDependent} from '../icons';
@@ -68,6 +69,7 @@ export const TierListOutput = ({inputData, tierData, keyPointsData}: Props) => {
keyPointsData={keyPointsData}
/>
}
+ {(entryPackHasTierNote.length || entryPackNoTierNote.length) && }