From 45a210fdb528fd17bc0d757b828c17e7af6fadd0 Mon Sep 17 00:00:00 2001
From: ennmichael <enntheprogrammer@gmail.com>
Date: Wed, 8 Feb 2023 23:04:55 +0100
Subject: [PATCH] rebase 2

---
 src/Element/NoteFooter.tsx     | 2 +-
 src/Element/Reactions.tsx      | 4 ++--
 src/Pages/settings/messages.js | 1 -
 transifex.yml                  | 8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Element/NoteFooter.tsx b/src/Element/NoteFooter.tsx
index 54859a64..519d82f3 100644
--- a/src/Element/NoteFooter.tsx
+++ b/src/Element/NoteFooter.tsx
@@ -31,7 +31,7 @@ import {
 import { NoteCreator } from "Element/NoteCreator";
 import Reactions from "Element/Reactions";
 import SendSats from "Element/SendSats";
-import { parseZap, ParsedZap, ZapsSummary } from "Element/Zap";
+import { parseZap, ZapsSummary } from "Element/Zap";
 import { useUserProfile } from "Feed/ProfileFeed";
 import { default as NEvent } from "Nostr/Event";
 import { RootState } from "State/Store";
diff --git a/src/Element/Reactions.tsx b/src/Element/Reactions.tsx
index 44e87d94..cee3721d 100644
--- a/src/Element/Reactions.tsx
+++ b/src/Element/Reactions.tsx
@@ -126,10 +126,10 @@ const Reactions = ({
                     <span className="zap-amount">{formatShort(z.amount)}</span>
                   </div>
                   <ProfileImage
-                    pubkey={z.zapper!}
+                    pubkey={z.zapper ?? ""}
                     subHeader={<>{z.content}</>}
                   />
-                  <FollowButton pubkey={z.zapper!} />
+                  <FollowButton pubkey={z.zapper ?? ""} />
                 </div>
               );
             })}
diff --git a/src/Pages/settings/messages.js b/src/Pages/settings/messages.js
index 72b3f144..ac2bc762 100644
--- a/src/Pages/settings/messages.js
+++ b/src/Pages/settings/messages.js
@@ -49,7 +49,6 @@ const messages = defineMessages({
   Add: "Add",
   AddRelays: "Add Relays",
   Name: "Name",
-  Profile: "Profile",
   Website: "Website",
   Save: "Save",
   DisplayName: "Display name",
diff --git a/transifex.yml b/transifex.yml
index 38ed5470..40f96479 100644
--- a/transifex.yml
+++ b/transifex.yml
@@ -1,6 +1,6 @@
 git:
   filters:
-  - filter_type: dir
-    file_format: KEYVALUEJSON
-    source_file_dir: 'src/translations'
-    translation_files_expression: 'src/translations/<lang>.json'
+    - filter_type: dir
+      file_format: KEYVALUEJSON
+      source_file_dir: "src/translations"
+      translation_files_expression: "src/translations/<lang>.json"