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

Corrected cancel button functionality #1215

Closed
wants to merge 16 commits into from
Closed

Corrected cancel button functionality #1215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
70674ba
Corrected cancel button functionality
Anvita0305 Dec 20, 2023
74c4096
Removed logs
Anvita0305 Dec 21, 2023
9df4673
Removed added logs
Anvita0305 Dec 21, 2023
1320e32
Added tests
Anvita0305 Dec 24, 2023
fd7d152
Revert "Added tests"
Anvita0305 Dec 24, 2023
60aac43
Added Tests
Anvita0305 Dec 24, 2023
4dc4c78
Added Tests
Anvita0305 Dec 24, 2023
019d3d2
fixed conflicting files
Anvita0305 Jan 5, 2024
cf614b1
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
Anvita0305 Jan 14, 2024
320f238
updated and fixed conflicting files
Anvita0305 Jan 14, 2024
663af5a
updated and fixed conflicting files
Anvita0305 Jan 14, 2024
6e3db8f
Update package-lock.json
Anvita0305 Jan 14, 2024
ee4bc2b
updated and fixed conflicting files
Anvita0305 Jan 14, 2024
4644140
Update OrgList.tsx
Anvita0305 Jan 14, 2024
9107004
Merge branch
Anvita0305 Jan 14, 2024
09c1a0b
Removed additional files
Anvita0305 Jan 14, 2024
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
2 changes: 1 addition & 1 deletion src/components/OrgListCard/OrgListCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function orgListCard(props: InterfaceOrgListCardProps): JSX.Element {

function handleClick(): void {
const url = '/orgdash/id=' + _id;

console.log('clicked!');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove logs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, please check.

// Dont change the below two lines
window.location.replace(url);
history.push(url);
Expand Down
13 changes: 4 additions & 9 deletions src/screens/OrgList/OrgList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,9 @@ function orgList(): JSX.Element {
<div>
<div className={styles.flexdir}>
<p className={styles.titlemodal}>{t('manageFeatures')}</p>
<a
onClick={toggleDialogModal}
className={styles.cancel}
<Button
variant="secondary"
onClick={(): void => toggleDialogModal()}
data-testid="closeOrganizationModal"
>
<i
Expand All @@ -605,12 +605,7 @@ function orgList(): JSX.Element {
cursor: 'pointer',
}}
></i>
</a>
<Button
variant="secondary"
onClick={(): void => toggleModal()}
data-testid="closeOrganizationModal"
>
&nbsp;
{t('cancel')}
</Button>
</div>
Expand Down