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

Solved type error using custom function #10628

Closed
wants to merge 23 commits into from
Closed

Solved type error using custom function #10628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ea4a69b
improved tablet view responsiveness
Tanuj1718 Feb 3, 2025
85bfad8
solved i18n issue
Tanuj1718 Feb 4, 2025
09f613a
Merge branch 'develop' into develop
Tanuj1718 Feb 4, 2025
158d709
update mobile view responsiveness
Tanuj1718 Feb 4, 2025
b39654d
Merge branch 'develop' into develop
Tanuj1718 Feb 4, 2025
c4586e6
added responsiveness in organization users page
Tanuj1718 Feb 5, 2025
ea48433
Merge branch 'develop' into develop
Tanuj1718 Feb 5, 2025
73c1773
minor change in button
Tanuj1718 Feb 5, 2025
5283828
Merge branch 'develop' of https://github.com/Tanuj1718/care_fe into d…
Tanuj1718 Feb 5, 2025
ffdb6df
draft pr
Tanuj1718 Feb 5, 2025
f46c2eb
modified date-field handlers
Jacobjeevan Feb 5, 2025
4dfd361
minor cleanup
Jacobjeevan Feb 5, 2025
70eca3e
Merge branch 'develop' into fix-issue
Tanuj1718 Feb 6, 2025
6f00675
Merge branch 'develop' into fix-issue
Tanuj1718 Feb 6, 2025
e1b3c37
revert unwanted changes
Tanuj1718 Feb 6, 2025
a32aeef
fix responsiveness
Tanuj1718 Feb 9, 2025
6d12bf1
Merge branch 'develop' into fix-ui
Tanuj1718 Feb 9, 2025
ebdc962
minor change
Tanuj1718 Feb 10, 2025
ad685aa
Merge remote-tracking branch 'upstream/develop' into fix-ui
Tanuj1718 Feb 10, 2025
fbe0648
Merge branch 'fix-ui' of https://github.com/Tanuj1718/care_fe into fi…
Tanuj1718 Feb 10, 2025
5a4a397
Merge remote-tracking branch 'upstream/develop' into fix-ui
Tanuj1718 Feb 11, 2025
973748d
solved type error
Tanuj1718 Feb 16, 2025
3616b22
solved type error
Tanuj1718 Feb 16, 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
10 changes: 8 additions & 2 deletions src/components/Common/AvatarEditModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,13 @@ const AvatarEditModal = ({
setSelectedFile(myFile);
});
};

const stopCamera = useCallback(() => {
const stream = webRef.current?.video?.srcObject as MediaStream;
if (stream) {
stream.getTracks().forEach((track) => track.stop());
}
setIsCameraOpen(false);
}, []);
const closeModal = () => {
setPreview(undefined);
setIsProcessing(false);
Expand Down Expand Up @@ -407,7 +413,7 @@ const AvatarEditModal = ({
onClick={() => {
setPreviewImage(null);
setIsCameraOpen(false);
webRef.current.stopCamera();
stopCamera();
}}
disabled={isProcessing}
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Medicine/MedicationRequestTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export default function MedicationRequestTable({
<div className="space-y-2">
<div className="rounded-lg">
<Tabs defaultValue="prescriptions">
<TabsList className="bg-gray-200 py-0 w-fit ">
<TabsList className="bg-gray-200 py-0 w-fit">
<TabsTrigger
value="prescriptions"
className="data-[state=active]:bg-white rounded-md px-4 font-semibold"
Expand All @@ -131,7 +131,7 @@ export default function MedicationRequestTable({

<TabsContent value="prescriptions">
<div className="flex flex-col gap-2">
<div className="flex items-center justify-between p-2 gap-2">
<div className="flex items-center justify-between p-2 gap-2 flex-wrap">
<div className="flex items-center gap-2 flex-1">
<CareIcon icon="l-search" className="text-lg text-gray-500" />
<input
Expand Down