Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rebase fixes

Browse Source
This commit is contained in:
Kieran 2023-08-17 20:45:13 +01:00
parent ed109f0d2b
commit 667518a2df
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/app/src/Element/DM.tsx
View File

@ -39,7 +39,8 @@ export default function DM(props: DMProps) {
}
function sender() {
if (props.chat.type !== ChatType.DirectMessage && !isMe) {
const isGroup = props.chat.type === ChatType.PrivateGroupChat || props.chat.type === ChatType.PublicGroupChat;
if (isGroup && !isMe) {
return <ProfileImage pubkey={msg.from} />;
}
}

2
packages/app/src/Element/DmWindow.tsx
View File

@ -6,7 +6,7 @@ import DM from "Element/DM";
import NoteToSelf from "Element/NoteToSelf";
import useLogin from "Hooks/useLogin";
import WriteMessage from "Element/WriteMessage";
import { Chat, ChatParticipant, ChatType, useChatSystem } from "chat";
import { Chat, ChatParticipant, useChatSystem } from "chat";
import { Nip4ChatSystem } from "chat/nip4";
import { FormattedMessage } from "react-intl";

4
packages/app/src/Pages/MessagesPage.tsx
View File

@ -1,12 +1,12 @@
import React, { useEffect, useMemo, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useNavigate, useParams } from "react-router-dom";
import { NostrPrefix, TLVEntryType, decodeTLV } from "@snort/system";
import { TLVEntryType, decodeTLV } from "@snort/system";
import { useUserProfile } from "@snort/system-react";
import UnreadCount from "Element/UnreadCount";
import ProfileImage, { getDisplayName } from "Element/ProfileImage";
import { hexToBech32, parseId } from "SnortUtils";
import { parseId } from "SnortUtils";
import NoteToSelf from "Element/NoteToSelf";
import useModeration from "Hooks/useModeration";
import useLogin from "Hooks/useLogin";

2
packages/app/src/Wallet/NostrWalletConnect.ts
View File

@ -1,4 +1,4 @@
import { Connection, EventKind, NostrEvent, EventBuilder, EventExt, PrivateKeySigner } from "@snort/system";
import { Connection, EventKind, NostrEvent, EventBuilder, PrivateKeySigner } from "@snort/system";
import { LNWallet, WalletError, WalletErrorCode, WalletInfo, WalletInvoice, WalletInvoiceState } from "Wallet";
import debug from "debug";

2
packages/system/src/request-builder.ts
View File

@ -2,7 +2,7 @@ import debug from "debug";
import { v4 as uuid } from "uuid";
import { appendDedupe, sanitizeRelayUrl, unixNowMs } from "@snort/shared";
import { ReqFilter, u256, HexKey, EventKind, TaggedRawEvent, OnEventCallback, OnEventCallbackRelease } from ".";
import { ReqFilter, u256, HexKey, EventKind } from ".";
import { diffFilters } from "./request-splitter";
import { RelayCache, splitByWriteRelays, splitFlatByWriteRelays } from "./gossip-model";
import { flatMerge, mergeSimilar } from "./request-merger";