Skip to content

fix: update salary summary item title, #7344 #7352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wliyongfeng merged 1 commit into from
Jun 1, 2026
Merged

fix: update salary summary item title, #7344 #7352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/next-common/components/overview/fellowship/finance/currentSalaryCycle/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ function CurrentSalaryCycle({ title = "Current Salary Cycle", cycleIndex }) {
);
}

export function FellowshipCurrentSalaryCycleLoading() {
export function FellowshipCurrentSalaryCycleLoading({
title = "Current Salary Cycle",
}) {
return (
<SummaryItem
title={
<div className="text12Medium text-textTertiary space-x-1">
<span className="text12Medium text-textTertiary">
Current Salary Cycle
</span>
<span className="text12Medium text-textTertiary">{title}</span>
</div>
}
>
Expand Down
10 changes: 5 additions & 5 deletions packages/next-common/components/summary/allianceOverviewSummary/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import CollectivesProvider from "next-common/context/collectives/collectives";
import { isNil } from "lodash-es";
import { useFellowshipSalaryStats } from "next-common/hooks/fellowship/salary/useFellowshipSalaryStats";

function FellowshipCurrentSalaryCycleSummary() {
function FellowshipCurrentSalaryCycleSummary({ title }) {
const fellowshipSalaryStats = useFellowshipSalaryStats();

if (
isNil(fellowshipSalaryStats) ||
isNil(fellowshipSalaryStats?.cycleIndex)
) {
return <FellowshipCurrentSalaryCycleLoading />;
return <FellowshipCurrentSalaryCycleLoading title={title} />;
}

const { cycleIndex } = fellowshipSalaryStats;

return <FellowshipCurrentSalaryCycle cycleIndex={cycleIndex} />;
return <FellowshipCurrentSalaryCycle title={title} cycleIndex={cycleIndex} />;
}

export default function AllianceOverviewSummary() {
Expand All @@ -47,10 +47,10 @@ export default function AllianceOverviewSummary() {
/>
</SummaryItem>
<CollectivesProvider>
<FellowshipCurrentSalaryCycleSummary />
<FellowshipCurrentSalaryCycleSummary title="Fellowship Salary Cycle" />
</CollectivesProvider>
<CollectivesProvider section="secretary">
<FellowshipCurrentSalaryCycleSummary />
<FellowshipCurrentSalaryCycleSummary title="Secretary Salary Cycle" />
</CollectivesProvider>
</SummaryLayout>
);
Expand Down
Loading