Update version

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 1.2.2
+
+* Fix phantom chat notifications
+* Fix zaps on mobile
+
 # 1.2.1
 
 * Add zaps to chat, threads, and events

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "social.flotilla"
         minSdk rootProject.ext.minSdkVersion
         targetSdk rootProject.ext.targetSdkVersion
-        versionCode 22
+        versionCode 23
-        versionName "1.2.1"
+        versionName "1.2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App.xcodeproj/project.pbxproj

@@ -354,14 +354,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -380,14 +380,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flotilla",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "private": true,
   "scripts": {
     "dev": "vite dev",

src/app/components/ChannelMessageMenuMobile.svelte

@@ -5,8 +5,10 @@
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import EmojiPicker from "@lib/components/EmojiPicker.svelte"
+  import ZapButton from "@app/components/ZapButton.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
+  import {ENABLE_ZAPS} from "@app/state"
   import {publishReaction} from "@app/commands"
   import {pushModal} from "@app/modal"
 
@@ -40,6 +42,12 @@
     <Icon size={4} icon="smile-circle" />
     Send Reaction
   </Button>
+  {#if ENABLE_ZAPS}
+    <ZapButton replaceState {url} {event} class="btn btn-secondary w-full">
+      <Icon size={4} icon="bolt" />
+      Send Zap
+    </ZapButton>
+  {/if}
   <Button class="btn btn-neutral w-full" onclick={sendReply}>
     <Icon size={4} icon="reply" />
     Send Reply

src/app/components/Zap.svelte

@@ -116,7 +116,7 @@
       <div>To <ProfileLink {pubkey} class="!text-primary" /></div>
     {/snippet}
   </ModalHeader>
-  <FieldInline>
+  <FieldInline class="!grid-cols-3">
     {#snippet label()}
       Emoji Reaction
     {/snippet}
@@ -128,7 +128,7 @@
       </div>
     {/snippet}
   </FieldInline>
-  <FieldInline>
+  <FieldInline class="!grid-cols-3">
     {#snippet label()}
       Amount
     {/snippet}

src/app/components/ZapButton.svelte

@@ -1,4 +1,6 @@
 <script lang="ts">
+  import type {Snippet} from "svelte"
+  import type {TrustedEvent} from "@welshman/util"
   import {deriveZapperForPubkey} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import Zap from "@app/components/Zap.svelte"
@@ -7,17 +9,25 @@
   import {pushModal} from "@app/modal"
   import {wallet} from "@app/state"
 
-  const {url, event, children, ...props} = $props()
+  type Props = {
+    url: string
+    event: TrustedEvent
+    children: Snippet
+    replaceState?: boolean
+    class?: string
+  }
+
+  const {url, event, children, replaceState, ...props}: Props = $props()
 
   const zapper = deriveZapperForPubkey(event.pubkey)
 
   const onClick = () => {
     if (!$zapper?.allowsNostr) {
-      pushModal(InfoZapperError, {url, pubkey: event.pubkey, eventId: event.id})
+      pushModal(InfoZapperError, {url, pubkey: event.pubkey, eventId: event.id}, {replaceState})
     } else if ($wallet) {
-      pushModal(Zap, {url, pubkey: event.pubkey, eventId: event.id})
+      pushModal(Zap, {url, pubkey: event.pubkey, eventId: event.id}, {replaceState})
     } else {
-      pushModal(WalletConnect)
+      pushModal(WalletConnect, {}, {replaceState})
     }
   }
 </script>

src/app/notifications.ts

@@ -1,6 +1,6 @@
 import {derived} from "svelte/store"
 import {synced, localStorageProvider, throttled} from "@welshman/store"
-import {pubkey} from "@welshman/app"
+import {pubkey, relaysByUrl} from "@welshman/app"
 import {prop, spec, identity, now, groupBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {EVENT_TIME, MESSAGE, THREAD, COMMENT, getTagValue} from "@welshman/util"
@@ -12,7 +12,7 @@ import {
   makeSpaceChatPath,
   makeRoomPath,
 } from "@app/routes"
-import {chats, getUrlsForEvent, userRoomsByUrl, repositoryStore} from "@app/state"
+import {chats, hasNip29, getUrlsForEvent, userRoomsByUrl, repositoryStore} from "@app/state"
 
 // Checked state
 
@@ -31,9 +31,12 @@ export const setChecked = (key: string) => checked.update(state => ({...state, [
 export const notifications = derived(
   throttled(
     1000,
-    derived([pubkey, checked, chats, userRoomsByUrl, repositoryStore, getUrlsForEvent], identity),
+    derived(
+      [pubkey, checked, chats, userRoomsByUrl, repositoryStore, getUrlsForEvent, relaysByUrl],
+      identity,
+    ),
   ),
-  ([$pubkey, $checked, $chats, $userRoomsByUrl, $repository, $getUrlsForEvent]) => {
+  ([$pubkey, $checked, $chats, $userRoomsByUrl, $repository, $getUrlsForEvent, $relaysByUrl]) => {
     const hasNotification = (path: string, latestEvent: TrustedEvent | undefined) => {
       if (!latestEvent || latestEvent.pubkey === $pubkey) {
         return false
@@ -95,11 +98,6 @@ export const notifications = derived(
         paths.add(calendarPath)
       }
 
-      if (hasNotification(messagesPath, messagesEvents[0])) {
-        paths.add(spacePath)
-        paths.add(messagesPath)
-      }
-
       const commentsByThreadId = groupBy(
         e => getTagValue("E", e.tags),
         threadEvents.filter(spec({kind: COMMENT})),
@@ -126,16 +124,24 @@ export const notifications = derived(
         }
       }
 
-      for (const room of rooms) {
+      if (hasNip29($relaysByUrl.get(url))) {
-        const roomPath = makeRoomPath(url, room)
+        for (const room of rooms) {
-        const latestEvent = allMessageEvents.find(
+          const roomPath = makeRoomPath(url, room)
-          e =>
+          const latestEvent = allMessageEvents.find(
-            $getUrlsForEvent(e.id).includes(url) && e.tags.find(t => t[0] === "h" && t[1] === room),
+            e =>
-        )
+              $getUrlsForEvent(e.id).includes(url) &&
+              e.tags.find(t => t[0] === "h" && t[1] === room),
+          )
 
-        if (hasNotification(roomPath, latestEvent)) {
+          if (hasNotification(roomPath, latestEvent)) {
+            paths.add(spacePath)
+            paths.add(roomPath)
+          }
+        }
+      } else {
+        if (hasNotification(messagesPath, messagesEvents[0])) {
           paths.add(spacePath)
-          paths.add(roomPath)
+          paths.add(messagesPath)
         }
       }
     }

src/routes/spaces/[relay]/goals/+page.svelte

@@ -81,7 +81,7 @@
     </div>
   {/snippet}
   {#snippet title()}
-    <strong>Fundraising Goals</strong>
+    <strong>Goals</strong>
   {/snippet}
   {#snippet action()}
     <div class="row-2">

zapstore.yaml

@@ -1,9 +1,13 @@
-flotilla:
+identifier: social.flotilla
-  android:
+name: Flotilla
-    identifier: social.flotilla
+tags: nostr nip29 community chat group
-    name: Flotilla
+changelog: CHANGELOG.md
-    description: Self-hosted community chat and threads built on the nostr protocol.
+homepage: https://flotilla.social
-    repository: https://github.com/coracle-social/flotilla
+description: Self-hosted community chat and threads built on the nostr protocol.
-    artifacts:
+repository: https://github.com/coracle-social/flotilla
-      - app-release-signed.apk
+blossom_servers:
+  - https://cdn.zapstore.dev
+  - https://hbr.coracle.social
+assets:
+  - app-release-signed.apk