Merge branch 'master' into production

irislib · Oct 12, 2023 · f9a5013 · f9a5013
2 parents 7a67876 + 55d5cc2
commit f9a5013
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/js/components/PrivateMessage.tsx b/src/js/components/PrivateMessage.tsx
@@ -41,6 +41,7 @@ const PrivateMessage = ({ event, selfAuthored, showName }: Props) => {
       if (validateEvent(e) && verifySignature(e)) {
         console.log(111, e.tags.length === 1, e.tags[0][0] === 'p', e.tags[0][1] === e.pubkey);
         if (e.tags.length === 1 && e.tags[0][0] === 'p' && e.tags[0][1] === event.pubkey) {
+          // @ts-ignore
           e.text = e.content;
           setInnerEvent(e);
           return;

diff --git a/src/js/nostr/Events.ts b/src/js/nostr/Events.ts
@@ -363,6 +363,7 @@ const Events = {
               innerEvent.tags[0][0] === 'p' &&
               innerEvent.tags[0][1] === pubKey
             ) {
+              // @ts-ignore
               innerEvent.text = innerEvent.content;
               this.saveDMToLocalState(innerEvent, localState.get('groups').get(groupId));
             }

diff --git a/src/js/views/chat/NewChat.tsx b/src/js/views/chat/NewChat.tsx
@@ -32,7 +32,7 @@ export const getGroupId = (key) => {
 export const addGroup = (
   key,
   navigate = true,
-  inviter = null,
+  inviter = null as any,
   name = undefined as string | undefined,
 ) => {
   const groupId = getGroupId(key);