Skip to content

Fix/1016 fix notes theme issue #27

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

Closed
AjayGol wants to merge 2 commits into from
Closed

Fix/1016 fix notes theme issue #27

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
dcc6182
Fix Theme issue on add note section
AjayGol Aug 22, 2026
c23781d
FIx UI issue on Note background container
AjayGol Aug 22, 2026
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
12 changes: 6 additions & 6 deletions apphelper/src/components/notes/AddNote.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export function AddNote({ context, onCancel, ...props }: Props) {
<Box sx={{ width: "100%" }}>
<ErrorMessages errors={errors} />

<Paper variant="outlined" sx={{ p: 2, bgcolor: "grey.50", borderColor: "grey.300" }}>
<Paper variant="outlined" sx={(theme) => ({ p: 2, bgcolor: theme.palette.mode === "dark" ? "background.default" : "grey.50", borderColor: theme.palette.mode === "dark" ? "grey.800" : "grey.300" })}>
<Stack direction="row" spacing={2} alignItems="flex-start">
<Avatar
src={image}
Expand All @@ -130,15 +130,15 @@ export function AddNote({ context, onCancel, ...props }: Props) {
"& textarea": { resize: "vertical", minHeight: "40px" }
}
}}
sx={{
bgcolor: "white",
sx={(theme) => ({
bgcolor: theme.palette.mode === "dark" ? "background.paper" : "white",
borderRadius: 1,
p: 1,
border: "1px solid",
borderColor: "grey.300",
"&:hover": { borderColor: "grey.400" },
borderColor: theme.palette.mode === "dark" ? "grey.700" : "grey.300",
"&:hover": { borderColor: theme.palette.mode === "dark" ? "grey.600" : "grey.400" },
"&.Mui-focused": { borderColor: "primary.main" }
}}
})}
/>

<Box sx={{ display: "flex", alignItems: "center", mt: 1 }}>
Expand Down
12 changes: 7 additions & 5 deletions apphelper/src/components/notes/Notes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ConversationStore } from "../../helpers/ConversationStore";
import { SubscriptionManager } from "../../helpers/SubscriptionManager";
import { ConversationInterface, MessageInterface, UserContextInterface } from "@churchapps/helpers";
import { SubscriptionToggle, filterVisibleMessages } from "./SubscriptionToggle";
import { Box } from "@mui/material";

interface Props {
conversationId: string;
Expand Down Expand Up @@ -185,14 +186,15 @@ export function Notes(props: Props) {
{getNotesWrapper()}
</div>
{messages && (
<div style={{
<Box sx={(theme) => ({
flexShrink: 0,
borderTop: "1px solid #e0e0e0",
backgroundColor: "#fafafa",
borderTop: 1,
borderColor: "divider",
backgroundColor: theme.palette.mode === "dark" ? "background.default" : "#fafafa",
padding: "12px",
minHeight: "auto",
maxHeight: "200px"
}}>
})}>
<AddNote
context={props.context}
conversationId={props.conversationId}
Expand All @@ -201,7 +203,7 @@ export function Notes(props: Props) {
messageId={editMessageId ?? undefined}
onCancel={() => setEditMessageId(null)}
/>
</div>
</Box>
)}
</div>
) : (
Expand Down
Loading