Browse Source

fixes from code review

pull/627/head
Dan Ditomaso 1 year ago
parent
commit
023b826f83
  1. 6
      src/components/Dialog/NewDeviceDialog.tsx
  2. 4
      src/components/PageComponents/Messages/MessageItem.tsx

6
src/components/Dialog/NewDeviceDialog.tsx

@ -53,7 +53,7 @@ const links: { [key: string]: string } = {
}; };
const ErrorMessage = ({ missingFeatures }: FeatureErrorProps) => { const ErrorMessage = ({ missingFeatures }: FeatureErrorProps) => {
const { t, i18n } = useTranslation(); const { i18n } = useTranslation();
const listFormatter = useMemo( const listFormatter = useMemo(
() => () =>
@ -158,7 +158,7 @@ export const NewDeviceDialog = ({
<DialogHeader> <DialogHeader>
<DialogTitle>{t("dialog_newDeviceDialog_title")}</DialogTitle> <DialogTitle>{t("dialog_newDeviceDialog_title")}</DialogTitle>
</DialogHeader> </DialogHeader>
<Tabs defaultValue={t("dialog_newDeviceDialog_tabLabelHttp")}> <Tabs defaultValue="HTTP">
<TabsList> <TabsList>
{tabs.map((tab) => ( {tabs.map((tab) => (
<TabsTrigger key={tab.label} value={tab.label}> <TabsTrigger key={tab.label} value={tab.label}>
@ -169,7 +169,7 @@ export const NewDeviceDialog = ({
{tabs.map((tab) => ( {tabs.map((tab) => (
<TabsContent key={tab.label} value={tab.label}> <TabsContent key={tab.label} value={tab.label}>
<fieldset disabled={tab.isDisabled}> <fieldset disabled={tab.isDisabled}>
{(tab.label !== t("dialog_newDeviceDialog_tabLabelHttp") && {(tab.label !== "HTTP" &&
tab.isDisabled) tab.isDisabled)
? <ErrorMessage missingFeatures={unsupported} /> ? <ErrorMessage missingFeatures={unsupported} />
: null} : null}

4
src/components/PageComponents/Messages/MessageItem.tsx

@ -17,6 +17,7 @@ import {
} from "@core/stores/messageStore/index.ts"; } from "@core/stores/messageStore/index.ts";
import { Protobuf, Types } from "@meshtastic/js"; import { Protobuf, Types } from "@meshtastic/js";
import { Message } from "@core/stores/messageStore/types.ts"; import { Message } from "@core/stores/messageStore/types.ts";
import { useTranslation } from "react-i18next";
// import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // Uncomment if needed later // import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // Uncomment if needed later
interface MessageStatusInfo { interface MessageStatusInfo {
@ -81,6 +82,7 @@ interface MessageItemProps {
export const MessageItem = ({ message }: MessageItemProps) => { export const MessageItem = ({ message }: MessageItemProps) => {
const { getNode } = useDevice(); const { getNode } = useDevice();
const { getMyNodeNum } = useMessageStore(); const { getMyNodeNum } = useMessageStore();
const { i18n } = useTranslation();
const messageUser: Protobuf.Mesh.NodeInfo | null | undefined = useMemo(() => { const messageUser: Protobuf.Mesh.NodeInfo | null | undefined = useMemo(() => {
return message.from != null ? getNode(message.from) : null; return message.from != null ? getNode(message.from) : null;
@ -110,7 +112,7 @@ export const MessageItem = ({ message }: MessageItemProps) => {
() => message.date ? new Date(message.date) : null, () => message.date ? new Date(message.date) : null,
[message.date], [message.date],
); );
const locale = "en-US"; // TODO: Make dynamic via props or context const locale = i18n.language;
const formattedTime = useMemo( const formattedTime = useMemo(
() => () =>

Loading…
Cancel
Save