Fix spacing on transifex.yml

.github/workflows/pr-to-nostr.yaml

@@ -0,0 +1,33 @@
+name: Nostr PR Notifier
+on: 
+  pull_request:
+    types: [opened, reopened]
+jobs:
+  Notify:
+    runs-on: ubuntu-latest
+    env:
+      # Set in Github repo > Settings > Secrets and Variables
+      NOSTR_KEY: ${{ secrets.NOSTR_KEY }}
+      # Event vars
+      PR_URL: ${{ github.event.pull_request.html_url }}
+      PR_TITLE: ${{ github.event.pull_request.title }}
+      PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+      PR_BODY: ${{ github.event.pull_request.body }}
+    steps:
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.19.0'
+      - run: go install github.com/fiatjaf/noscl@latest
+      - run: which noscl
+      - run: noscl setprivate $NOSTR_KEY
+      - run: noscl relay add wss://relay.damus.io
+      - run: noscl relay add wss://brb.io
+      - run: noscl relay add wss://relay.nostr.info
+      - run: noscl relay add wss://nostr.zebedee.cloud
+      - run: noscl relay add wss://nostr.orangepill.dev
+      - run: noscl relay add wss://nostr.v0l.io
+      - run: noscl relay add wss://nostr.fmt.wiz.biz
+      - run: |
+         msg=$(printf "Pull request opened by $PR_AUTHOR\n$PR_TITLE\n$PR_URL") \
+         && noscl publish "$msg"

.github/workflows/run-tests.yaml

@@ -1,17 +0,0 @@
-name: Test
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
-    branches:
-      - "*"
-jobs:
-  test:
-    name: Run Tests
-    runs-on: macos-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v1
-    - name: Running Tests
-      run: xcodebuild test -scheme damus -project damus.xcodeproj -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.0' | xcpretty && exit ${PIPESTATUS[0]}

CHANGELOG.md

@@ -1,35 +1,3 @@
-## [1.0.0-6] - 2023-01-13
-
-### Added
-
-- Profile banner images (Jason Jōb)
-- Added Reactions View (William Casarin)
-- Left hand option for post button (Jonathan Milligan)
-- Damus icon at the top (Ben Weeks)
-- Make purple badges on profile page tappable (Joel Klabo)
-
-
-### Changed
-
-- Make Shaka button purple when liked (Joel Klabo)
-- Move counts to right side like Birdsite (Joel Klabo)
-- Use custom icon for shaka button (Joel Klabo)
-- Renamed boost to repost (William Casarin)
-- Removed nip05 domain from boosts/reposts (William Casarin)
-- Make DMs only take up 80% of screen width (Jonathan Milligan)
-- Hide Recommended Relays Section if Empty (Joel Klabo)
-
-
-### Fixed
-
-- Fixed shaka moving when you press it (Joel Klabo)
-- Fixed issue with relays not keeping in sync when adding (Fredrik Olofsson)
-
-
-
-[1.0.0-6]: https://github.com/damus-io/damus/releases/tag/v1.0.0-6
-
-
 ## [1.0.0-5] - 2023-01-06
 
 ### Added

README.md

@@ -25,7 +25,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 ## Getting Started on Damus 
 
 ### Damus iOS
-1) Get the Damus app on TestFlight: https://testflight.apple.com/join/CLwjLxWl
+1) Get the Damus app on Testflight: https://testflight.apple.com/join/CLwjLxWl
 
 #### ⚙️ Settings (gear icon, top right)
 - Relays: You can add more relays to send your notes to by tapping the "+". 

damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff

@@ -35,14 +35,12 @@
       <trans-unit id="%@" xml:space="preserve">
         <source>%@</source>
         <target>%@</target>
-        <note>Amount of time that has passed since reply quote event occurred.
-Abbreviated version of a nostr public key.</note>
+        <note>Number of people following a user.</note>
       </trans-unit>
       <trans-unit id="%@ %@" xml:space="preserve">
         <source>%@ %@</source>
         <target>%@ %@</target>
-        <note>Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'.</note>
+        <note>Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'.</note>
       </trans-unit>
       <trans-unit id="%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." xml:space="preserve">
         <source>%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.</source>
@@ -62,14 +60,18 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
       <trans-unit id="%lld" xml:space="preserve">
         <source>%lld</source>
         <target>%lld</target>
-        <note>Number of reposts.
-Number of profiles a user is following.</note>
+        <note>Number of profiles a user is following.</note>
       </trans-unit>
       <trans-unit id="%lld/%lld" xml:space="preserve">
         <source>%lld/%lld</source>
         <target>%lld/%lld</target>
         <note>Fraction of how many of the user's relay servers that are operational.</note>
       </trans-unit>
+      <trans-unit id="&amp;nbsp;" xml:space="preserve">
+        <source>&amp;nbsp;</source>
+        <target>&amp;nbsp;</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="'%@' at '%@' will be used for verification" xml:space="preserve">
         <source>'%@' at '%@' will be used for verification</source>
         <target>'%@' at '%@' will be used for verification</target>
@@ -146,15 +148,10 @@ Number of profiles a user is following.</note>
         <target>Any</target>
         <note>Any amount of sats</note>
       </trans-unit>
-      <trans-unit id="Are you sure you want to repost this?" xml:space="preserve">
-        <source>Are you sure you want to repost this?</source>
-        <target>Are you sure you want to repost this?</target>
-        <note>Alert message to ask if user wants to repost a post.</note>
-      </trans-unit>
-      <trans-unit id="Banner Image" xml:space="preserve">
-        <source>Banner Image</source>
-        <target>Banner Image</target>
-        <note>Label for Banner Image section of user profile form.</note>
+      <trans-unit id="Are you sure you want to boost this post?" xml:space="preserve">
+        <source>Are you sure you want to boost this post?</source>
+        <target>Are you sure you want to boost this post?</target>
+        <note>Alert message to ask if user wants to boost a post.</note>
       </trans-unit>
       <trans-unit id="Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." xml:space="preserve">
         <source>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</source>
@@ -181,6 +178,17 @@ Number of profiles a user is following.</note>
         <target>Blue Wallet</target>
         <note>Dropdown option label for Lightning wallet, Blue Wallet.</note>
       </trans-unit>
+      <trans-unit id="Boost" xml:space="preserve">
+        <source>Boost</source>
+        <target>Boost</target>
+        <note>Button to confirm boosting a post.
+   Title of alert for confirming to boost a post.</note>
+      </trans-unit>
+      <trans-unit id="Boosted" xml:space="preserve">
+        <source>Boosted</source>
+        <target>Boosted</target>
+        <note>Text indicating that the post was boosted (i.e. re-shared).</note>
+      </trans-unit>
       <trans-unit id="Breez" xml:space="preserve">
         <source>Breez</source>
         <target>Breez</target>
@@ -195,7 +203,6 @@ Number of profiles a user is following.</note>
         <source>Cancel</source>
         <target>Cancel</target>
         <note>Button to cancel out of posting a note.
-   Button to cancel out of reposting a post.
    Button to cancel out of view adding user inputted relay.
    Cancel out of logging out the user.</note>
       </trans-unit>
@@ -335,6 +342,11 @@ Number of profiles a user is following.</note>
         <target>Edit</target>
         <note>Button to edit user's profile.</note>
       </trans-unit>
+      <trans-unit id="Edit Profile" xml:space="preserve">
+        <source>Edit Profile</source>
+        <target>Edit Profile</target>
+        <note>Title of navigation view for Edit Profile.</note>
+      </trans-unit>
       <trans-unit id="Encrypted" xml:space="preserve">
         <source>Encrypted</source>
         <target>Encrypted</target>
@@ -416,11 +428,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>LNLink</target>
         <note>Dropdown option label for Lightning wallet, LNLink.</note>
       </trans-unit>
-      <trans-unit id="Left Handed" xml:space="preserve">
-        <source>Left Handed</source>
-        <target>Left Handed</target>
-        <note>Moves the post button to the left side of the screen</note>
-      </trans-unit>
       <trans-unit id="Let's go!" xml:space="preserve">
         <source>Let's go!</source>
         <target>Let's go!</target>
@@ -444,8 +451,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
       <trans-unit id="Login" xml:space="preserve">
         <source>Login</source>
         <target>Login</target>
-        <note>Button to log into account.
-   Button to log into an account.</note>
+        <note>Button to log into account.</note>
       </trans-unit>
       <trans-unit id="Logout" xml:space="preserve">
         <source>Logout</source>
@@ -524,11 +530,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>PrivateKey</target>
         <note>Title of the secure field that holds the user's private key.</note>
       </trans-unit>
-      <trans-unit id="Profile" xml:space="preserve">
-        <source>Profile</source>
-        <target>Profile</target>
-        <note>Sidebar menu label for Profile view.</note>
-      </trans-unit>
       <trans-unit id="Profile Picture" xml:space="preserve">
         <source>Profile Picture</source>
         <target>Profile Picture</target>
@@ -554,11 +555,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>Public key</target>
         <note>Label indicating that the text is a user's public account key.</note>
       </trans-unit>
-      <trans-unit id="Reactions" xml:space="preserve">
-        <source>Reactions</source>
-        <target>Reactions</target>
-        <note>Navigation bar title for Reactions view.</note>
-      </trans-unit>
       <trans-unit id="Recommended Relays" xml:space="preserve">
         <source>Recommended Relays</source>
         <target>Recommended Relays</target>
@@ -572,7 +568,8 @@ Part of a larger sentence to describe how many profiles a user is following.</no
       <trans-unit id="Relays" xml:space="preserve">
         <source>Relays</source>
         <target>Relays</target>
-        <note>Sidebar menu label for Relay servers view</note>
+        <note>Header text for relay server list for configuration.
+Part of a larger sentence to describe how many relay servers a user is connected.</note>
       </trans-unit>
       <trans-unit id="Reply to self" xml:space="preserve">
         <source>Reply to self</source>
@@ -589,27 +586,11 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>Replying to:</target>
         <note>Indicating that the user is replying to the following listed people.</note>
       </trans-unit>
-      <trans-unit id="Repost" xml:space="preserve">
-        <source>Repost</source>
-        <target>Repost</target>
-        <note>Button to confirm reposting a post.
-   Title of alert for confirming to repost a post.</note>
-      </trans-unit>
-      <trans-unit id="Reposted" xml:space="preserve">
-        <source>Reposted</source>
-        <target>Reposted</target>
-        <note>Text indicating that the post was reposted (i.e. re-shared).</note>
-      </trans-unit>
       <trans-unit id="Reset" xml:space="preserve">
         <source>Reset</source>
         <target>Reset</target>
         <note>Section title for resetting the user</note>
       </trans-unit>
-      <trans-unit id="Retry" xml:space="preserve">
-        <source>Retry</source>
-        <target>Retry</target>
-        <note>Button to retry completing account creation after an error occurred.</note>
-      </trans-unit>
       <trans-unit id="River" xml:space="preserve">
         <source>River</source>
         <target>River</target>
@@ -663,8 +644,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
       <trans-unit id="Settings" xml:space="preserve">
         <source>Settings</source>
         <target>Settings</target>
-        <note>Navigation title for Settings view.
-   Sidebar menu label for accessing the app settings</note>
+        <note>Navigation title for Settings view.</note>
       </trans-unit>
       <trans-unit id="Share" xml:space="preserve">
         <source>Share</source>
@@ -681,11 +661,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>Show wallet selector</target>
         <note>Toggle to show or hide selection of wallet.</note>
       </trans-unit>
-      <trans-unit id="Sign out" xml:space="preserve">
-        <source>Sign out</source>
-        <target>Sign out</target>
-        <note>Sidebar menu label to sign out of the account.</note>
-      </trans-unit>
       <trans-unit id="Strike" xml:space="preserve">
         <source>Strike</source>
         <target>Strike</target>
@@ -748,11 +723,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <note>Label for Username section of user profile form.
    Label to prompt username entry.</note>
       </trans-unit>
-      <trans-unit id="Wallet" xml:space="preserve">
-        <source>Wallet</source>
-        <target>Wallet</target>
-        <note>Sidebar menu label for Wallet view.</note>
-      </trans-unit>
       <trans-unit id="Wallet Of Satoshi" xml:space="preserve">
         <source>Wallet Of Satoshi</source>
         <target>Wallet Of Satoshi</target>
@@ -798,11 +768,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>collapsed_event_view_other_notes</target>
         <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped. (Key in .stringsdict)</note>
       </trans-unit>
-      <trans-unit id="followers_count" translate="no" xml:space="preserve">
-        <source>followers_count</source>
-        <target>followers_count</target>
-        <note>Part of a larger sentence to describe how many people are following a user. (Key in .stringsdict)</note>
-      </trans-unit>
       <trans-unit id="https://example.com/pic.jpg" xml:space="preserve">
         <source>https://example.com/pic.jpg</source>
         <target>https://example.com/pic.jpg</target>
@@ -838,16 +803,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>optional</target>
         <note>Label indicating that a form input is optional.</note>
       </trans-unit>
-      <trans-unit id="reactions_count" translate="no" xml:space="preserve">
-        <source>reactions_count</source>
-        <target>reactions_count</target>
-        <note>Part of a larger sentence to describe how many reactions there are on a post. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="relays_count" translate="no" xml:space="preserve">
-        <source>relays_count</source>
-        <target>relays_count</target>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected. (Key in .stringsdict)</note>
-      </trans-unit>
       <trans-unit id="replying_to_one_and_others" translate="no" xml:space="preserve">
         <source>replying_to_one_and_others</source>
         <target>replying_to_one_and_others</target>
@@ -858,26 +813,11 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>replying_to_two_and_others</target>
         <note>Label to indicate that the user is replying to 2 users and others. (Key in .stringsdict)</note>
       </trans-unit>
-      <trans-unit id="reposts_count" translate="no" xml:space="preserve">
-        <source>reposts_count</source>
-        <target>reposts_count</target>
-        <note>Part of a larger sentence to describe how many reposts there are. (Key in .stringsdict)</note>
-      </trans-unit>
       <trans-unit id="satoshi" xml:space="preserve">
         <source>satoshi</source>
         <target>satoshi</target>
         <note>Example username of Bitcoin creator(s), Satoshi Nakamoto.</note>
       </trans-unit>
-      <trans-unit id="tips_count" translate="no" xml:space="preserve">
-        <source>tips_count</source>
-        <target>tips_count</target>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="u{00A0}" xml:space="preserve">
-        <source>u{00A0}</source>
-        <target>u{00A0}</target>
-        <note>Non-breaking space character to fill in blank space next to event action button icons.</note>
-      </trans-unit>
       <trans-unit id="wss://some.relay.com" xml:space="preserve">
         <source>wss://some.relay.com</source>
         <target>wss://some.relay.com</target>
@@ -888,6 +828,11 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>you</target>
         <note>You, in this context, is the person who controls their own social network. You is used in the context of a larger sentence that welcomes the reader to the social network that they control themself.</note>
       </trans-unit>
+      <trans-unit id="🤙" xml:space="preserve">
+        <source>🤙</source>
+        <target>🤙</target>
+        <note>Button with emoji to like an event.</note>
+      </trans-unit>
     </body>
   </file>
   <file original="damus/en-US.lproj/Localizable.stringsdict" source-language="en-US" target-language="en-US" datatype="plaintext">
@@ -915,66 +860,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>··· %#@NOTES@ ···</target>
         <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note>
       </trans-unit>
-      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/one:dict/:string" xml:space="preserve">
-        <source>Follower</source>
-        <target>Follower</target>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/other:dict/:string" xml:space="preserve">
-        <source>Followers</source>
-        <target>Followers</target>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Followers</source>
-        <target>Followers</target>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/followers_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@FOLLOWERS@</source>
-        <target>%#@FOLLOWERS@</target>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@REACTIONS@</source>
-        <target>%#@REACTIONS@</target>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/REACTIONS:dict/one:dict/:string" xml:space="preserve">
-        <source>Reaction</source>
-        <target>Reaction</target>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/REACTIONS:dict/other:dict/:string" xml:space="preserve">
-        <source>Reactions</source>
-        <target>Reactions</target>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/REACTIONS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Reactions</source>
-        <target>Reactions</target>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@RELAYS@</source>
-        <target>%#@RELAYS@</target>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/RELAYS:dict/one:dict/:string" xml:space="preserve">
-        <source>Relay</source>
-        <target>Relay</target>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/RELAYS:dict/other:dict/:string" xml:space="preserve">
-        <source>Relays</source>
-        <target>Relays</target>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/RELAYS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Relays</source>
-        <target>Relays</target>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
       <trans-unit id="/replying_to_one_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
         <source>Replying to %@%#@OTHERS@</source>
         <target>Replying to %@%#@OTHERS@</target>
@@ -1015,46 +900,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target/>
         <note>Label to indicate that the user is replying to 2 users and others.</note>
       </trans-unit>
-      <trans-unit id="/reposts_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@REPOSTS@</source>
-        <target>%#@REPOSTS@</target>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/reposts_count:dict/REPOSTS:dict/one:dict/:string" xml:space="preserve">
-        <source>Repost</source>
-        <target>Repost</target>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/reposts_count:dict/REPOSTS:dict/other:dict/:string" xml:space="preserve">
-        <source>Reposts</source>
-        <target>Reposts</target>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/reposts_count:dict/REPOSTS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Reposts</source>
-        <target>Reposts</target>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@TIPS@</source>
-        <target>%#@TIPS@</target>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/TIPS:dict/one:dict/:string" xml:space="preserve">
-        <source>Tip</source>
-        <target>Tip</target>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/TIPS:dict/other:dict/:string" xml:space="preserve">
-        <source>Tips</source>
-        <target>Tips</target>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/TIPS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Tips</source>
-        <target>Tips</target>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
     </body>
   </file>
 </xliff>

damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict

@@ -2,78 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>collapsed_event_view_other_notes</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>··· %#@NOTES@ ···</string>
-		<key>NOTES</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>0 other notes</string>
-			<key>one</key>
-			<string>1 other note</string>
-			<key>other</key>
-			<string>%d other notes</string>
-		</dict>
-	</dict>
-	<key>followers_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@FOLLOWERS@</string>
-		<key>FOLLOWERS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Followers</string>
-			<key>one</key>
-			<string>Follower</string>
-			<key>other</key>
-			<string>Followers</string>
-		</dict>
-	</dict>
-	<key>reactions_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@REACTIONS@</string>
-		<key>REACTIONS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Reactions</string>
-			<key>one</key>
-			<string>Reaction</string>
-			<key>other</key>
-			<string>Reactions</string>
-		</dict>
-	</dict>
-	<key>relays_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@RELAYS@</string>
-		<key>RELAYS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Relays</string>
-			<key>one</key>
-			<string>Relay</string>
-			<key>other</key>
-			<string>Relays</string>
-		</dict>
-	</dict>
 	<key>replying_to_one_and_others</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -110,40 +38,22 @@
 			<string> &amp; %d others</string>
 		</dict>
 	</dict>
-	<key>reposts_count</key>
+	<key>collapsed_event_view_other_notes</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@REPOSTS@</string>
-		<key>REPOSTS</key>
+		<string>··· %#@NOTES@ ···</string>
+		<key>NOTES</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>Reposts</string>
+			<string>0 other notes</string>
 			<key>one</key>
-			<string>Repost</string>
+			<string>1 other note</string>
 			<key>other</key>
-			<string>Reposts</string>
-		</dict>
-	</dict>
-	<key>tips_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@TIPS@</string>
-		<key>TIPS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Tips</string>
-			<key>one</key>
-			<string>Tip</string>
-			<key>other</key>
-			<string>Tips</string>
+			<string>%d other notes</string>
 		</dict>
 	</dict>
 </dict>

damus Localizations/es-419.xcloc/Localized Contents/es-419.xliff

@@ -30,13 +30,11 @@
       </trans-unit>
       <trans-unit id="%@" xml:space="preserve">
         <source>%@</source>
-        <note>Amount of time that has passed since reply quote event occurred.
-Abbreviated version of a nostr public key.</note>
+        <note>Number of people following a user.</note>
       </trans-unit>
       <trans-unit id="%@ %@" xml:space="preserve">
         <source>%@ %@</source>
-        <note>Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'.</note>
+        <note>Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'.</note>
       </trans-unit>
       <trans-unit id="%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." xml:space="preserve">
         <source>%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.</source>
@@ -52,13 +50,16 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
       </trans-unit>
       <trans-unit id="%lld" xml:space="preserve">
         <source>%lld</source>
-        <note>Number of reposts.
-Number of profiles a user is following.</note>
+        <note>Number of profiles a user is following.</note>
       </trans-unit>
       <trans-unit id="%lld/%lld" xml:space="preserve">
         <source>%lld/%lld</source>
         <note>Fraction of how many of the user's relay servers that are operational.</note>
       </trans-unit>
+      <trans-unit id="&amp;nbsp;" xml:space="preserve">
+        <source>&amp;nbsp;</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="'%@' at '%@' will be used for verification" xml:space="preserve">
         <source>'%@' at '%@' will be used for verification</source>
         <note>Description of how the nip05 identifier would be used for verification.</note>
@@ -120,13 +121,9 @@ Number of profiles a user is following.</note>
         <source>Any</source>
         <note>Any amount of sats</note>
       </trans-unit>
-      <trans-unit id="Are you sure you want to repost this?" xml:space="preserve">
-        <source>Are you sure you want to repost this?</source>
-        <note>Alert message to ask if user wants to repost a post.</note>
-      </trans-unit>
-      <trans-unit id="Banner Image" xml:space="preserve">
-        <source>Banner Image</source>
-        <note>Label for Banner Image section of user profile form.</note>
+      <trans-unit id="Are you sure you want to boost this post?" xml:space="preserve">
+        <source>Are you sure you want to boost this post?</source>
+        <note>Alert message to ask if user wants to boost a post.</note>
       </trans-unit>
       <trans-unit id="Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." xml:space="preserve">
         <source>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</source>
@@ -148,6 +145,15 @@ Number of profiles a user is following.</note>
         <source>Blue Wallet</source>
         <note>Dropdown option label for Lightning wallet, Blue Wallet.</note>
       </trans-unit>
+      <trans-unit id="Boost" xml:space="preserve">
+        <source>Boost</source>
+        <note>Button to confirm boosting a post.
+   Title of alert for confirming to boost a post.</note>
+      </trans-unit>
+      <trans-unit id="Boosted" xml:space="preserve">
+        <source>Boosted</source>
+        <note>Text indicating that the post was boosted (i.e. re-shared).</note>
+      </trans-unit>
       <trans-unit id="Breez" xml:space="preserve">
         <source>Breez</source>
         <note>Dropdown option label for Lightning wallet, Breez.</note>
@@ -159,7 +165,6 @@ Number of profiles a user is following.</note>
       <trans-unit id="Cancel" xml:space="preserve">
         <source>Cancel</source>
         <note>Button to cancel out of posting a note.
-   Button to cancel out of reposting a post.
    Button to cancel out of view adding user inputted relay.
    Cancel out of logging out the user.</note>
       </trans-unit>
@@ -272,6 +277,10 @@ Number of profiles a user is following.</note>
         <source>Edit</source>
         <note>Button to edit user's profile.</note>
       </trans-unit>
+      <trans-unit id="Edit Profile" xml:space="preserve">
+        <source>Edit Profile</source>
+        <note>Title of navigation view for Edit Profile.</note>
+      </trans-unit>
       <trans-unit id="Encrypted" xml:space="preserve">
         <source>Encrypted</source>
         <note>Heading indicating that this application keeps private messaging end-to-end encrypted.</note>
@@ -337,10 +346,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>LNLink</source>
         <note>Dropdown option label for Lightning wallet, LNLink.</note>
       </trans-unit>
-      <trans-unit id="Left Handed" xml:space="preserve">
-        <source>Left Handed</source>
-        <note>Moves the post button to the left side of the screen</note>
-      </trans-unit>
       <trans-unit id="Let's go!" xml:space="preserve">
         <source>Let's go!</source>
         <note>Button to complete account creation and start using the app.</note>
@@ -359,8 +364,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
       </trans-unit>
       <trans-unit id="Login" xml:space="preserve">
         <source>Login</source>
-        <note>Button to log into account.
-   Button to log into an account.</note>
+        <note>Button to log into account.</note>
       </trans-unit>
       <trans-unit id="Logout" xml:space="preserve">
         <source>Logout</source>
@@ -424,10 +428,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>PrivateKey</source>
         <note>Title of the secure field that holds the user's private key.</note>
       </trans-unit>
-      <trans-unit id="Profile" xml:space="preserve">
-        <source>Profile</source>
-        <note>Sidebar menu label for Profile view.</note>
-      </trans-unit>
       <trans-unit id="Profile Picture" xml:space="preserve">
         <source>Profile Picture</source>
         <note>Label for Profile Picture section of user profile form.</note>
@@ -448,10 +448,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>Public key</source>
         <note>Label indicating that the text is a user's public account key.</note>
       </trans-unit>
-      <trans-unit id="Reactions" xml:space="preserve">
-        <source>Reactions</source>
-        <note>Navigation bar title for Reactions view.</note>
-      </trans-unit>
       <trans-unit id="Recommended Relays" xml:space="preserve">
         <source>Recommended Relays</source>
         <note>Section title for recommend relay servers that could be added as part of configuration</note>
@@ -462,7 +458,8 @@ Part of a larger sentence to describe how many profiles a user is following.</no
       </trans-unit>
       <trans-unit id="Relays" xml:space="preserve">
         <source>Relays</source>
-        <note>Sidebar menu label for Relay servers view</note>
+        <note>Header text for relay server list for configuration.
+Part of a larger sentence to describe how many relay servers a user is connected.</note>
       </trans-unit>
       <trans-unit id="Reply to self" xml:space="preserve">
         <source>Reply to self</source>
@@ -476,23 +473,10 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>Replying to:</source>
         <note>Indicating that the user is replying to the following listed people.</note>
       </trans-unit>
-      <trans-unit id="Repost" xml:space="preserve">
-        <source>Repost</source>
-        <note>Button to confirm reposting a post.
-   Title of alert for confirming to repost a post.</note>
-      </trans-unit>
-      <trans-unit id="Reposted" xml:space="preserve">
-        <source>Reposted</source>
-        <note>Text indicating that the post was reposted (i.e. re-shared).</note>
-      </trans-unit>
       <trans-unit id="Reset" xml:space="preserve">
         <source>Reset</source>
         <note>Section title for resetting the user</note>
       </trans-unit>
-      <trans-unit id="Retry" xml:space="preserve">
-        <source>Retry</source>
-        <note>Button to retry completing account creation after an error occurred.</note>
-      </trans-unit>
       <trans-unit id="River" xml:space="preserve">
         <source>River</source>
         <note>Dropdown option label for Lightning wallet, River</note>
@@ -535,8 +519,7 @@ Part of a larger sentence to describe how many profiles a user is following.</no
       </trans-unit>
       <trans-unit id="Settings" xml:space="preserve">
         <source>Settings</source>
-        <note>Navigation title for Settings view.
-   Sidebar menu label for accessing the app settings</note>
+        <note>Navigation title for Settings view.</note>
       </trans-unit>
       <trans-unit id="Share" xml:space="preserve">
         <source>Share</source>
@@ -550,10 +533,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>Show wallet selector</source>
         <note>Toggle to show or hide selection of wallet.</note>
       </trans-unit>
-      <trans-unit id="Sign out" xml:space="preserve">
-        <source>Sign out</source>
-        <note>Sidebar menu label to sign out of the account.</note>
-      </trans-unit>
       <trans-unit id="Strike" xml:space="preserve">
         <source>Strike</source>
         <note>Dropdown option label for Lightning wallet, Strike.</note>
@@ -604,10 +583,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <note>Label for Username section of user profile form.
    Label to prompt username entry.</note>
       </trans-unit>
-      <trans-unit id="Wallet" xml:space="preserve">
-        <source>Wallet</source>
-        <note>Sidebar menu label for Wallet view.</note>
-      </trans-unit>
       <trans-unit id="Wallet Of Satoshi" xml:space="preserve">
         <source>Wallet Of Satoshi</source>
         <note>Dropdown option label for Lightning wallet, Wallet Of Satoshi.</note>
@@ -644,10 +619,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>collapsed_event_view_other_notes</source>
         <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped. (Key in .stringsdict)</note>
       </trans-unit>
-      <trans-unit id="followers_count" translate="no" xml:space="preserve">
-        <source>followers_count</source>
-        <note>Part of a larger sentence to describe how many people are following a user. (Key in .stringsdict)</note>
-      </trans-unit>
       <trans-unit id="https://example.com/pic.jpg" xml:space="preserve">
         <source>https://example.com/pic.jpg</source>
         <note>Placeholder example text for profile picture URL.</note>
@@ -676,14 +647,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>optional</source>
         <note>Label indicating that a form input is optional.</note>
       </trans-unit>
-      <trans-unit id="reactions_count" translate="no" xml:space="preserve">
-        <source>reactions_count</source>
-        <note>Part of a larger sentence to describe how many reactions there are on a post. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="relays_count" translate="no" xml:space="preserve">
-        <source>relays_count</source>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected. (Key in .stringsdict)</note>
-      </trans-unit>
       <trans-unit id="replying_to_one_and_others" translate="no" xml:space="preserve">
         <source>replying_to_one_and_others</source>
         <note>Label to indicate that the user is replying to 1 user and others. (Key in .stringsdict)</note>
@@ -692,22 +655,10 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>replying_to_two_and_others</source>
         <note>Label to indicate that the user is replying to 2 users and others. (Key in .stringsdict)</note>
       </trans-unit>
-      <trans-unit id="reposts_count" translate="no" xml:space="preserve">
-        <source>reposts_count</source>
-        <note>Part of a larger sentence to describe how many reposts there are. (Key in .stringsdict)</note>
-      </trans-unit>
       <trans-unit id="satoshi" xml:space="preserve">
         <source>satoshi</source>
         <note>Example username of Bitcoin creator(s), Satoshi Nakamoto.</note>
       </trans-unit>
-      <trans-unit id="tips_count" translate="no" xml:space="preserve">
-        <source>tips_count</source>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="u{00A0}" xml:space="preserve">
-        <source>u{00A0}</source>
-        <note>Non-breaking space character to fill in blank space next to event action button icons.</note>
-      </trans-unit>
       <trans-unit id="wss://some.relay.com" xml:space="preserve">
         <source>wss://some.relay.com</source>
         <note>Placeholder example for relay server address.</note>
@@ -716,6 +667,10 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <source>you</source>
         <note>You, in this context, is the person who controls their own social network. You is used in the context of a larger sentence that welcomes the reader to the social network that they control themself.</note>
       </trans-unit>
+      <trans-unit id="🤙" xml:space="preserve">
+        <source>🤙</source>
+        <note>Button with emoji to like an event.</note>
+      </trans-unit>
     </body>
   </file>
   <file original="damus/en-US.lproj/Localizable.stringsdict" source-language="en-US" target-language="es-419" datatype="plaintext">
@@ -743,54 +698,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target>··· %#@NOTES@ ···</target>
         <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note>
       </trans-unit>
-      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/one:dict/:string" xml:space="preserve">
-        <source>Follower</source>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/other:dict/:string" xml:space="preserve">
-        <source>Followers</source>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/followers_count:dict/FOLLOWERS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Followers</source>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/followers_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@FOLLOWERS@</source>
-        <note>Part of a larger sentence to describe how many people are following a user.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@REACTIONS@</source>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/REACTIONS:dict/one:dict/:string" xml:space="preserve">
-        <source>Reaction</source>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/REACTIONS:dict/other:dict/:string" xml:space="preserve">
-        <source>Reactions</source>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/reactions_count:dict/REACTIONS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Reactions</source>
-        <note>Part of a larger sentence to describe how many reactions there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@RELAYS@</source>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/RELAYS:dict/one:dict/:string" xml:space="preserve">
-        <source>Relay</source>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/RELAYS:dict/other:dict/:string" xml:space="preserve">
-        <source>Relays</source>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
-      <trans-unit id="/relays_count:dict/RELAYS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Relays</source>
-        <note>Part of a larger sentence to describe how many relay servers a user is connected.</note>
-      </trans-unit>
       <trans-unit id="/replying_to_one_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
         <source>Replying to %@%#@OTHERS@</source>
         <target>Replying to %@%#@OTHERS@</target>
@@ -831,38 +738,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no
         <target/>
         <note>Label to indicate that the user is replying to 2 users and others.</note>
       </trans-unit>
-      <trans-unit id="/reposts_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@REPOSTS@</source>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/reposts_count:dict/REPOSTS:dict/one:dict/:string" xml:space="preserve">
-        <source>Repost</source>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/reposts_count:dict/REPOSTS:dict/other:dict/:string" xml:space="preserve">
-        <source>Reposts</source>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/reposts_count:dict/REPOSTS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Reposts</source>
-        <note>Part of a larger sentence to describe how many reposts there are.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>%#@TIPS@</source>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/TIPS:dict/one:dict/:string" xml:space="preserve">
-        <source>Tip</source>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/TIPS:dict/other:dict/:string" xml:space="preserve">
-        <source>Tips</source>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
-      <trans-unit id="/tips_count:dict/TIPS:dict/zero:dict/:string" xml:space="preserve">
-        <source>Tips</source>
-        <note>Part of a larger sentence to describe how many tip payments there are on a post.</note>
-      </trans-unit>
     </body>
   </file>
 </xliff>

damus Localizations/es-419.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict

@@ -2,78 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>collapsed_event_view_other_notes</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>··· %#@NOTES@ ···</string>
-		<key>NOTES</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>0 other notes</string>
-			<key>one</key>
-			<string>1 other note</string>
-			<key>other</key>
-			<string>%d other notes</string>
-		</dict>
-	</dict>
-	<key>followers_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@FOLLOWERS@</string>
-		<key>FOLLOWERS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Followers</string>
-			<key>one</key>
-			<string>Follower</string>
-			<key>other</key>
-			<string>Followers</string>
-		</dict>
-	</dict>
-	<key>reactions_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@REACTIONS@</string>
-		<key>REACTIONS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Reactions</string>
-			<key>one</key>
-			<string>Reaction</string>
-			<key>other</key>
-			<string>Reactions</string>
-		</dict>
-	</dict>
-	<key>relays_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@RELAYS@</string>
-		<key>RELAYS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Relays</string>
-			<key>one</key>
-			<string>Relay</string>
-			<key>other</key>
-			<string>Relays</string>
-		</dict>
-	</dict>
 	<key>replying_to_one_and_others</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -110,40 +38,22 @@
 			<string> &amp; %d others</string>
 		</dict>
 	</dict>
-	<key>reposts_count</key>
+	<key>collapsed_event_view_other_notes</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@REPOSTS@</string>
-		<key>REPOSTS</key>
+		<string>··· %#@NOTES@ ···</string>
+		<key>NOTES</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>Reposts</string>
+			<string>0 other notes</string>
 			<key>one</key>
-			<string>Repost</string>
+			<string>1 other note</string>
 			<key>other</key>
-			<string>Reposts</string>
-		</dict>
-	</dict>
-	<key>tips_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@TIPS@</string>
-		<key>TIPS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Tips</string>
-			<key>one</key>
-			<string>Tip</string>
-			<key>other</key>
-			<string>Tips</string>
+			<string>%d other notes</string>
 		</dict>
 	</dict>
 </dict>

damus.xcodeproj/project.pbxproj

@@ -116,12 +116,6 @@
 		4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */; };
 		4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB55EF4295E679D007FD187 /* UserRelaysView.swift */; };
 		4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838529656C8B00DC99E7 /* NIP05.swift */; };
-		4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */; };
-		4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */; };
-		4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838C296F710400DC99E7 /* Reposted.swift */; };
-		4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838E296F781C00DC99E7 /* ReactionsView.swift */; };
-		4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88392296F798300DC99E7 /* ReactionsModel.swift */; };
-		4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88395296F7F8B00DC99E7 /* ReactionView.swift */; };
 		4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; };
 		4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F8CC281352B30009DFBB /* Notifications.swift */; };
 		4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */; };
@@ -147,7 +141,6 @@
 		647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D9A8C2968520300A295DE /* SideMenuView.swift */; };
 		64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FBD06E296255C400D9D3B2 /* Theme.swift */; };
 		6C7DE41F2955169800E66263 /* Vault in Frameworks */ = {isa = PBXBuildFile; productRef = 6C7DE41E2955169800E66263 /* Vault */; };
-		9609F058296E220800069BF3 /* BannerImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9609F057296E220800069BF3 /* BannerImageView.swift */; };
 		BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; };
 		BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */; };
 		DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; };
@@ -315,12 +308,6 @@
 		4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendedRelayView.swift; sourceTree = "<group>"; };
 		4CB55EF4295E679D007FD187 /* UserRelaysView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserRelaysView.swift; sourceTree = "<group>"; };
 		4CB8838529656C8B00DC99E7 /* NIP05.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP05.swift; sourceTree = "<group>"; };
-		4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailBar.swift; sourceTree = "<group>"; };
-		4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP05Badge.swift; sourceTree = "<group>"; };
-		4CB8838C296F710400DC99E7 /* Reposted.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reposted.swift; sourceTree = "<group>"; };
-		4CB8838E296F781C00DC99E7 /* ReactionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionsView.swift; sourceTree = "<group>"; };
-		4CB88392296F798300DC99E7 /* ReactionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionsModel.swift; sourceTree = "<group>"; };
-		4CB88395296F7F8B00DC99E7 /* ReactionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionView.swift; sourceTree = "<group>"; };
 		4CD7641A28A1641400B6928F /* EndBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndBlock.swift; sourceTree = "<group>"; };
 		4CE4F8CC281352B30009DFBB /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
 		4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigView.swift; sourceTree = "<group>"; };
@@ -348,7 +335,6 @@
 		4FE60CDC295E1C5E00105A1F /* Wallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wallet.swift; sourceTree = "<group>"; };
 		647D9A8C2968520300A295DE /* SideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuView.swift; sourceTree = "<group>"; };
 		64FBD06E296255C400D9D3B2 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
-		9609F057296E220800069BF3 /* BannerImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerImageView.swift; sourceTree = "<group>"; };
 		BA693073295D649800ADDB87 /* UserSettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsStore.swift; sourceTree = "<group>"; };
 		BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectWalletView.swift; sourceTree = "<group>"; };
 		DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; };
@@ -479,7 +465,6 @@
 				4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */,
 				BA693073295D649800ADDB87 /* UserSettingsStore.swift */,
 				4FE60CDC295E1C5E00105A1F /* Wallet.swift */,
-				4CB88392296F798300DC99E7 /* ReactionsModel.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -487,8 +472,6 @@
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				4CB88394296F7F8100DC99E7 /* Reactions */,
-				4CB88387296AF97C00DC99E7 /* ActionBar */,
 				4CE4F9E228528C5200C00DD9 /* AddRelayView.swift */,
 				4C363A8728236948006E126D /* BlocksView.swift */,
 				4C285C8128385570008A31F1 /* CarouselView.swift */,
@@ -501,6 +484,7 @@
 				4C216F33286F5ACD00040376 /* DMView.swift */,
 				E990020E2955F837003BBC5A /* EditMetadataView.swift */,
 				3169CAE4294E699400EE4006 /* Empty Views */,
+				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
 				4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */,
 				4C75EFB82804A2740006080F /* EventView.swift */,
 				4C3AC79E2833115300E1F516 /* FollowButtonView.swift */,
@@ -532,8 +516,6 @@
 				4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
 				4CB55EF4295E679D007FD187 /* UserRelaysView.swift */,
 				647D9A8C2968520300A295DE /* SideMenuView.swift */,
-				9609F057296E220800069BF3 /* BannerImageView.swift */,
-				4CB8838E296F781C00DC99E7 /* ReactionsView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -579,23 +561,6 @@
 			path = Util;
 			sourceTree = "<group>";
 		};
-		4CB88387296AF97C00DC99E7 /* ActionBar */ = {
-			isa = PBXGroup;
-			children = (
-				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
-				4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */,
-			);
-			path = ActionBar;
-			sourceTree = "<group>";
-		};
-		4CB88394296F7F8100DC99E7 /* Reactions */ = {
-			isa = PBXGroup;
-			children = (
-				4CB88395296F7F8B00DC99E7 /* ReactionView.swift */,
-			);
-			path = Reactions;
-			sourceTree = "<group>";
-		};
 		4CE4F9DF285287A000C00DD9 /* Components */ = {
 			isa = PBXGroup;
 			children = (
@@ -605,8 +570,6 @@
 				4C06670528FCB08600038D2A /* ImageCarousel.swift */,
 				4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */,
 				4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */,
-				4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */,
-				4CB8838C296F710400DC99E7 /* Reposted.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -849,7 +812,6 @@
 				4C363A8C28236B92006E126D /* PubkeyView.swift in Sources */,
 				4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
-				4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */,
 				4C3EA67728FF7A9800C48A62 /* talstr.c in Sources */,
 				4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
 				4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
@@ -871,7 +833,6 @@
 				4C75EFA627FF87A20006080F /* Nostr.swift in Sources */,
 				4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */,
 				4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */,
-				4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */,
 				4C649844285A952100EAE2B3 /* LocalUserConfig.swift in Sources */,
 				4C75EFB328049D640006080F /* NostrEvent.swift in Sources */,
 				4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */,
@@ -880,7 +841,6 @@
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
 				4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */,
-				4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */,
 				4C3EA66828FF5F9900C48A62 /* hex.c in Sources */,
 				E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */,
 				4C3BEFDC281DCE6100B3DE84 /* Liked.swift in Sources */,
@@ -907,7 +867,6 @@
 				4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */,
 				4CACA9DC280C38C000D9BBE8 /* Profiles.swift in Sources */,
 				4C633352283D419F00B1C9C3 /* SignalModel.swift in Sources */,
-				9609F058296E220800069BF3 /* BannerImageView.swift in Sources */,
 				4C363A94282704FA006E126D /* Post.swift in Sources */,
 				4C216F32286E388800040376 /* DMChatView.swift in Sources */,
 				4C3EA67928FF7ABF00C48A62 /* list.c in Sources */,
@@ -921,8 +880,6 @@
 				4C3EA66528FF5F6800C48A62 /* mem.c in Sources */,
 				4C3EA64128FF553900C48A62 /* hash_u5.c in Sources */,
 				4C3EA64F28FF59F200C48A62 /* tal.c in Sources */,
-				4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */,
-				4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */,
 				4C8682872814DE470026224F /* ProfileView.swift in Sources */,
 				4C5F9114283D694D0052CD1C /* FollowTarget.swift in Sources */,
 				4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */,
@@ -945,7 +902,6 @@
 				4C363A922825FCF2006E126D /* ProfileUpdate.swift in Sources */,
 				4C0A3F95280F6C78000448DE /* ReplyQuoteView.swift in Sources */,
 				4C3BEFDA281DCA1400B3DE84 /* LikeCounter.swift in Sources */,
-				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
@@ -1148,7 +1104,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1188,7 +1144,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;

damus/Assets.xcassets/shaka-full.imageset/Contents.json

@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "shaka-full.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}

damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf

@@ -1,88 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.000000 -0.073975 cm
-1.000000 1.000000 1.000000 scn
-1.295334 8.661732 m
-3.613694 8.367855 l
-4.475733 8.733568 5.268113 9.771931 5.474915 10.327032 c
-6.083156 11.959681 5.507567 14.604573 5.474915 15.061715 c
-5.448792 15.427428 6.008246 15.693006 6.291239 15.780080 c
-7.571236 15.858447 8.508359 14.876789 8.642253 13.984165 c
-8.740212 13.331103 8.576948 11.752880 8.381030 10.849482 c
-8.979668 10.936556 10.980525 10.901726 11.868687 10.849482 c
-12.756847 10.797236 13.474895 10.196423 14.193260 9.412750 c
-14.767952 8.237244 13.953805 7.725680 13.474895 7.616838 c
-13.834077 7.257654 l
-14.781013 5.918882 13.649043 5.178749 13.115711 5.004600 c
-13.474895 4.743376 l
-14.487136 3.763786 13.246323 2.751544 13.017752 2.882155 c
-11.058574 3.176033 l
-15.499378 1.673996 l
-16.054478 0.400530 15.074889 0.073999 14.781013 0.073999 c
-8.576947 1.673996 l
-6.291239 1.673996 5.311650 1.869914 4.299407 2.163791 c
-4.157911 2.131138 3.659409 1.987464 2.797370 1.673996 c
-1.935332 1.360527 1.219143 2.087601 0.968804 2.490320 c
--0.285071 4.083785 -0.467927 7.257655 1.295334 8.661732 c
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1149
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 15.666626 15.710510 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001239 00000 n
-0000001262 00000 n
-0000001435 00000 n
-0000001509 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1568
-%%EOF

damus/Assets.xcassets/shaka-line.imageset/Contents.json

@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "shaka-line.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}

damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf

@@ -1,323 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.474731 -0.563965 cm
-1.000000 1.000000 1.000000 scn
-3.613694 9.332577 m
-3.553993 8.861599 l
-3.637261 8.851044 3.721838 8.862753 3.799107 8.895533 c
-3.613694 9.332577 l
-h
-1.295334 9.626453 m
-1.355035 10.097433 l
-1.227973 10.113539 1.099794 10.077623 0.999601 9.997839 c
-1.295334 9.626453 l
-h
-0.968804 3.455042 m
-1.372000 3.705677 l
-1.362764 3.720535 1.352713 3.734872 1.341894 3.748621 c
-0.968804 3.455042 l
-h
-4.299407 3.128512 m
-4.431771 3.584435 l
-4.353942 3.607030 4.271623 3.609325 4.192656 3.591103 c
-4.299407 3.128512 l
-h
-8.576947 2.638718 m
-8.695503 3.098424 l
-8.656776 3.108411 8.616942 3.113465 8.576947 3.113465 c
-8.576947 2.638718 l
-h
-14.781013 1.038721 m
-14.662457 0.579016 l
-14.701184 0.569027 14.741018 0.563974 14.781013 0.563974 c
-14.781013 1.038721 l
-h
-15.499378 2.638718 m
-15.934578 2.828420 l
-15.881091 2.951125 15.778289 3.045548 15.651489 3.088437 c
-15.499378 2.638718 l
-h
-11.058574 4.140755 m
-11.128998 4.610250 l
-10.885809 4.646729 10.655017 4.491467 10.597156 4.252461 c
-10.539293 4.013455 10.673516 3.769826 10.906463 3.691035 c
-11.058574 4.140755 l
-h
-13.017752 3.846877 m
-13.253292 4.259073 l
-13.202273 4.288227 13.146286 4.307655 13.088176 4.316372 c
-13.017752 3.846877 l
-h
-13.474895 5.708097 m
-13.805044 6.049252 l
-13.789093 6.064689 13.772079 6.078987 13.754128 6.092043 c
-13.474895 5.708097 l
-h
-13.115711 5.969321 m
-12.968349 6.420619 l
-12.798800 6.365256 12.674588 6.219535 12.646772 6.043359 c
-12.618958 5.867183 12.692234 5.690281 12.836478 5.585376 c
-13.115711 5.969321 l
-h
-13.834077 8.222376 m
-14.221668 8.496526 l
-14.206144 8.518474 14.188784 8.539063 14.169774 8.558073 c
-13.834077 8.222376 l
-h
-13.474895 8.581559 m
-13.369680 9.044500 l
-13.201114 9.006190 13.066693 8.879284 13.018762 8.713197 c
-12.970830 8.547110 13.016963 8.368095 13.139197 8.245862 c
-13.474895 8.581559 l
-h
-14.193260 10.377472 m
-14.619765 10.585986 l
-14.599768 10.626891 14.573989 10.664707 14.543221 10.698271 c
-14.193260 10.377472 l
-h
-8.381030 11.814203 m
-7.917068 11.914822 l
-7.884080 11.762714 7.927746 11.604099 8.033934 11.490305 c
-8.140121 11.376513 8.295343 11.321997 8.449365 11.344399 c
-8.381030 11.814203 l
-h
-8.642253 14.948887 m
-9.111748 15.019311 l
-8.642253 14.948887 l
-h
-6.291239 16.744801 m
-6.262227 17.218662 l
-6.224693 17.216364 6.187564 17.209614 6.151623 17.198555 c
-6.291239 16.744801 l
-h
-5.474915 16.026436 m
-5.948456 16.060261 l
-5.474915 16.026436 l
-h
-5.474915 11.291754 m
-5.030037 11.457493 l
-5.474915 11.291754 l
-h
-3.673396 9.803555 m
-1.355035 10.097433 l
-1.235632 9.155476 l
-3.553993 8.861599 l
-3.673396 9.803555 l
-h
-0.999601 9.997839 m
--0.029049 9.178730 -0.454726 7.875908 -0.474048 6.619066 c
--0.493367 5.362488 -0.110331 4.058727 0.595713 3.161463 c
-1.341894 3.748621 l
-0.794064 4.444821 0.458734 5.524729 0.475334 6.604470 c
-0.491930 7.683949 0.856455 8.670100 1.591066 9.255068 c
-0.999601 9.997839 l
-h
-0.565608 3.204407 m
-0.721970 2.952868 1.013515 2.611341 1.407507 2.372385 c
-1.811404 2.127421 2.357187 1.973489 2.959612 2.192553 c
-2.635129 3.084882 l
-2.375515 2.990478 2.132184 3.043347 1.899893 3.184233 c
-1.657696 3.331126 1.465977 3.554496 1.372000 3.705677 c
-0.565608 3.204407 l
-h
-2.959612 2.192553 m
-3.816493 2.504146 4.293336 2.639887 4.406158 2.665923 c
-4.192656 3.591103 l
-4.022485 3.551832 3.502325 3.400227 2.635129 3.084882 c
-2.959612 2.192553 l
-h
-4.167043 2.672591 m
-5.229115 2.364247 6.254152 2.163970 8.576947 2.163970 c
-8.576947 3.113465 l
-6.328326 3.113465 5.394184 3.305025 4.431771 3.584435 c
-4.167043 2.672591 l
-h
-8.458392 2.179011 m
-14.662457 0.579016 l
-14.899569 1.498427 l
-8.695503 3.098424 l
-8.458392 2.179011 l
-h
-14.781013 0.563974 m
-15.036198 0.563974 15.495326 0.684875 15.814721 1.047266 c
-16.180891 1.462728 16.264221 2.072176 15.934578 2.828420 c
-15.064179 2.449016 l
-15.289635 1.931793 15.160722 1.741243 15.102402 1.675073 c
-15.055794 1.622190 14.990156 1.579316 14.916806 1.549556 c
-14.881134 1.535082 14.847747 1.525430 14.820526 1.519657 c
-14.791491 1.513498 14.777695 1.513469 14.781013 1.513469 c
-14.781013 0.563974 l
-h
-15.651489 3.088437 m
-11.210685 4.590474 l
-10.906463 3.691035 l
-15.347267 2.188998 l
-15.651489 3.088437 l
-h
-10.988150 3.671260 m
-12.947328 3.377382 l
-13.088176 4.316372 l
-11.128998 4.610250 l
-10.988150 3.671260 l
-h
-12.782211 3.434681 m
-12.991495 3.315090 13.204453 3.370091 13.288217 3.396689 c
-13.400116 3.432221 13.506123 3.490767 13.598186 3.554502 c
-13.783985 3.683133 13.977411 3.877748 14.120350 4.119644 c
-14.264680 4.363894 14.369576 4.678114 14.335162 5.031647 c
-14.300108 5.391746 14.125634 5.739002 13.805044 6.049252 c
-13.144745 5.366943 l
-13.330275 5.187398 13.380290 5.040778 13.390134 4.939653 c
-13.400617 4.831963 13.370820 4.717613 13.302905 4.602680 c
-13.233600 4.485394 13.137231 4.390213 13.057724 4.335170 c
-13.017135 4.307070 12.996612 4.300308 13.000857 4.301657 c
-13.003194 4.302399 13.024761 4.309311 13.061064 4.310122 c
-13.095938 4.310902 13.170414 4.306433 13.253292 4.259073 c
-12.782211 3.434681 l
-h
-13.754128 6.092043 m
-13.394944 6.353267 l
-12.836478 5.585376 l
-13.195662 5.324152 l
-13.754128 6.092043 l
-h
-13.263074 5.518023 m
-13.593105 5.625790 14.123367 5.907292 14.433812 6.409482 c
-14.595931 6.671733 14.696482 6.993351 14.669847 7.364054 c
-14.643518 7.730516 14.495621 8.109214 14.221668 8.496526 c
-13.446486 7.948226 l
-13.646002 7.666152 13.711709 7.450294 13.722795 7.296009 c
-13.733575 7.145966 13.695351 7.020646 13.626177 6.908748 c
-13.474038 6.662641 13.171650 6.487002 12.968349 6.420619 c
-13.263074 5.518023 l
-h
-14.169774 8.558073 m
-13.810592 8.917255 l
-13.139197 8.245862 l
-13.498380 7.886679 l
-14.169774 8.558073 l
-h
-13.580109 8.118617 m
-13.896242 8.190466 14.344993 8.395787 14.624650 8.816864 c
-14.929440 9.275781 14.963785 9.882310 14.619765 10.585986 c
-13.766754 10.168959 l
-13.997427 9.697128 13.912044 9.460121 13.833706 9.342171 c
-13.730235 9.186377 13.532457 9.081495 13.369680 9.044500 c
-13.580109 8.118617 l
-h
-14.543221 10.698271 m
-13.820906 11.486253 12.989320 12.223852 11.896564 12.288132 c
-11.840808 11.340275 l
-12.524374 11.300065 13.128883 10.836036 13.843298 10.056674 c
-14.543221 10.698271 l
-h
-11.896564 12.288132 m
-11.441970 12.314873 10.711069 12.336796 10.019300 12.341186 c
-9.341933 12.345484 8.654247 12.333687 8.312695 12.284006 c
-8.449365 11.344399 l
-8.706450 11.381794 9.318512 11.396118 10.013274 11.391710 c
-10.693633 11.387392 11.407242 11.365778 11.840808 11.340275 c
-11.896564 12.288132 l
-h
-8.844993 11.713585 m
-8.948084 12.188952 9.040332 12.829445 9.094679 13.432834 c
-9.147870 14.023395 9.169946 14.631327 9.111748 15.019311 c
-8.172758 14.878462 l
-8.212520 14.613384 8.201942 14.105675 8.149012 13.518009 c
-8.097237 12.943172 8.009893 12.342852 7.917068 11.914822 c
-8.844993 11.713585 l
-h
-9.111748 15.019311 m
-8.944062 16.137217 7.805658 17.313158 6.262227 17.218662 c
-6.320251 16.270941 l
-7.336813 16.333179 8.072657 15.545805 8.172758 14.878462 c
-9.111748 15.019311 l
-h
-6.151623 17.198555 m
-5.976391 17.144638 5.715709 17.036982 5.490986 16.876261 c
-5.292936 16.734617 4.969444 16.439627 5.001374 15.992612 c
-5.948456 16.060261 l
-5.951383 16.019283 5.934667 15.999795 5.943361 16.012491 c
-5.954769 16.029152 5.984430 16.061831 6.043331 16.103956 c
-6.162553 16.189222 6.323094 16.257891 6.430855 16.291048 c
-6.151623 17.198555 l
-h
-5.001374 15.992612 m
-5.011176 15.855374 5.059216 15.566318 5.104405 15.255149 c
-5.152757 14.922197 5.207128 14.509316 5.241940 14.062993 c
-5.312967 13.152368 5.295928 12.171200 5.030037 11.457493 c
-5.919792 11.126015 l
-6.262142 12.044956 6.261431 13.202559 6.188560 14.136827 c
-6.151423 14.612950 6.093790 15.049047 6.044043 15.391605 c
-5.991133 15.755945 5.954979 15.968927 5.948456 16.060261 c
-5.001374 15.992612 l
-h
-5.030037 11.457493 m
-4.953650 11.252455 4.742510 10.903708 4.434547 10.555828 c
-4.127778 10.209298 3.769400 9.914337 3.428282 9.769621 c
-3.799107 8.895533 l
-4.320028 9.116529 4.788858 9.523607 5.145489 9.926461 c
-5.500926 10.327968 5.789377 10.775953 5.919792 11.126015 c
-5.030037 11.457493 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  7995
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 16.615845 16.660034 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000008085 00000 n
-0000008108 00000 n
-0000008281 00000 n
-0000008355 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-8414
-%%EOF

damus/Assets.xcassets/shaka.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "nostr-hello-outline-black.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "nostr-hello-outline-black@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "nostr-hello-outline-black@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Components/NIP05Badge.swift

@@ -1,65 +0,0 @@
-//
-//  NIP05Badge.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct NIP05Badge: View {
-    let nip05: NIP05
-    let pubkey: String
-    let contacts: Contacts
-    let show_domain: Bool
-    let clickable: Bool
-    
-    @Environment(\.openURL) var openURL
-    
-    init (nip05: NIP05, pubkey: String, contacts: Contacts, show_domain: Bool, clickable: Bool) {
-        self.nip05 = nip05
-        self.pubkey = pubkey
-        self.contacts = contacts
-        self.show_domain = show_domain
-        self.clickable = clickable
-    }
-    
-    var nip05_color: Color {
-       return get_nip05_color(pubkey: pubkey, contacts: contacts)
-    }
-    
-    var body: some View {
-        HStack(spacing: 2) {
-            Image(systemName: "checkmark.seal.fill")
-                .font(.footnote)
-                .foregroundColor(nip05_color)
-            if show_domain {
-                if clickable {
-                    Text(nip05.host)
-                        .foregroundColor(nip05_color)
-                        .onTapGesture {
-                            if let nip5url = nip05.siteUrl {
-                                openURL(nip5url)
-                            }
-                        }
-                } else {
-                    Text(nip05.host)
-                        .foregroundColor(nip05_color)
-                }
-            }
-        }
-
-    }
-}
-
-func get_nip05_color(pubkey: String, contacts: Contacts) -> Color {
-    return contacts.is_friend_or_self(pubkey) ? .accentColor : .gray
-}
-
-struct NIP05Badge_Previews: PreviewProvider {
-    static var previews: some View {
-        let test_state = test_damus_state()
-        NIP05Badge(nip05: NIP05(username: "jb55", host: "jb55.com"), pubkey: test_state.pubkey, contacts: test_state.contacts, show_domain: true, clickable: false)
-    }
-}
-

damus/Components/Reposted.swift

@@ -1,34 +0,0 @@
-//
-//  Reposted.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct Reposted: View {
-    let damus: DamusState
-    let pubkey: String
-    let profile: Profile?
-    
-    var body: some View {
-        HStack(alignment: .center) {
-            Image(systemName: "arrow.2.squarepath")
-                .font(.footnote)
-                .foregroundColor(Color.gray)
-            ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, show_nip5_domain: false)
-                    .foregroundColor(Color.gray)
-            Text("Reposted", comment: "Text indicating that the post was reposted (i.e. re-shared).")
-                .font(.footnote)
-                .foregroundColor(Color.gray)
-        }
-    }
-}
-
-struct Reposted_Previews: PreviewProvider {
-    static var previews: some View {
-        let test_state = test_damus_state()
-        Reposted(damus: test_state, pubkey: test_state.pubkey, profile: make_test_profile())
-    }
-}

damus/ContentView.swift

@@ -216,7 +216,7 @@ struct ContentView: View {
             }
         }
     }
-    
+
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             if let damus = self.damus_state {
@@ -229,6 +229,9 @@ struct ContentView: View {
                                         Button {
                                             isSideBarOpened.toggle()
                                         } label: {
+                                            let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
+                                            let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
+                                            
                                             if let picture = damus_state?.profiles.lookup(id: pubkey)?.picture {
                                                 ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, picture: picture)
                                             } else {

damus/Models/ActionBarModel.swift

@@ -16,10 +16,6 @@ class ActionBarModel: ObservableObject {
     @Published var boosts: Int
     @Published var tips: Int64
     
-    static func empty() -> ActionBarModel {
-        return ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
-    }
-    
     init(likes: Int, boosts: Int, tips: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_tip: NostrEvent?) {
         self.likes = likes
         self.boosts = boosts
@@ -29,10 +25,6 @@ class ActionBarModel: ObservableObject {
         self.our_tip = our_tip
     }
     
-    var is_empty: Bool {
-        return likes == 0 && boosts == 0 && tips == 0
-    }
-    
     var tipped: Bool {
         return our_tip != nil
     }

damus/Models/FollowersModel.swift

@@ -18,11 +18,11 @@ class FollowersModel: ObservableObject {
     let sub_id: String = UUID().description
     let profiles_id: String = UUID().description
     
-    var count: Int? {
+    var count_display: String {
         guard let contacts = self.contacts else {
-            return nil
+            return "?"
         }
-        return contacts.count
+        return "\(contacts.count)";
     }
     
     init(damus_state: DamusState, target: String) {
@@ -73,30 +73,31 @@ class FollowersModel: ObservableObject {
     }
     
     func handle_event(relay_id: String, ev: NostrConnectionEvent) {
-        guard case .nostr_event(let nev) = ev else {
-            return
-        }
-        
-        switch nev {
-        case .event(let sub_id, let ev):
-            guard sub_id == self.sub_id || sub_id == self.profiles_id else {
-                return
-            }
-            
-            if ev.known_kind == .contacts {
-                handle_contact_event(ev)
-            } else if ev.known_kind == .metadata {
-                process_metadata_event(profiles: damus_state.profiles, ev: ev)
-            }
-            
-        case .notice(let msg):
-            print("followingmodel notice: \(msg)")
-            
-        case .eose(let sub_id):
-            if sub_id == self.sub_id {
-                load_profiles(relay_id: relay_id)
-            } else if sub_id == self.profiles_id {
-                damus_state.pool.unsubscribe(sub_id: profiles_id, to: [relay_id])
+        switch ev {
+        case .ws_event:
+            break
+        case .nostr_event(let nev):
+            switch nev {
+            case .event(let sub_id, let ev):
+                guard sub_id == self.sub_id || sub_id == self.profiles_id else {
+                    return
+                }
+                
+                if ev.known_kind == .contacts {
+                    handle_contact_event(ev)
+                } else if ev.known_kind == .metadata {
+                    process_metadata_event(profiles: damus_state.profiles, ev: ev)
+                }
+                
+            case .notice(let msg):
+                print("followingmodel notice: \(msg)")
+                
+            case .eose(let sub_id):
+                if sub_id == self.sub_id {
+                    load_profiles(relay_id: relay_id)
+                } else if sub_id == self.profiles_id {
+                    damus_state.pool.unsubscribe(sub_id: profiles_id, to: [relay_id])
+                }
             }
         }
     }

damus/Models/HomeModel.swift

@@ -578,13 +578,6 @@ func process_metadata_event(profiles: Profiles, ev: NostrEvent) {
         }
     }
     
-    let banner = tprof.profile.banner ?? ""
-    if let _ = URL(string: banner) {
-        DispatchQueue.main.async {
-            notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
-        }
-    }
-    
     notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
 }
 

damus/Models/ReactionsModel.swift

@@ -1,78 +0,0 @@
-//
-//  LikesModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import Foundation
-
-
-class ReactionsModel: ObservableObject {
-    let state: DamusState
-    let target: String
-    let sub_id: String
-    let profiles_id: String
-    
-    @Published var reactions: [NostrEvent]
-    
-    init (state: DamusState, target: String) {
-        self.state = state
-        self.target = target
-        self.sub_id = UUID().description
-        self.profiles_id = UUID().description
-        self.reactions = []
-    }
-    
-    func get_filter() -> NostrFilter {
-        var filter = NostrFilter.filter_kinds([7])
-        filter.referenced_ids = [target]
-        filter.limit = 500
-        return filter
-    }
-    
-    func subscribe() {
-        let filter = get_filter()
-        let filters = [filter]
-        self.state.pool.subscribe(sub_id: sub_id, filters: filters, handler: handle_nostr_event)
-    }
-    
-    func unsubscribe() {
-        self.state.pool.unsubscribe(sub_id: sub_id)
-    }
-    
-    func handle_event(relay_id: String, ev: NostrEvent) {
-        guard ev.kind == 7 else {
-            return
-        }
-        
-        guard let reacted_to = last_etag(tags: ev.tags) else {
-            return
-        }
-        
-        guard reacted_to == self.target else {
-            return
-        }
-        
-        if insert_uniq_sorted_event(events: &self.reactions, new_ev: ev, cmp: { a, b in a.created_at < b.created_at } ) {
-            objectWillChange.send()
-        }
-    }
-    
-    func handle_nostr_event(relay_id: String, ev: NostrConnectionEvent) {
-        guard case .nostr_event(let nev) = ev else {
-            return
-        }
-        
-        switch nev {
-        case .event(_, let ev):
-            handle_event(relay_id: relay_id, ev: ev)
-            
-        case .notice(_):
-            break
-        case .eose(_):
-            load_profiles(profiles_subid: profiles_id, relay_id: relay_id, events: reactions, damus_state: state)
-            break
-        }
-    }
-}

damus/Nostr/Nostr.swift

@@ -10,13 +10,12 @@ import Foundation
 struct Profile: Codable {
     var value: [String: String]
     
-    init (name: String?, display_name: String?, about: String?, picture: String?, banner: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
+    init (name: String?, display_name: String?, about: String?, picture: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
         self.value = [:]
         self.name = name
         self.display_name = display_name
         self.about = about
         self.picture = picture
-        self.banner = banner
         self.website = website
         self.lud06 = lud06
         self.lud16 = lud16
@@ -43,11 +42,6 @@ struct Profile: Codable {
         set(s) { value["picture"] = s }
     }
     
-    var banner: String? {
-        get { return value["banner"]; }
-        set(s) { value["banner"] = s }
-    }
-    
     var website: String? {
         get { return value["website"]; }
         set(s) { value["website"] = s }
@@ -100,9 +94,26 @@ struct Profile: Codable {
     }
 }
 
-func make_test_profile() -> Profile {
-    return Profile(name: "jb55", display_name: "Will", about: "Its a me", picture: "https://cdn.jb55.com/img/red-me.jpg", banner: "https://pbs.twimg.com/profile_banners/9918032/1531711830/600x200",  website: "jb55.com", lud06: "jb55@jb55.com", lud16: nil, nip05: "jb55@jb55.com")
+/*
+struct Profile: Decodable {
+    let name: String?
+    let display_name: String?
+    let about: String?
+    let picture: String?
+    let website: String?
+    let nip05: String?
+    let lud06: String?
+    let lud16: String?
+    
+    var lightning_uri: URL? {
+        return make_ln_url(self.lud06) ?? make_ln_url(self.lud16)
+    }
+    
+    static func displayName(profile: Profile?, pubkey: String) -> String {
+        return profile?.name ?? abbrev_pubkey(pubkey)
+    }
 }
+ */
 
 func make_ln_url(_ str: String?) -> URL? {
     return str.flatMap { URL(string: "lightning:" + $0) }

damus/Nostr/NostrEvent.swift

@@ -772,15 +772,6 @@ func validate_event(ev: NostrEvent) -> ValidationResult {
     return ok ? .ok : .bad_sig
 }
 
-func last_etag(tags: [[String]]) -> String? {
-    var e: String? = nil
-    for tag in tags {
-        if tag.count >= 2 && tag[0] == "e" {
-            e = tag[1]
-        }
-    }
-    return e
-}
 
 func inner_event_or_self(ev: NostrEvent) -> NostrEvent {
     guard let inner_ev = ev.inner_event else {

damus/Nostr/NostrMetadata.swift

@@ -15,11 +15,10 @@ struct NostrMetadata: Codable {
     let website: String?
     let nip05: String?
     let picture: String?
-    let banner: String?
     let lud06: String?
     let lud16: String?
 }
 
 func create_account_to_metadata(_ model: CreateAccountModel) -> NostrMetadata {
-    return NostrMetadata(display_name: model.real_name, name: model.nick_name, about: model.about, website: nil, nip05: nil, picture: nil, banner: nil, lud06: nil, lud16: nil)
+    return NostrMetadata(display_name: model.real_name, name: model.nick_name, about: model.about, website: nil, nip05: nil, picture: nil, lud06: nil, lud16: nil)
 }

damus/Views/ActionBar/EventDetailBar.swift

@@ -1,39 +0,0 @@
-//
-//  EventDetailBar.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-08.
-//
-
-import SwiftUI
-
-struct EventDetailBar: View {
-    let state: DamusState
-    let target: String
-    @StateObject var bar: ActionBarModel
-    
-    var body: some View {
-        HStack {
-            if bar.boosts > 0 {
-                Text("\(Text("\(bar.boosts)", comment: "Number of reposts.").font(.body.bold())) \(Text(String(format: NSLocalizedString("reposts_count", comment: "Part of a larger sentence to describe how many reposts there are."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.")
-            }
-
-            if bar.likes > 0 {
-                NavigationLink(destination: ReactionsView(damus_state: state, model: ReactionsModel(state: state, target: target))) {
-                    Text("\(Text("\(bar.likes)", comment: "Number of reactions on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("reactions_count", comment: "Part of a larger sentence to describe how many reactions there are on a post."), bar.likes)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reactions there are on a post. In source English, the first variable is the number of reactions, and the second variable is 'Reaction' or 'Reactions'.")
-                }
-                .buttonStyle(PlainButtonStyle())
-            }
-            
-            if bar.tips > 0 {
-                Text("\(Text("\(bar.tips)", comment: "Number of tip payments on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("tips_count", comment: "Part of a larger sentence to describe how many tip payments there are on a post."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many tip payments there are on a post. In source English, the first variable is the number of tip payments, and the second variable is 'Tip' or 'Tips'.")
-            }
-        }
-    }
-}
-
-struct EventDetailBar_Previews: PreviewProvider {
-    static var previews: some View {
-        EventDetailBar(state: test_damus_state(), target: "", bar: ActionBarModel.empty())
-    }
-}

damus/Views/BannerImageView.swift

@@ -1,85 +0,0 @@
-//
-//  BannerImageView.swift
-//  damus
-//
-//  Created by Jason Jōb on 2023-01-10.
-//
-
-import SwiftUI
-import Kingfisher
-
-struct InnerBannerImageView: View {
-    let url: URL?
-    let pubkey: String
-
-    var body: some View {
-        ZStack {
-            Color(uiColor: .systemBackground)
-            
-            if (url != nil) {
-                KFAnimatedImage(url)
-                    .callbackQueue(.dispatch(.global(qos: .background)))
-                    .processingQueue(.dispatch(.global(qos: .background)))
-                    .appendProcessor(LargeImageProcessor.shared)
-                    .configure { view in
-                        view.framePreloadCount = 1
-                    }
-                    .placeholder { _ in
-                        Image("profile-banner").resizable()
-                    }
-                    .scaleFactor(UIScreen.main.scale)
-                    .loadDiskFileSynchronously()
-                    .fade(duration: 0.1)
-            } else {
-                Image("profile-banner").resizable()
-            }
-        }
-    }
-}
-
-struct BannerImageView: View {
-    let pubkey: String
-    let profiles: Profiles
-    
-    @State var banner: String?
-    
-    init (pubkey: String, profiles: Profiles, banner: String? = nil) {
-        self.pubkey = pubkey
-        self.profiles = profiles
-        self._banner = State(initialValue: banner)
-    }
-    
-    var body: some View {
-        InnerBannerImageView(url: get_banner_url(banner: banner, pubkey: pubkey, profiles: profiles), pubkey: pubkey)
-            .onReceive(handle_notify(.profile_updated)) { notif in
-                let updated = notif.object as! ProfileUpdate
-
-                guard updated.pubkey == self.pubkey else {
-                    return
-                }
-                
-                if let bannerImage = updated.profile.banner {
-                    self.banner = bannerImage
-                }
-            }
-    }
-}
-
-func get_banner_url(banner: String?, pubkey: String, profiles: Profiles) -> URL? {
-    let bannerUrlString = banner ?? profiles.lookup(id: pubkey)?.banner ?? ""
-    if let url = URL(string: bannerUrlString) {
-        return url
-    }
-    return nil
-}
-
-struct BannerImageView_Previews: PreviewProvider {
-    static let pubkey = "ca48854ac6555fed8e439ebb4fa2d928410e0eef13fa41164ec45aaaa132d846"
-    
-    static var previews: some View {
-        BannerImageView(
-            pubkey: pubkey,
-            profiles: make_preview_profiles(pubkey))
-    }
-}
-

damus/Views/ConfigView.swift

@@ -142,7 +142,7 @@ struct ConfigView: View {
             Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user.")) {
                 confirm_logout = false
             }
-            Button(NSLocalizedString("Logout", comment: "Button for logging out the user.")) {
+                   Button(NSLocalizedString("Logout", comment: "Button for logging out the user.")) {
                 notify(.logout, ())
             }
         } message: {

damus/Views/EditMetadataView.swift

@@ -8,7 +8,6 @@
 import SwiftUI
 
 let PPM_SIZE: CGFloat = 80.0
-let BANNER_HEIGHT: CGFloat = 150.0;
 
 func isHttpsUrl(_ string: String) -> Bool {
     let urlRegEx = "^https://.*$"
@@ -57,14 +56,12 @@ struct EditMetadataView: View {
     @State var display_name: String
     @State var about: String
     @State var picture: String
-    @State var banner: String
     @State var nip05: String
     @State var name: String
     @State var ln: String
     @State var website: String
     
     @Environment(\.dismiss) var dismiss
-    @Environment(\.colorScheme) var colorScheme
     
     init (damus_state: DamusState) {
         self.damus_state = damus_state
@@ -75,15 +72,10 @@ struct EditMetadataView: View {
         _about = State(initialValue: data?.about ?? "")
         _website = State(initialValue: data?.website ?? "")
         _picture = State(initialValue: data?.picture ?? "")
-        _banner = State(initialValue: data?.banner ?? "")
         _nip05 = State(initialValue: data?.nip05 ?? "")
         _ln = State(initialValue: data?.lud16 ?? data?.lud06 ?? "")
     }
     
-    func imageBorderColor() -> Color {
-            colorScheme == .light ? Color("DamusWhite") : Color("DamusBlack")
-        }
-    
     func save() {
         let metadata = NostrMetadata(
             display_name: display_name,
@@ -92,7 +84,6 @@ struct EditMetadataView: View {
             website: website,
             nip05: nip05.isEmpty ? nil : nip05,
             picture: picture.isEmpty ? nil : picture,
-            banner: banner.isEmpty ? nil : banner,
             lud06: ln.contains("@") ? nil : ln,
             lud16: ln.contains("@") ? ln : nil
         );
@@ -108,32 +99,13 @@ struct EditMetadataView: View {
         return NIP05.parse(nip05)
     }
     
-    var TopSection: some View {
-        ZStack(alignment: .top) {
-            GeometryReader { geo in
-                BannerImageView(pubkey: damus_state.pubkey, profiles: damus_state.profiles)
-                    .aspectRatio(contentMode: .fill)
-                    .frame(width: geo.size.width, height: BANNER_HEIGHT)
-                    .clipped()
-            }.frame(height: BANNER_HEIGHT)
-            VStack(alignment: .leading) {
-                let pfp_size: CGFloat = 90.0
-
-                HStack(alignment: .center) {
-                    ProfilePicView(pubkey: damus_state.pubkey, size: pfp_size, highlight: .custom(imageBorderColor(), 4.0), profiles: damus_state.profiles)
-                        .offset(y: -(pfp_size/2.0)) // Increase if set a frame
-
-                   Spacer()
-                }.padding(.bottom,-(pfp_size/2.0))
-            }
-            .padding(.horizontal,18)
-            .padding(.top,BANNER_HEIGHT)
-        }
-    }
-    
     var body: some View {
         VStack(alignment: .leading) {
-            TopSection
+            HStack {
+                Spacer()
+                InnerProfilePicView(url: URL(string: picture), fallbackUrl: nil, pubkey: damus_state.pubkey, size: PPM_SIZE, highlight: .none)
+                Spacer()
+            }
             Form {
                 Section(NSLocalizedString("Your Name", comment: "Label for Your Name section of user profile form.")) {
                     TextField("Satoshi Nakamoto", text: $display_name)
@@ -154,12 +126,6 @@ struct EditMetadataView: View {
                         .textInputAutocapitalization(.never)
                 }
                 
-                Section (NSLocalizedString("Banner Image", comment: "Label for Banner Image section of user profile form.")) {
-                                    TextField(NSLocalizedString("https://example.com/pic.jpg", comment: "Placeholder example text for profile picture URL."), text: $banner)
-                                        .autocorrectionDisabled(true)
-                                        .textInputAutocapitalization(.never)
-                                }
-                
                 Section(NSLocalizedString("Website", comment: "Label for Website section of user profile form.")) {
                     TextField(NSLocalizedString("https://jb55.com", comment: "Placeholder example text for website URL for user profile."), text: $website)
                         .autocorrectionDisabled(true)
@@ -206,7 +172,7 @@ struct EditMetadataView: View {
                 }
             }
         }
-        .ignoresSafeArea()
+        .navigationTitle(NSLocalizedString("Edit Profile", comment: "Title of navigation view for Edit Profile."))
     }
 }
 

damus/Views/EventActionBar.swift

@@ -29,6 +29,14 @@ struct EventActionBar: View {
     
     var body: some View {
         HStack {
+            /*
+            EventActionButton(img: "square.and.arrow.up") {
+                print("share")
+            }
+
+            Spacer()
+            
+             */
             if damus_state.keypair.privkey != nil {
                 EventActionButton(img: "bubble.left", col: nil) {
                     notify(.reply, event)
@@ -37,6 +45,9 @@ struct EventActionBar: View {
             }
             
             HStack(alignment: .bottom) {
+                Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
+                    .font(.footnote.weight(.medium))
+                    .foregroundColor(bar.boosted ? Color.green : Color.gray)
                 
                 EventActionButton(img: "arrow.2.squarepath", col: bar.boosted ? Color.green : nil) {
                     if bar.boosted {
@@ -44,27 +55,21 @@ struct EventActionBar: View {
                     } else {
                         self.confirm_boost = true
                     }
-                }.overlay {
-                    Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
-                        .offset(x: 22)
-                        .font(.footnote.weight(.medium))
-                        .foregroundColor(bar.boosted ? Color.green : Color.gray)
                 }
             }
             .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
 
             HStack(alignment: .bottom) {
+                Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
+                    .font(.footnote.weight(.medium))
+                    .foregroundColor(bar.liked ? Color.orange : Color.gray)
+                    
                 LikeButton(liked: bar.liked) {
                     if bar.liked {
                         notify(.delete, bar.our_like)
                     } else {
                         send_like()
                     }
-                }.overlay {
-                    Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
-                        .offset(x: 22)
-                        .font(.footnote.weight(.medium))
-                        .foregroundColor(bar.liked ? Color.accentColor : Color.gray)
                 }
             }
             .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
@@ -97,15 +102,15 @@ struct EventActionBar: View {
                 }
             }
         }
-        .alert(NSLocalizedString("Repost", comment: "Title of alert for confirming to repost a post."), isPresented: $confirm_boost) {
-            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of reposting a post.")) {
+        .alert(NSLocalizedString("Boost", comment: "Title of alert for confirming to boost a post."), isPresented: $confirm_boost) {
+            Button("Cancel") {
                 confirm_boost = false
             }
-            Button(NSLocalizedString("Repost", comment: "Button to confirm reposting a post.")) {
+            Button(NSLocalizedString("Boost", comment: "Button to confirm boosting a post.")) {
                 send_boost()
             }
         } message: {
-            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
+            Text("Are you sure you want to boost this post?", comment: "Alert message to ask if user wants to boost a post.")
         }
         .onReceive(handle_notify(.liked)) { n in
             let liked = n.object as! Counted
@@ -149,7 +154,7 @@ struct EventActionBar: View {
 
 func EventActionButton(img: String, col: Color?, action: @escaping () -> ()) -> some View {
     Button(action: action) {
-        Label(NSLocalizedString("\u{00A0}", comment: "Non-breaking space character to fill in blank space next to event action button icons."), systemImage: img)
+        Label(" ", systemImage: img)
             .font(.footnote.weight(.medium))
             .foregroundColor(col == nil ? Color.gray : col!)
     }
@@ -163,8 +168,13 @@ struct LikeButton: View {
     
     var body: some View {
         Button(action: action) {
-            Image(liked ? "shaka-full" : "shaka-line")
-                .foregroundColor(liked ? .accentColor : .gray)
+            if liked {
+                Text("🤙", comment: "Button with emoji to like an event.")
+            } else {
+                Image("shaka")
+                    .renderingMode(.template)
+                    .foregroundColor(.gray)
+            }
         }
     }
 }
@@ -174,19 +184,8 @@ struct EventActionBar_Previews: PreviewProvider {
     static var previews: some View {
         let pk = "pubkey"
         let ds = test_damus_state()
-        let ev = NostrEvent(content: "hi", pubkey: pk)
-        
         let bar = ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
-        let likedbar = ActionBarModel(likes: 10, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
-        let likedbar_ours = ActionBarModel(likes: 10, boosts: 0, tips: 0, our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: nil, our_tip: nil)
-        
-        VStack(spacing: 50) {
-            EventActionBar(damus_state: ds, event: ev, bar: bar)
-            
-            EventActionBar(damus_state: ds, event: ev, bar: likedbar)
-            
-            EventActionBar(damus_state: ds, event: ev, bar: likedbar_ours)
-        }
-        .padding(20)
+        let ev = NostrEvent(content: "hi", pubkey: pk)
+        EventActionBar(damus_state: ds, event: ev, bar: bar)
     }
 }

damus/Views/EventView.swift

@@ -172,7 +172,17 @@ struct EventView: View {
                     let booster_profile = ProfileView(damus_state: damus, profile: prof_model, followers: follow_model)
                     
                     NavigationLink(destination: booster_profile) {
-                        Reposted(damus: damus, pubkey: event.pubkey, profile: prof)
+                        HStack {
+                            Image(systemName: "arrow.2.squarepath")
+                                .font(.footnote.weight(.bold))
+                                .foregroundColor(Color.gray)
+                            ProfileName(pubkey: event.pubkey, profile: prof, damus: damus, show_friend_confirmed: true)
+                                    .font(.footnote.weight(.bold))
+                                    .foregroundColor(Color.gray)
+                            Text("Boosted", comment: "Text indicating that the post was boosted (i.e. re-shared).")
+                                .font(.footnote.weight(.bold))
+                                .foregroundColor(Color.gray)
+                        }
                     }
                     .buttonStyle(PlainButtonStyle())
                     TextEvent(inner_ev, pubkey: inner_ev.pubkey)
@@ -251,13 +261,6 @@ struct EventView: View {
                     }
                     
                     let bar = make_actionbar_model(ev: event, damus: damus)
-                    
-                    if size == .selected && !bar.is_empty {
-                        EventDetailBar(state: damus, target: event.id, bar: bar)
-                        Divider()
-                            .padding([.bottom], 4)
-                    }
-                    
                     EventActionBar(damus_state: damus, event: event, bar: bar)
                 }
 

damus/Views/ProfileName.swift

@@ -34,6 +34,8 @@ struct ProfileName: View {
     
     @State var display_name: String?
     @State var nip05: NIP05?
+    
+    @Environment(\.openURL) var openURL
 
     init(pubkey: String, profile: Profile?, damus: DamusState, show_friend_confirmed: Bool, show_nip5_domain: Bool = true) {
         self.pubkey = pubkey
@@ -71,7 +73,18 @@ struct ProfileName: View {
                 .font(.body)
                 .fontWeight(prefix == "@" ? .none : .bold)
             if let nip05 = current_nip05 {
-                NIP05Badge(nip05: nip05, pubkey: pubkey, contacts: damus_state.contacts, show_domain: show_nip5_domain, clickable: true)
+                Image(systemName: "checkmark.seal.fill")
+                    .foregroundColor(nip05_color)
+                
+                if show_nip5_domain {
+                    Text(nip05.host)
+                        .foregroundColor(nip05_color)
+                        .onTapGesture {
+                            if let nip5url = nip05.siteUrl {
+                                openURL(nip5url)
+                            }
+                        }
+                }
             }
             if let friend = friend_icon, current_nip05 == nil {
                 Image(systemName: friend)
@@ -145,8 +158,9 @@ struct EventProfileName: View {
                     .fontWeight(.bold)
             }
             
-            if let nip05 = current_nip05 {
-                NIP05Badge(nip05: nip05, pubkey: pubkey, contacts: damus_state.contacts, show_domain: false, clickable: false)
+            if let _ = current_nip05 {
+                Image(systemName: "checkmark.seal.fill")
+                    .foregroundColor(get_nip05_color(pubkey: pubkey, contacts: damus_state.contacts))
             }
             
             if let frend = friend_icon, current_nip05 == nil {
@@ -166,3 +180,6 @@ struct EventProfileName: View {
     }
 }
 
+func get_nip05_color(pubkey: String, contacts: Contacts) -> Color {
+    return contacts.is_friend_or_self(pubkey) ? .accentColor : .gray
+}

damus/Views/ProfilePicView.swift

@@ -182,7 +182,7 @@ func get_profile_url(picture: String?, pubkey: String, profiles: Profiles) -> UR
 func make_preview_profiles(_ pubkey: String) -> Profiles {
     let profiles = Profiles()
     let picture = "http://cdn.jb55.com/img/red-me.jpg"
-    let profile = Profile(name: "jb55", display_name: "William Casarin", about: "It's me", picture: picture, banner: "", website: "https://jb55.com", lud06: nil, lud16: nil, nip05: "jb55.com")
+    let profile = Profile(name: "jb55", display_name: "William Casarin", about: "It's me", picture: picture, website: "https://jb55.com", lud06: nil, lud16: nil, nip05: "jb55.com")
     let ts_profile = TimestampedProfile(profile: profile, timestamp: 0)
     profiles.add(id: pubkey, profile: ts_profile)
     return profiles

damus/Views/ProfileView.swift

@@ -194,14 +194,15 @@ struct ProfileView: View {
     var TopSection: some View {
         ZStack(alignment: .top) {
             GeometryReader { geo in
-                BannerImageView(pubkey: profile.pubkey, profiles: damus_state.profiles)
+                Image("profile-banner")
+                    .resizable()
                     .aspectRatio(contentMode: .fill)
-                    .frame(width: geo.size.width, height: BANNER_HEIGHT)
+                    .frame(width: geo.size.width, height: 150)
                     .clipped()
                 
                 ShareButton
                     .offset(x: geo.size.width - 80.0, y: 50.0 )
-            }.frame(height: BANNER_HEIGHT)
+            }
             VStack(alignment: .leading) {
                 let data = damus_state.profiles.lookup(id: profile.pubkey)
                 let pfp_size: CGFloat = 90.0
@@ -282,7 +283,7 @@ struct ProfileView: View {
                     
                     if let relays = profile.relays {
                         NavigationLink(destination: UserRelaysView(state: damus_state, pubkey: profile.pubkey, relays: Array(relays.keys).sorted())) {
-                            Text("\(Text("\(relays.keys.count)", comment: "Number of relay servers a user is connected.").font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("relays_count", comment: "Part of a larger sentence to describe how many relay servers a user is connected."), relays.keys.count)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'.")
+                            Text("\(Text("\(relays.keys.count)", comment: "Number of relay servers a user is connected.").font(.subheadline.weight(.medium))) \(Text("Relays", comment: "Part of a larger sentence to describe how many relay servers a user is connected.").font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relays'.")
                         }
                         .buttonStyle(PlainButtonStyle())
                     }
@@ -296,14 +297,13 @@ struct ProfileView: View {
     
     var FollowersCount: some View {
         HStack {
-            if followers.count == nil {
+            if followers.count_display == "?" {
                 Image(systemName: "square.and.arrow.down")
                 Text("Followers", comment: "Label describing followers of a user.")
                     .font(.subheadline)
                     .foregroundColor(.gray)
             } else {
-                let followerCount = followers.count!
-                Text("\(Text("\(followerCount)", comment: "Number of people following a user.").font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("followers_count", comment: "Part of a larger sentence to describe how many people are following a user."), followerCount)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many people are following a user. In source English, the first variable is the number of followers, and the second variable is 'Follower' or 'Followers'.")
+                Text("\(Text("\(followers.count_display)", comment: "Number of people following a user.").font(.subheadline.weight(.medium))) \(Text("Followers", comment: "Part of a larger sentence to describe how many people are following a user.").font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many people are following a user. In source English, the first variable is the number of followers, and the second variable is 'Followers'.")
             }
         }
     }
@@ -358,7 +358,7 @@ func test_damus_state() -> DamusState {
     let pubkey = "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681"
     let damus = DamusState(pool: RelayPool(), keypair: Keypair(pubkey: pubkey, privkey: "privkey"), likes: EventCounter(our_pubkey: pubkey), boosts: EventCounter(our_pubkey: pubkey), contacts: Contacts(our_pubkey: pubkey), tips: TipCounter(our_pubkey: pubkey), profiles: Profiles(), dms: DirectMessagesModel(), previews: PreviewCache())
     
-    let prof = Profile(name: "damus", display_name: "damus", about: "iOS app!", picture: "https://damus.io/img/logo.png", banner: "", website: "https://damus.io", lud06: nil, lud16: "jb55@sendsats.lol", nip05: "damus.io")
+    let prof = Profile(name: "damus", display_name: "damus", about: "iOS app!", picture: "https://damus.io/img/logo.png", website: "https://damus.io", lud06: nil, lud16: "jb55@sendsats.lol", nip05: "damus.io")
     let tsprof = TimestampedProfile(profile: prof, timestamp: 0)
     damus.profiles.add(id: pubkey, profile: tsprof)
     return damus

damus/Views/PubkeyView.swift

@@ -14,7 +14,7 @@ struct PubkeyView: View {
     var body: some View {
         let color: Color = id_to_color(pubkey)
         ZStack {
-            Text("\(abbrev_pubkey(pubkey))", comment: "Abbreviated version of a nostr public key.")
+            Text("\(abbrev_pubkey(pubkey))")
                 .foregroundColor(color)
         }
     }

damus/Views/Reactions/ReactionView.swift

@@ -1,36 +0,0 @@
-//
-//  ReactionView.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct ReactionView: View {
-    let damus_state: DamusState
-    let reaction: NostrEvent
-    
-    var content: String {
-        if reaction.content == "" || reaction.content == "+" {
-            return "❤️"
-        }
-        return reaction.content
-    }
-    
-    var body: some View {
-        HStack {
-            Text(content)
-                .font(Font.headline)
-                .frame(width: 50, height: 50)
-            
-            FollowUserView(target: .pubkey(reaction.pubkey), damus_state: damus_state)
-        }
-    }
-}
-
-struct ReactionView_Previews: PreviewProvider {
-    static var previews: some View {
-        ReactionView(damus_state: test_damus_state(), reaction: NostrEvent(id: "", content: "🤙🏼", pubkey: ""))
-    }
-}

damus/Views/ReactionsView.swift

@@ -1,38 +0,0 @@
-//
-//  ReactionsView.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct ReactionsView: View {
-    let damus_state: DamusState
-    @StateObject var model: ReactionsModel
-    
-    var body: some View {
-        ScrollView {
-            LazyVStack {
-                ForEach(model.reactions, id: \.id) { ev in
-                    ReactionView(damus_state: damus_state, reaction: ev)
-                }
-            }
-            .padding()
-        }
-        .navigationBarTitle(NSLocalizedString("Reactions", comment: "Navigation bar title for Reactions view."))
-        .onAppear {
-            model.subscribe()
-        }
-        .onDisappear {
-            model.unsubscribe()
-        }
-    }
-}
-
-struct ReactionsView_Previews: PreviewProvider {
-    static var previews: some View {
-        let state = test_damus_state()
-        ReactionsView(damus_state: state, model: ReactionsModel(state: state, target: "pubkey"))
-    }
-}

damus/Views/ReplyQuoteView.swift

@@ -28,7 +28,7 @@ struct ReplyQuoteView: View {
                     ProfilePicView(pubkey: event.pubkey, size: 16, highlight: .reply, profiles: profiles)
                     Text(Profile.displayName(profile: profiles.lookup(id: event.pubkey), pubkey: event.pubkey))
                         .foregroundColor(.accentColor)
-                    Text("\(format_relative_time(event.created_at))", comment: "Amount of time that has passed since reply quote event occurred.")
+                    Text("\(format_relative_time(event.created_at))")
                         .foregroundColor(.gray)
                 }
                 

damus/Views/SaveKeysView.swift

@@ -63,7 +63,7 @@ struct SaveKeysView: View {
                     } else if let err = error {
                         Text("Error: \(err)", comment: "Error message indicating why saving keys failed.")
                             .foregroundColor(.red)
-                        DamusWhiteButton(NSLocalizedString("Retry", comment: "Button to retry completing account creation after an error occurred.")) {
+                        DamusWhiteButton("Retry") {
                             complete_account_creation(account)
                         }
                     } else {

damus/Views/SearchView.swift

@@ -42,7 +42,6 @@ struct SearchView_Previews: PreviewProvider {
         let test_state = test_damus_state()
         let filter = NostrFilter.filter_hashtag(["bitcoin"])
         let pool = test_state.pool
-        
         let model = SearchModel(pool: pool, search: filter)
         
         SearchView(appstate: test_state, search: model)

damus/Views/SetupView.swift

@@ -64,7 +64,7 @@ struct SetupView: View {
                         self.state = .create_account
                     }
                     
-                    Button(NSLocalizedString("Login", comment: "Button to log into an account.")) {
+                    Button("Login") {
                         self.state = .login
                     }
                     .padding([.top, .bottom], 20)

damus/Views/SideMenuView.swift

@@ -92,7 +92,7 @@ struct SideMenuView: View {
                     let profile_model = ProfileModel(pubkey: damus_state.pubkey, damus: damus_state)
 
                     NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
-                        Label(NSLocalizedString("Profile", comment: "Sidebar menu label for Profile view."), systemImage: "person")
+                        Label("Profile", systemImage: "person")
                             .font(.title2)
                             .foregroundColor(textColor())
                     }
@@ -102,7 +102,7 @@ struct SideMenuView: View {
                     
                     /*
                     NavigationLink(destination: EmptyView()) {
-                        Label(NSLocalizedString("Relays", comment: "Sidebar menu label for Relay servers view"), systemImage: "xserve")
+                        Label("Relays", systemImage: "xserve")
                             .font(.title2)
                             .foregroundColor(textColor())
                     }
@@ -113,7 +113,7 @@ struct SideMenuView: View {
                     
                     /*
                     NavigationLink(destination: EmptyView()) {
-                        Label(NSLocalizedString("Wallet", comment: "Sidebar menu label for Wallet view."), systemImage: "bolt")
+                        Label("Wallet", systemImage: "bolt")
                             .font(.title2)
                             .foregroundColor(textColor())
                     }
@@ -137,7 +137,7 @@ struct SideMenuView: View {
                         //ConfigView(state: damus_state)
                         confirm_logout = true
                     }, label: {
-                        Label(NSLocalizedString("Sign out", comment: "Sidebar menu label to sign out of the account."), systemImage: "pip.exit")
+                        Label("Sign out", systemImage: "pip.exit")
                             .font(.title3)
                             .foregroundColor(textColor())
                     })
@@ -153,14 +153,14 @@ struct SideMenuView: View {
                 isSidebarVisible.toggle()
             }
             .alert("Logout", isPresented: $confirm_logout) {
-                Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user.")) {
+                Button("Cancel") {
                     confirm_logout = false
                 }
-                Button(NSLocalizedString("Logout", comment: "Button for logging out the user.")) {
+                Button("Logout") {
                     notify(.logout, ())
                 }
             } message: {
-                Text("Make sure your nsec account key is saved before you logout or you will lose access to this account", comment: "Reminder message in alert to get customer to verify that their private security account key is saved saved before logging out.")
+                Text("Make sure your nsec account key is saved before you logout or you will lose access to this account")
             }
 
             Spacer()

damus/en-US.lproj/Localizable.stringsdict

@@ -2,78 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>collapsed_event_view_other_notes</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>··· %#@NOTES@ ···</string>
-		<key>NOTES</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>0 other notes</string>
-			<key>one</key>
-			<string>1 other note</string>
-			<key>other</key>
-			<string>%d other notes</string>
-		</dict>
-	</dict>
-	<key>followers_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@FOLLOWERS@</string>
-		<key>FOLLOWERS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Followers</string>
-			<key>one</key>
-			<string>Follower</string>
-			<key>other</key>
-			<string>Followers</string>
-		</dict>
-	</dict>
-	<key>reactions_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@REACTIONS@</string>
-		<key>REACTIONS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Reactions</string>
-			<key>one</key>
-			<string>Reaction</string>
-			<key>other</key>
-			<string>Reactions</string>
-		</dict>
-	</dict>
-	<key>relays_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@RELAYS@</string>
-		<key>RELAYS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Relays</string>
-			<key>one</key>
-			<string>Relay</string>
-			<key>other</key>
-			<string>Relays</string>
-		</dict>
-	</dict>
 	<key>replying_to_one_and_others</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -110,40 +38,22 @@
 			<string> &amp; %d others</string>
 		</dict>
 	</dict>
-	<key>reposts_count</key>
+	<key>collapsed_event_view_other_notes</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@REPOSTS@</string>
-		<key>REPOSTS</key>
+		<string>··· %#@NOTES@ ···</string>
+		<key>NOTES</key>
 		<dict>
 			<key>NSStringFormatSpecTypeKey</key>
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>Reposts</string>
+			<string>0 other notes</string>
 			<key>one</key>
-			<string>Repost</string>
+			<string>1 other note</string>
 			<key>other</key>
-			<string>Reposts</string>
-		</dict>
-	</dict>
-	<key>tips_count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@TIPS@</string>
-		<key>TIPS</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Tips</string>
-			<key>one</key>
-			<string>Tip</string>
-			<key>other</key>
-			<string>Tips</string>
+			<string>%d other notes</string>
 		</dict>
 	</dict>
 </dict>

damus/es-419.lproj/Localizable.stringsdict

@@ -49,11 +49,11 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>0 other notes</string>
+			<string>0 notes</string>
 			<key>one</key>
-			<string>1 other note</string>
+			<string>1 note</string>
 			<key>other</key>
-			<string>%d other notes</string>
+			<string>%d notes</string>
 		</dict>
 	</dict>
 </dict>