Skip to content
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

PSP-9806: Research File: edit icon is displaying incorrect colour for the property research tab #4581

Merged
merged 2 commits into from
Jan 8, 2025
Merged

PSP-9806: Research File: edit icon is displaying incorrect colour for the property research tab #4581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d279dd1
PSP-9806 fix
stairaku Jan 8, 2025
faacc73
Merge branch 'dev' into PSP-9806
stairaku Jan 8, 2025
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
19 changes: 6 additions & 13 deletions ...src/features/mapSideBar/property/tabs/propertyResearch/detail/PropertyResearchTabView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Button } from 'react-bootstrap';
import { FaEdit } from 'react-icons/fa';
import styled from 'styled-components';

import EditButton from '@/components/common/buttons/EditButton';
import { Section } from '@/components/common/Section/Section';
import { SectionField } from '@/components/common/Section/SectionField';
import { StyledEditWrapper } from '@/components/common/Section/SectionStyles';
import { Claims } from '@/constants/index';
import { useKeycloakWrapper } from '@/hooks/useKeycloakWrapper';
import { ApiGen_Concepts_ResearchFileProperty } from '@/models/api/generated/ApiGen_Concepts_ResearchFileProperty';
Expand Down Expand Up @@ -54,14 +54,13 @@ export const PropertyResearchTabView: React.FunctionComponent<
<StyledSummarySection>
<StyledEditWrapper className="mr-3 my-1">
{hasClaim(Claims.RESEARCH_EDIT) ? (
<Button
variant="link"
<EditButton
title="Edit Property Research"
onClick={() => {
props.setEditMode(true);
}}
>
<FaEdit size={'2rem'} />
</Button>
style={{ float: 'right' }}
/>
) : null}
</StyledEditWrapper>
<Section header="Property of Interest">
Expand All @@ -84,9 +83,3 @@ export default PropertyResearchTabView;
const StyledSummarySection = styled.div`
background-color: ${props => props.theme.css.highlightBackgroundColor};
`;

const StyledEditWrapper = styled.div`
color: ${props => props.theme.css.primary};

text-align: right;
`;
Loading
Loading