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

Removed unnecessary multiple cancel buttons and added a Back button. #6579

Merged
merged 6 commits into from
Nov 22, 2023
Merged

Removed unnecessary multiple cancel buttons and added a Back button. #6579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3bbfb6
Removed unnecessary cancel buttons and added a back button
KshitijTodkar48 Nov 9, 2023
87cc3fc
made the requested changes
KshitijTodkar48 Nov 10, 2023
d02ac35
Merge branch 'develop' into fix/Unnecessary-multiple-cancel-buttons
nihal467 Nov 10, 2023
059fe31
Merge branch 'develop' into fix/Unnecessary-multiple-cancel-buttons
KshitijTodkar48 Nov 12, 2023
5e35506
Merge branch 'develop' into fix/Unnecessary-multiple-cancel-buttons
KshitijTodkar48 Nov 18, 2023
e8fa5ac
Merge branch 'develop' into fix/Unnecessary-multiple-cancel-buttons
KshitijTodkar48 Nov 21, 2023
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
3 changes: 1 addition & 2 deletions src/Components/ABDM/ConfigureHealthFacility.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { lazy, useReducer, useState } from "react";
import * as Notification from "../../Utils/Notifications.js";
import { navigate } from "raviger";
import { Cancel, Submit } from "../Common/components/ButtonV2";
import { Submit } from "../Common/components/ButtonV2";
import TextFormField from "../Form/FormFields/TextFormField";
import { classNames } from "../../Utils/utils";
import useQuery from "../../Utils/request/useQuery";
Expand Down Expand Up @@ -218,7 +218,6 @@ export const ConfigureHealthFacility = (props: any) => {
</div>
</div>
<div className="flex flex-col gap-3 sm:flex-row sm:justify-end">
<Cancel onClick={() => navigate(`/facility/${facilityId}`)} />
<Submit
onClick={handleSubmit}
disabled={
Expand Down
3 changes: 1 addition & 2 deletions src/Components/Facility/FacilityConfigure.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { lazy, useReducer, useState } from "react";
import * as Notification from "../../Utils/Notifications.js";
import { navigate } from "raviger";
import { Cancel, Submit } from "../Common/components/ButtonV2";
import { Submit } from "../Common/components/ButtonV2";
import TextFormField from "../Form/FormFields/TextFormField";
import Page from "../Common/components/Page";
import { ConfigureHealthFacility } from "../ABDM/ConfigureHealthFacility";
Expand Down Expand Up @@ -155,7 +155,6 @@ export const FacilityConfigure = (props: IProps) => {
</div>
</div>
<div className="flex flex-col gap-3 sm:flex-row sm:justify-end">
<Cancel onClick={() => navigate(`/facility/${facilityId}`)} />
<Submit onClick={handleSubmit} label="Update" />
</div>
</form>
Expand Down
Loading