Browse Source

Merge remote-tracking branch 'upstream/main' into fix-tsc-errors

pull/649/head
Dan Ditomaso 1 year ago
parent
commit
bee6742070
  1. 2
      src/components/PageComponents/Messages/MessageItem.tsx
  2. 7
      src/core/dto/PacketToMessageDTO.ts
  3. 2
      src/validation/config/security.test.ts

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

@ -15,7 +15,7 @@ import {
MessageState, MessageState,
useMessageStore, useMessageStore,
} from "@core/stores/messageStore/index.ts"; } from "@core/stores/messageStore/index.ts";
import { Protobuf, Types } from "@meshtastic/js"; import { Protobuf, Types } from "@meshtastic/core";
import { Message } from "@core/stores/messageStore/types.ts"; import { Message } from "@core/stores/messageStore/types.ts";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
// import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // TODO: Uncomment when actions menu is implemented // import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // TODO: Uncomment when actions menu is implemented

7
src/core/dto/PacketToMessageDTO.ts

@ -1,7 +1,6 @@
import type { Types } from "@meshtastic/js"; import type { Types } from "@meshtastic/core";
import { MessageState, MessageType } from "../stores/messageStore/index.ts"; import { MessageState, MessageType } from "@core/stores/messageStore/index.ts";
import type { Message } from "../stores/messageStore/types.ts"; import { Message } from "@core/stores/messageStore/types.ts";
class PacketToMessageDTO { class PacketToMessageDTO {
channel: Types.ChannelNumber; channel: Types.ChannelNumber;
to: number; to: number;

2
src/validation/config/security.test.ts

@ -86,8 +86,6 @@ describe("ParsedSecuritySchema", () => {
publicKey: validKey, publicKey: validKey,
adminKey: [validKey, new Uint8Array(), new Uint8Array()], adminKey: [validKey, new Uint8Array(), new Uint8Array()],
}); });
console.log(result);
expect(result.success).toBe(true); expect(result.success).toBe(true);
}); });

Loading…
Cancel
Save