From a65269fc1e687ef2a5bd2c37d9eeecdfce0cda07 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 09:40:38 +0100
Subject: [PATCH 01/25] Fix SSR error.

---
 pages/engage.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/engage.vue b/pages/engage.vue
index ead389d8..caba2b79 100644
--- a/pages/engage.vue
+++ b/pages/engage.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="w-100 d-flex justify-content-center text-center">
-    <b-img lazy src="/loader.gif" alt="Loading" width="100px" />
+    <client-only>
+      <b-img lazy src="/loader.gif" alt="Loading" width="100px" />
+    </client-only>
   </div>
 </template>
 <script>

From a1050d72421f60725d4ea9df2110a203c6d83dd0 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 09:41:04 +0100
Subject: [PATCH 02/25] Clicking on anywhere in the chat header brings up
 profile modal, which it shouldn't.

---
 components/ChatHeader.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/ChatHeader.vue b/components/ChatHeader.vue
index d9e99359..d78fc70b 100644
--- a/components/ChatHeader.vue
+++ b/components/ChatHeader.vue
@@ -4,16 +4,17 @@
       v-if="chat && (chat.chattype !== 'User2User' || otheruser?.info)"
       class="outer position-relative"
     >
-      <div class="nameinfo pt-1 pb-1 pl-1" @click="showInfo">
+      <div class="nameinfo pt-1 pb-1 pl-1">
         <ProfileImage
           v-if="chat.icon"
           :image="chat.icon"
-          class="pr-1 profile"
+          class="pr-1 profile clickme"
           is-thumbnail
           size="xl"
           border
+          @click="showInfo"
         />
-        <div class="font-weight-bold black text--large name pl-1">
+        <div class="name font-weight-bold black text--large pl-1">
           {{ chat.name }}
         </div>
         <div

From 5266a516ca80167e845dfd6f4460ee2791c59a8f Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 09:45:17 +0100
Subject: [PATCH 03/25] Fetch message after replying so that reply count is
 updated.

---
 stores/chat.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/stores/chat.js b/stores/chat.js
index 8e540482..74088fbf 100644
--- a/stores/chat.js
+++ b/stores/chat.js
@@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
 import dayjs from 'dayjs'
 import api from '~/api'
 import { useAuthStore } from '~/stores/auth'
+import { useMessageStore } from '~/stores/message'
 
 export const useChatStore = defineStore({
   id: 'chat',
@@ -111,6 +112,11 @@ export const useChatStore = defineStore({
 
       // Get the latest messages back.
       this.fetchMessages(chatid)
+
+      if (refmsgid) {
+        // The message might have changed (e.g. number of replies).
+        useMessageStore().fetch(refmsgid, true)
+      }
     },
     async report(chatid, reason, comments, refchatid) {
       await api(this.config).chat.send({

From 5513045a3de320c12d862d971d68561074f41d96 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 09:45:30 +0100
Subject: [PATCH 04/25] If a message is no longer available, no point showing
 it was also promised.

---
 components/ChatMessageSummary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ChatMessageSummary.vue b/components/ChatMessageSummary.vue
index 0b117694..eedfbca2 100644
--- a/components/ChatMessageSummary.vue
+++ b/components/ChatMessageSummary.vue
@@ -45,7 +45,7 @@
           </span>
           <span v-else> They are no longer looking for this. </span>
         </notice-message>
-        <div v-if="message.promised">
+        <div v-else-if="message.promised">
           <div v-if="message.fromuser === myid">
             <notice-message>
               <div v-if="promisedToThem">

From e4f4bae17dfda848344198f04fb14fabffc9671d Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 10:04:14 +0100
Subject: [PATCH 05/25] Tweak style for Google sign in button slightly.

---
 components/LoginModal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/LoginModal.vue b/components/LoginModal.vue
index 53d8ecb1..1409f991 100644
--- a/components/LoginModal.vue
+++ b/components/LoginModal.vue
@@ -716,7 +716,7 @@ $color-yahoo: #6b0094;
 .social-button {
   display: flex;
   align-items: center;
-  min-width: 250px;
+  min-width: 315px;
   border-radius: 3px;
   padding: 0;
   margin: 0 auto 20px;
@@ -745,9 +745,9 @@ $color-yahoo: #6b0094;
 
 .social-button--google {
   border: 2px solid $color-google;
-  background-color: #dadce0;
+  background-color: $color-white;
   width: 100%;
-  min-height: 44px;
+  min-height: 47px;
 }
 
 :deep(.social-button--google > div) {

From e1f14d3e18266d8411923b32a04012f71ff18d1c Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 10:09:09 +0100
Subject: [PATCH 06/25] On mobile, show "Already a freegler?" link at top as
 might not be visible.

---
 components/LoginModal.vue | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/components/LoginModal.vue b/components/LoginModal.vue
index 1409f991..cba0b01d 100644
--- a/components/LoginModal.vue
+++ b/components/LoginModal.vue
@@ -16,6 +16,15 @@
     <template #title>
       <h2>Let's get freegling!</h2>
     </template>
+    <div v-if="signUp" class="d-flex justify-content-around mb-2">
+      <b-button
+        variant="link"
+        class="font-weight-bold pl-1 py-0 border-0 align-top d-block d-md-none"
+        @click="clickShowSignIn"
+      >
+        Already a freegler? Log in
+      </b-button>
+    </div>
     <p v-if="signUp" class="text-center">
       You'll get emails. Name, approximate location, and profile picture are
       public - you can hide your real name and picture from Settings. Logging in
@@ -175,22 +184,22 @@
             <p class="mb-0 text-center">
               <b-button
                 variant="link"
-                class="pl-1 pr-0 py-0 border-0 align-top"
+                class="ps-1 pe-0 py-0 border-0 align-top"
                 @click="clickShowSignUp"
               >
                 New freegler? Register
               </b-button>
             </p>
           </div>
-          <p v-if="signUp" class="text-center font-weight-bold">
+          <div v-if="signUp" class="d-flex justify-content-around">
             <b-button
               variant="link"
-              class="font-weight-bold pl-1 py-0 border-0 align-top"
+              class="font-weight-bold pl-1 py-0 border-0 align-top d-none d-md-block"
               @click="clickShowSignIn"
             >
               Already a freegler? Log in
             </b-button>
-          </p>
+          </div>
         </b-form>
       </div>
     </div>

From 7beaab3da9bd839f9d13e8515c212ab9a1cb5ea3 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 10:29:14 +0100
Subject: [PATCH 07/25] Clarify that you're about to remove a rating.

---
 components/UserRatings.vue | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/components/UserRatings.vue b/components/UserRatings.vue
index 00606b0e..8172b4fb 100644
--- a/components/UserRatings.vue
+++ b/components/UserRatings.vue
@@ -31,6 +31,20 @@
         <v-icon icon="thumbs-down" />&nbsp;{{ user.info.ratings.Down }}
       </b-button>
     </span>
+    <b-modal
+      v-model="showRemove"
+      title="Removing a rating"
+      ok-title="Remove rating"
+      @ok="removeRating"
+    >
+      <p>
+        You've already given this freegler a
+        <span v-if="user?.info?.ratings?.Mine === 'Up'"> thumbs up </span>
+        <span v-if="user?.info?.ratings?.Mine === 'Down'"> thumbs down </span>
+        rating. You can only rate each freegler once.
+      </p>
+      <p>You can remove your rating if you wish, or cancel.</p>
+    </b-modal>
     <b-modal
       v-model="showDown"
       title="Giving a Thumbs Down..."
@@ -133,6 +147,7 @@ export default {
   data() {
     return {
       showDown: false,
+      showRemove: false,
       reason: null,
       text: null,
       showError: false,
@@ -184,16 +199,20 @@ export default {
     async up() {
       this.showDown = false
       if (this.user.info.ratings.Mine === 'Up') {
-        await this.rate(null)
+        this.showRemove = true
       } else {
         await this.rate('Up')
       }
     },
-    async down() {
+    async removeRating() {
+      this.showRemove = false
+      await this.rate(null)
+    },
+    down() {
       this.showDown = false
 
       if (this.user.info.ratings.Mine === 'Down') {
-        await this.rate(null)
+        this.showRemove = true
       } else {
         this.showDown = true
       }

From ed6b76a83306ee97302ccc968d8d70dacd66cab3 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 11:18:22 +0100
Subject: [PATCH 08/25] Add assetlinks etc.

---
 public/.well-known/apple-app-site-association | 14 +++++++++++
 public/.well-known/assetlinks.json            | 24 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 public/.well-known/apple-app-site-association
 create mode 100644 public/.well-known/assetlinks.json

diff --git a/public/.well-known/apple-app-site-association b/public/.well-known/apple-app-site-association
new file mode 100644
index 00000000..59ed0b01
--- /dev/null
+++ b/public/.well-known/apple-app-site-association
@@ -0,0 +1,14 @@
+{
+  "applinks": {
+    "apps": [],
+    "details": [
+      {
+        "appID": "GMYU3K9D84.org.ilovefreegle.iphone",
+        "paths": [
+          "NOT \/api\/*",
+          "*"
+        ]
+      }
+    ]
+  }
+}
diff --git a/public/.well-known/assetlinks.json b/public/.well-known/assetlinks.json
new file mode 100644
index 00000000..b79b4103
--- /dev/null
+++ b/public/.well-known/assetlinks.json
@@ -0,0 +1,24 @@
+[
+  {
+    "relation": [ "delegate_permission/common.handle_all_urls" ],
+    "target": {
+      "namespace": "web",
+      "site": "https://ilovefreegle.org"
+    }
+  },
+  {
+    "relation": [ "delegate_permission/common.handle_all_urls" ],
+    "target": {
+      "namespace": "web",
+      "site": "https://www.ilovefreegle.org"
+    }
+  },
+  {
+    "relation": [ "delegate_permission/common.handle_all_urls" ],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "org.ilovefreegle.direct",
+      "sha256_cert_fingerprints": [ "4C:5F:AF:84:D1:6F:5B:0C:E3:55:2C:3C:B1:BC:15:E8:A4:DC:1B:65:93:EF:84:7D:BB:49:52:7B:9A:BC:0F:5E" ]
+    }
+  }
+]

From 94902547ee4246fc015e2e2520a3282982a7a1f5 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 17:31:22 +0100
Subject: [PATCH 09/25] Fix a case you try to post with an email which is not
 yet validated.

---
 components/EmailBelongsToSomeoneElse.vue |  4 ++--
 composables/useCompose.js                | 11 +++++++++--
 pages/find/whoami.vue                    | 21 +++++++++++----------
 pages/give/whoami.vue                    | 21 +++++++++++----------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/components/EmailBelongsToSomeoneElse.vue b/components/EmailBelongsToSomeoneElse.vue
index d657ca1d..f3fafd7f 100644
--- a/components/EmailBelongsToSomeoneElse.vue
+++ b/components/EmailBelongsToSomeoneElse.vue
@@ -1,9 +1,9 @@
 <template>
   <NoticeMessage>
     <p>
-      You are logged in
+      You are logged in with
       <!-- eslint-disable-next-line -->
-      <strong v-if="ours">with {{ ours }}</strong><strong v-else>as <v-icon icon="hashtag" class="text-muted fa-0-8x" />{{ myid }}</strong>, but <strong>{{ theirs }}</strong> belongs to another account.
+      <strong v-if="ours">{{ ours }}</strong><strong v-else>as <v-icon icon="hashtag" class="text-muted fa-0-8x" />{{ myid }}</strong>, but <strong>{{ theirs }}</strong> belongs to another account.
     </p>
     <p>
       If they are both yours, you can ask the volunteers to merge your accounts
diff --git a/composables/useCompose.js b/composables/useCompose.js
index 852a4152..a2ed65d5 100644
--- a/composables/useCompose.js
+++ b/composables/useCompose.js
@@ -101,6 +101,7 @@ export function setup(type) {
     submitting: ref(false),
     invalid: ref(false),
     notAllowed: ref(false),
+    unvalidatedEmail: ref(false),
     wentWrong: ref(false),
     initialPostcode: ref(initialPostcode),
     group,
@@ -233,6 +234,9 @@ export async function freegleIt(type, router) {
   const authStore = useAuthStore()
 
   this.submitting = true
+  this.unvalidatedEmail = false
+  this.wentWrong = false
+  this.notAllowed = false
 
   try {
     const results = await composeStore.submit({
@@ -279,8 +283,11 @@ export async function freegleIt(type, router) {
       })
     }
   } catch (e) {
-    console.log('Submit failed', e)
-    if (e.message.includes('Not allowed to post on this group')) {
+    console.log('Submit failed', e, e.response.data.ret)
+    if (e.message.includes('Unvalidated email')) {
+      console.log('unvalidated')
+      this.unvalidatedEmail = true
+    } else if (e.message.includes('Not allowed to post on this group')) {
       this.notAllowed = true
     } else {
       this.wentWrong = true
diff --git a/pages/find/whoami.vue b/pages/find/whoami.vue
index 9ecc4c78..20603162 100644
--- a/pages/find/whoami.vue
+++ b/pages/find/whoami.vue
@@ -74,23 +74,24 @@
         </div>
       </div>
       <div v-if="submitting" class="d-flex justify-content-around pt-2 mt-2">
+        <b-progress height="48px" class="mt-2 w-25" animated variant="success">
+          <b-progress-bar :value="progress" />
+        </b-progress>
+      </div>
+      <div v-else class="d-flex justify-content-around pt-2 mt-2">
         <NoticeMessage v-if="notAllowed" variant="danger">
           You are not allowed to post on this community.
         </NoticeMessage>
+        <NoticeMessage v-else-if="unvalidatedEmail" variant="danger">
+          You tried to post using an email address which has not yet been
+          validated. Please check your mailbox (including spam) and validate the
+          email, then try again.
+        </NoticeMessage>
         <NoticeMessage v-else-if="wentWrong" variant="danger">
           <!-- eslint-disable-next-line -->
-                Something went wrong.  Please try again, and if this keeps happening then contact
+          Something went wrong.  Please try again, and if this keeps happening then contact
           <SupportLink />.
         </NoticeMessage>
-        <b-progress
-          v-else
-          height="48px"
-          class="mt-2 w-25"
-          animated
-          variant="success"
-        >
-          <b-progress-bar :value="progress" />
-        </b-progress>
       </div>
     </div>
   </client-only>
diff --git a/pages/give/whoami.vue b/pages/give/whoami.vue
index 6fad727c..755b6696 100644
--- a/pages/give/whoami.vue
+++ b/pages/give/whoami.vue
@@ -74,23 +74,24 @@
         </div>
       </div>
       <div v-if="submitting" class="d-flex justify-content-around pt-2 mt-2">
+        <b-progress height="48px" class="mt-2 w-25" animated variant="success">
+          <b-progress-bar :value="progress" />
+        </b-progress>
+      </div>
+      <div v-else class="d-flex justify-content-around pt-2 mt-2">
         <NoticeMessage v-if="notAllowed" variant="danger">
           You are not allowed to post on this community.
         </NoticeMessage>
+        <NoticeMessage v-else-if="unvalidatedEmail" variant="danger">
+          You tried to post using an email address which has not yet been
+          validated. Please check your mailbox (including spam) and validate the
+          email, then try again.
+        </NoticeMessage>
         <NoticeMessage v-else-if="wentWrong" variant="danger">
           <!-- eslint-disable-next-line -->
-                Something went wrong.  Please try again, and if this keeps happening then contact
+          Something went wrong.  Please try again, and if this keeps happening then contact
           <SupportLink />.
         </NoticeMessage>
-        <b-progress
-          v-else
-          height="48px"
-          class="mt-2 w-25"
-          animated
-          variant="success"
-        >
-          <b-progress-bar :value="progress" />
-        </b-progress>
       </div>
     </div>
   </client-only>

From f7ef09a2ac25ed9641d552d237c6a00257b104cc Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 19:09:17 +0100
Subject: [PATCH 10/25] Can't view chat as user if the only message is held for
 review.

---
 api/ChatAPI.js               |  3 ++-
 components/ChatListEntry.vue |  5 ++++-
 pages/chats/[[id]].vue       |  2 +-
 stores/chat.js               | 13 ++++++++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/api/ChatAPI.js b/api/ChatAPI.js
index d0fa096c..245fa990 100644
--- a/api/ChatAPI.js
+++ b/api/ChatAPI.js
@@ -5,12 +5,13 @@ export default class ChatAPI extends BaseAPI {
     return this.$getv2(`/chat/${chatid}/message`)
   }
 
-  async listChats(since, search, logError) {
+  async listChats(since, search, logError, empty) {
     return await this.$getv2(
       '/chat',
       {
         since,
         search,
+        empty,
       },
       logError
     )
diff --git a/components/ChatListEntry.vue b/components/ChatListEntry.vue
index 8e6fe0a4..1c7db0a0 100644
--- a/components/ChatListEntry.vue
+++ b/components/ChatListEntry.vue
@@ -18,7 +18,10 @@
           <SupporterInfo v-if="chat.supporter" class="mr-3 mb-1 small" />
         </div>
         <div class="small text-muted" :title="dateFormatted">
-          {{ timeago(chat.lastdate) }}
+          <span v-if="chat.lastdate">
+            {{ timeago(chat.lastdate) }}
+          </span>
+          <span v-else> &nbsp; </span>
         </div>
         <div>
           <b-badge v-if="chat.replyexpected" variant="danger">
diff --git a/pages/chats/[[id]].vue b/pages/chats/[[id]].vue
index 9084abd9..9958a5e9 100644
--- a/pages/chats/[[id]].vue
+++ b/pages/chats/[[id]].vue
@@ -180,7 +180,7 @@ export default {
       const id = route.params.id ? parseInt(route.params.id) : 0
 
       // Fetch the list of chats.
-      await chatStore.fetchChats()
+      await chatStore.fetchChats(null, true, !!id)
 
       // Is this chat in the list?
       let chat = chatStore.byChatId(id)
diff --git a/stores/chat.js b/stores/chat.js
index 74088fbf..83a33210 100644
--- a/stores/chat.js
+++ b/stores/chat.js
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia'
 import dayjs from 'dayjs'
+import { useRoute } from 'vue-router'
 import api from '~/api'
 import { useAuthStore } from '~/stores/auth'
 import { useMessageStore } from '~/stores/message'
@@ -16,8 +17,9 @@ export const useChatStore = defineStore({
   actions: {
     init(config) {
       this.config = config
+      this.route = useRoute()
     },
-    async fetchChats(search, logError) {
+    async fetchChats(search, logError, empty) {
       let since = null
 
       if (this.searchSince) {
@@ -27,7 +29,8 @@ export const useChatStore = defineStore({
       const chats = await api(this.config).chat.listChats(
         since,
         search,
-        logError
+        logError,
+        empty
       )
       this.list = chats
 
@@ -197,8 +200,12 @@ export const useChatStore = defineStore({
 
       const myid = authStore.user?.id
       if (myid) {
+        // If we are looking at a specific chat then we want to make sure we don't lose it by polling to exclude
+        // empty chats.
+        const empty = this.route?.path?.startsWith('/chats/')
+
         // Don't want to log any errors to Sentry - they can happen due to timing windows.
-        await this.fetchChats(null, false)
+        await this.fetchChats(null, false, empty)
       }
 
       setTimeout(this.pollForChatUpdates, 30000)

From 8301663a6b52cd30922a4a012c281042ab6fb4da Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 19:12:02 +0100
Subject: [PATCH 11/25] Sentry error when viewing deleted message.

---
 components/OurMessage.vue | 2 +-
 pages/message/[id].vue    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/OurMessage.vue b/components/OurMessage.vue
index 0f2bb924..40585284 100644
--- a/components/OurMessage.vue
+++ b/components/OurMessage.vue
@@ -216,7 +216,7 @@ export default {
     },
   },
   async mounted() {
-    if (this.startExpanded) {
+    if (this.startExpanded && this.message) {
       this.view()
     }
 
diff --git a/pages/message/[id].vue b/pages/message/[id].vue
index e7d105dd..1d387edd 100644
--- a/pages/message/[id].vue
+++ b/pages/message/[id].vue
@@ -8,8 +8,9 @@
           <div
             v-if="
               failed ||
+              !message ||
               (message &&
-                ((message.outcomes && message.outcomes.length > 0) ||
+                (message.outcomes?.length > 0 ||
                   message.deleted ||
                   (message.groups &&
                     message.groups.length &&

From 8c0c1f4bc3833cd7c9f059a94181ebb4f51cbd8a Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 19:21:43 +0100
Subject: [PATCH 12/25] Show when message taken in another couple of places in
 chat.

---
 components/ChatMessagePromised.vue | 10 ++++++++++
 components/ChatMessageSummary.vue  |  4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/ChatMessagePromised.vue b/components/ChatMessagePromised.vue
index 290592a6..17d1cde3 100644
--- a/components/ChatMessagePromised.vue
+++ b/components/ChatMessagePromised.vue
@@ -43,6 +43,16 @@
             </h4>
           </nuxt-link>
           <AddToCalendar v-if="tryst" :ics="tryst.ics" class="mr-2" />
+          <notice-message
+            v-if="refmsg.outcomes?.length || refmsg.deleted"
+            class="mt-2 mb-2"
+          >
+            <v-icon icon="info-circle" />
+            <span v-if="refmsg.type === 'Offer'">
+              This is no longer available.
+            </span>
+            <span v-else> They are no longer looking for this. </span>
+          </notice-message>
         </b-card-title>
         <b-card-text>
           <div :class="emessage ? 'media-body chatMessage' : 'media-body'">
diff --git a/components/ChatMessageSummary.vue b/components/ChatMessageSummary.vue
index eedfbca2..1bba005e 100644
--- a/components/ChatMessageSummary.vue
+++ b/components/ChatMessageSummary.vue
@@ -34,9 +34,7 @@
           </div>
         </div>
         <notice-message
-          v-if="
-            (message.outcomes && message.outcomes.length) || message.deleted
-          "
+          v-if="message.outcomes?.length || message.deleted"
           class="mt-2 mb-2"
         >
           <v-icon icon="info-circle" />

From bc7e0bc7638d3ef9a7c2eaf1d26bd5d13be5382d Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Thu, 22 Jun 2023 23:22:54 +0100
Subject: [PATCH 13/25] More handling of module import errors.

---
 error.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/error.vue b/error.vue
index 50375ec1..35c1e36e 100644
--- a/error.vue
+++ b/error.vue
@@ -54,6 +54,7 @@
   </div>
 </template>
 <script setup>
+import * as Sentry from '@sentry/browser'
 import SupportLink from './components/SupportLink'
 import ExternalLink from '~/components/ExternalLink'
 import { useError } from '#imports'
@@ -61,14 +62,17 @@ import { useError } from '#imports'
 const error = useError()
 const maintenance = error?.value?.message === 'Maintenance error'
 
-// Check if error contains "Failed to fetch"
-const importError = error?.value?.message.includes(
-  'Failed to fetch dynamically imported module'
-)
+const importError =
+  error?.value?.message.includes(
+    'Failed to fetch dynamically imported module'
+  ) || error?.value?.message.includes('Importing a module script failed')
 
 if (importError) {
   // This can happen when a page load is cancelled by the user, sometimes.  Reload.
-  console.log('Import of dynamic module error - reload')
+  console.log('Import of module error - reload')
+  Sentry.captureMessage(
+    'Import of module error - reload ' + error?.value?.message
+  )
   window.location.reload()
 }
 </script>

From ed397841459ba15af6869707df695178ee61bba4 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sat, 24 Jun 2023 14:42:23 +0100
Subject: [PATCH 14/25] Remove debugging Sentry log

---
 error.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/error.vue b/error.vue
index 35c1e36e..fe460ffa 100644
--- a/error.vue
+++ b/error.vue
@@ -54,8 +54,7 @@
   </div>
 </template>
 <script setup>
-import * as Sentry from '@sentry/browser'
-import SupportLink from './components/SupportLink'
+import SupportLink from '~/components/SupportLink'
 import ExternalLink from '~/components/ExternalLink'
 import { useError } from '#imports'
 
@@ -70,9 +69,6 @@ const importError =
 if (importError) {
   // This can happen when a page load is cancelled by the user, sometimes.  Reload.
   console.log('Import of module error - reload')
-  Sentry.captureMessage(
-    'Import of module error - reload ' + error?.value?.message
-  )
   window.location.reload()
 }
 </script>

From 74d673d731250c342f10be6d6d2ea076046d33e0 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sat, 24 Jun 2023 15:06:49 +0100
Subject: [PATCH 15/25] Improve message reply layout a bit and add message
 about joining.

---
 components/MessageExpanded.vue     |  1 -
 components/MessageReplySection.vue | 50 ++++++++++++++++++++++++++----
 components/SettingsPhone.vue       | 15 +++++++--
 pages/settings/index.vue           |  2 +-
 4 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/components/MessageExpanded.vue b/components/MessageExpanded.vue
index cc7320a5..506412e3 100644
--- a/components/MessageExpanded.vue
+++ b/components/MessageExpanded.vue
@@ -41,7 +41,6 @@
           class="messagemap"
           :height="150"
         />
-        <div v-else style="height: 150px" />
       </div>
       <MessageHistoryExpanded :id="id" class="d-block d-md-none mt-2 mt-md-0" />
       <MessageReplySection
diff --git a/components/MessageReplySection.vue b/components/MessageReplySection.vue
index 56fe96ef..6ce35d6a 100644
--- a/components/MessageReplySection.vue
+++ b/components/MessageReplySection.vue
@@ -37,18 +37,26 @@
           class="flex-grow-1"
         />
       </b-form-group>
+      <p v-if="me && !alreadyAMember" class="text--small text-muted">
+        You're not yet a member of this community; we'll join you. Change emails
+        or leave communities from
+        <em>Settings</em>.
+      </p>
       <div v-if="!me">
         <NewFreegler />
       </div>
       <div v-else>
         <div class="d-flex justify-content-between flex-wrap">
           <b-form-group
-            class="flex-grow-1"
+            class="flex-grow-1 nobot"
             label="Your postcode:"
             :label-for="'replytomessage-' + message.id"
             description=""
           >
             <PostCode @selected="savePostcode" />
+            <div class="text-muted text--small mt-1">
+              <v-icon icon="lock" /> Other freeglers won't see this.
+            </div>
           </b-form-group>
           <SettingsPhone
             v-if="me"
@@ -59,11 +67,21 @@
             input-class="phone"
           />
         </div>
-        <p class="text--small text-muted">
-          We ask for your postcode so that we know how far away you are - the
-          closer the better. Your mobile is optional - we can notify you by text
-          (SMS) so you don't miss replies. We won't show it to the other
-          freegler.
+        <p class="text-muted">
+          <b-button
+            v-if="!showWhyAsk"
+            size="sm"
+            variant="link"
+            @click="showWhyAsk = true"
+          >
+            Why do we ask for this?
+          </b-button>
+          <span v-if="showWhyAsk">
+            We ask for your postcode so that we know how far away you are - the
+            closer the better. Your mobile is optional - we can notify you by
+            text (SMS) so you don't miss replies. We won't show either of these
+            to the other freegler, but we will show an approximate distance.
+          </span>
         </p>
       </div>
     </div>
@@ -174,6 +192,7 @@ export default {
       emailValid: false,
       showNewUser: false,
       newUserPassword: null,
+      showWhyAsk: false,
     }
   },
   computed: {
@@ -194,6 +213,21 @@ export default {
     fromme() {
       return this.message?.fromuser === this.myid
     },
+    alreadyAMember() {
+      let found = false
+
+      for (const messageGroup of this.message?.groups) {
+        Object.keys(this.myGroups).forEach((key) => {
+          const group = this.myGroups[key]
+
+          if (messageGroup.groupid === group.id) {
+            found = true
+          }
+        })
+      }
+
+      return found
+    },
     ...mapWritableState(useAuthStore, ['loggedInEver', 'forceLogin']),
   },
   watch: {
@@ -326,4 +360,8 @@ export default {
 :deep(.phone) {
   border: 2px solid $color-gray--normal !important;
 }
+
+.nobot {
+  margin-bottom: 0 !important;
+}
 </style>
diff --git a/components/SettingsPhone.vue b/components/SettingsPhone.vue
index 4d053531..c4cd2a4a 100644
--- a/components/SettingsPhone.vue
+++ b/components/SettingsPhone.vue
@@ -1,7 +1,11 @@
 <template>
   <div>
     <div class="d-flex flex-wrap align-content-center">
-      <b-form-group class="mr-2" :label="label" :description="description">
+      <b-form-group
+        class="nobot mr-2"
+        :label="label"
+        :description="description"
+      >
         <b-input-group>
           <b-form-input
             v-if="me"
@@ -28,9 +32,9 @@
             </b-button>
           </b-input-group-append>
         </b-input-group>
-        <p class="text-muted mt-1">
+        <div class="text-muted mt-1 mb-1 text--small">
           <v-icon icon="lock" /> Other freeglers won't see this.
-        </p>
+        </div>
       </b-form-group>
       <b-button
         v-if="!hideRemove && me?.phone"
@@ -142,3 +146,8 @@ export default {
   },
 }
 </script>
+<style scoped lang="scss">
+.nobot {
+  margin-bottom: 0 !important;
+}
+</style>
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index 8a250f82..7117cfe0 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -525,7 +525,7 @@
                 We can send SMS alerts to your phone when you have a new message
                 on Freegle or a handover soon.
               </p>
-              <SettingsPhone />
+              <SettingsPhone class="mb-3" />
               <div v-if="me.phone">
                 <NoticeMessage
                   v-if="

From e65a43c194211a356fc4fabcb6f61216c0d16806 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sat, 24 Jun 2023 18:46:11 +0100
Subject: [PATCH 16/25] Possible Sentry fix for deleted message.

---
 stores/message.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/stores/message.js b/stores/message.js
index ba328e85..0b518bda 100644
--- a/stores/message.js
+++ b/stores/message.js
@@ -34,7 +34,17 @@ export const useMessageStore = defineStore({
       if (force || !this.list[id] || expired) {
         if (this.fetching[id]) {
           // Already fetching
-          await this.fetching[id]
+          try {
+            await this.fetching[id]
+          } catch (e) {
+            console.log('Failed to fetch message', e)
+            if (e instanceof APIError && e.response.status === 404) {
+              // This can validly happen if a message is deleted under our feet.
+              console.log('Ignore 404 error')
+            } else {
+              throw e
+            }
+          }
         } else {
           this.fetchingCount++
           this.fetching[id] = api(this.config).message.fetch(id, false)

From 65f2ee32af03dc49b6deb1d9d857c12c13785afb Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sun, 25 Jun 2023 18:44:19 +0100
Subject: [PATCH 17/25] Only need to tell server about related users when there
 are some.

---
 stores/auth.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/stores/auth.js b/stores/auth.js
index 439bd482..93f811f7 100644
--- a/stores/auth.js
+++ b/stores/auth.js
@@ -118,8 +118,10 @@ export const useAuthStore = defineStore({
 
           this.userlist.unshift(id)
 
-          // Logged in as multiple users.  Let the server know.
-          await this.$api.session.related(this.userlist)
+          if (this.userlist.length > 1) {
+            // Logged in as multiple users.  Let the server know.
+            await this.$api.session.related(this.userlist)
+          }
         }
       }
     },

From d8d46afb6037b44577ba11552ecfd64f8661185d Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sun, 25 Jun 2023 19:39:23 +0100
Subject: [PATCH 18/25] Remove console API logging.

---
 api/BaseAPI.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/BaseAPI.js b/api/BaseAPI.js
index 2d3a6ec3..4981d081 100644
--- a/api/BaseAPI.js
+++ b/api/BaseAPI.js
@@ -3,7 +3,7 @@ import fetchRetry from 'fetch-retry'
 import { useAuthStore } from '~/stores/auth'
 import { useMiscStore } from '~/stores/misc'
 
-let timer = 0
+// let timer = 0
 
 // We add fetch retrying.
 // Note that $fetch and useFetch cause problems on Node v18, so we don't use them.
@@ -266,11 +266,11 @@ export default class BaseAPI {
   }
 
   async $requestv2(method, path, config, logError = true, body = null) {
-    timer++
-    const timerLabel = path + ' api-' + timer
+    // timer++
+    // const timerLabel = path + ' api-' + timer
 
-    console.log('Start ', timerLabel)
-    console.time(timerLabel)
+    // console.log('Start ', timerLabel)
+    // console.time(timerLabel)
 
     let status = null
     let data = null
@@ -400,7 +400,7 @@ export default class BaseAPI {
       )
     }
 
-    console.timeEnd(timerLabel)
+    // console.timeEnd(timerLabel)
 
     return data
   }

From 0d2a753e1056550d8fb5d944000dc304160619e8 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sun, 25 Jun 2023 19:58:51 +0100
Subject: [PATCH 19/25] Job text has silly character.

---
 components/JobOne.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/JobOne.vue b/components/JobOne.vue
index c5d818a1..997c2b45 100644
--- a/components/JobOne.vue
+++ b/components/JobOne.vue
@@ -120,7 +120,7 @@ export default {
       return val
         .replace(/\\n/g, '\n')
         .replace(/<br>/g, '\n')
-        .replace('£', '£')
+        .replace(/£/g, '£')
         .trim()
         .normalize('NFD')
         .replace(/[\u0300-\u036F]/g, '')

From a91ebeb5cfae0225a717334f89b9dda8a8ece36b Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sun, 25 Jun 2023 19:59:05 +0100
Subject: [PATCH 20/25] New user email frequency not showing.

---
 components/SettingsGroup.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/SettingsGroup.vue b/components/SettingsGroup.vue
index 3622864d..553930c5 100644
--- a/components/SettingsGroup.vue
+++ b/components/SettingsGroup.vue
@@ -4,7 +4,7 @@
       <b-col cols="12" sm="6">
         <b-form-group :label="label">
           <b-form-select
-            v-model="emailfrequency"
+            v-model="emailfreq"
             :class="highlightEmailFrequencyIfOn"
           >
             <option value="-1">Immediately</option>
@@ -64,6 +64,11 @@ export default {
     OurToggle,
   },
   props: {
+    emailfrequency: {
+      type: Number,
+      required: false,
+      default: null,
+    },
     groupid: {
       type: Number,
       required: false,
@@ -103,13 +108,13 @@ export default {
     }
   },
   computed: {
-    emailfrequency: {
+    emailfreq: {
       get() {
         if (this.membership) {
           return this.membership.emailfrequency.toString()
         }
 
-        return null
+        return this.emailfrequency
       },
       async set(newval) {
         await this.changeValue('emailfrequency', newval)

From b3c421e668e1450e70c6314b0edbf050e3639ee0 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Sun, 25 Jun 2023 20:08:38 +0100
Subject: [PATCH 21/25] Post map too readily switches to showing all posts.

---
 components/PostMap.vue | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/components/PostMap.vue b/components/PostMap.vue
index 3a4deeda..39e93109 100644
--- a/components/PostMap.vue
+++ b/components/PostMap.vue
@@ -10,21 +10,6 @@
         class="w-100 position-relative mb-1"
       >
         <div class="mapbox">
-          <!--          <vue3-draggable-resizable-->
-          <!--            :class="{-->
-          <!--              'd-none': mapHidden,-->
-          <!--            }"-->
-          <!--            :h="mapHeight"-->
-          <!--            w="auto"-->
-          <!--            :handles="['bl', 'br']"-->
-          <!--            :parent="false"-->
-          <!--            :draggable="false"-->
-          <!--            resizeable-->
-          <!--            resize-axis="y"-->
-          <!--            active-->
-          <!--            prevent-deactivation-->
-          <!--            @resizestop="onResize"-->
-          <!--          >-->
           <l-map
             ref="map"
             v-model:bounds="bounds"
@@ -38,6 +23,7 @@
             @update:bounds="idle"
             @zoomend="idle"
             @moveend="idle"
+            @dragend="dragEnd"
           >
             <div
               class="leaflet-top leaflet-right d-flex flex-column justify-content-center"
@@ -99,7 +85,6 @@
               />
             </div>
           </l-map>
-          <!--          </vue3-draggable-resizable>-->
         </div>
       </div>
     </div>
@@ -394,10 +379,6 @@ export default {
   },
   watch: {
     bounds(newVal, oldVal) {
-      if (oldVal !== null) {
-        this.moved = true
-      }
-
       this.getMessages()
     },
     zoom(newVal) {
@@ -563,12 +544,6 @@ export default {
           const bounds = this.mapObject.getBounds().toBBoxString()
 
           if (bounds !== this.lastBounds) {
-            if (this.lastBounds !== null) {
-              // The map has now moved from the initial position.
-              this.$emit('update:moved', true)
-              this.moved = true
-            }
-
             this.lastBounds = bounds
 
             if (this.showMessages) {
@@ -765,6 +740,11 @@ export default {
         [bounds.getNorthEast().lat, bounds.getNorthEast().lng],
       ]
     },
+    dragEnd(e) {
+      this.moved = true
+      this.$emit('update:moved', true)
+      this.idle()
+    },
   },
 }
 </script>

From 9fb2aeafae86dc547a20d023a0e797e00e1fb884 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 26 Jun 2023 10:25:17 +0100
Subject: [PATCH 22/25] Make Mark Read appear zippier.

---
 stores/chat.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stores/chat.js b/stores/chat.js
index 83a33210..398474b0 100644
--- a/stores/chat.js
+++ b/stores/chat.js
@@ -74,8 +74,10 @@ export const useChatStore = defineStore({
       if (chat?.unseen > 0) {
         // Cheat and set the value rather than fetch from the search.  This speeds things up a lot, and when we
         // use this we expect to then call fetchChats after we've finished.
-        api(this.config).chat.markRead(id, chat.lastmsg, false)
+        //
+        // Set it in the store first so that the UI updates immediately.
         this.listByChatId[id].unseen = 0
+        api(this.config).chat.markRead(id, chat.lastmsg, false)
       }
     },
     async markUnread(chatid, prevmsgid) {

From 89915752b8e83d098cd361b84835bb83ff15cbf6 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 26 Jun 2023 10:32:11 +0100
Subject: [PATCH 23/25] Tweak display of chat header on mobile.

---
 components/ChatHeader.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/ChatHeader.vue b/components/ChatHeader.vue
index d78fc70b..23ed7cde 100644
--- a/components/ChatHeader.vue
+++ b/components/ChatHeader.vue
@@ -46,6 +46,7 @@
               <strong class="ml-1">{{ replytime }}</strong
               >.
             </div>
+            <br class="d-block d-md-none" />
             <div v-if="milesaway" class="d-inline d-md-block">
               About <strong>{{ milesstring }}</strong
               >.
@@ -388,13 +389,16 @@ export default {
   }
 
   .userinfo {
-    grid-column: 2 / 4;
+    grid-column: 1 / 4;
     grid-row: 2 / 3;
     color: $colour-info-fg;
+    padding-top: 0.5rem;
 
     @include media-breakpoint-up(md) {
       grid-row: 1 / 2;
+      grid-column: 2 / 4;
       padding-top: 2rem;
+      padding-left: 0.25rem;
     }
   }
 }

From 351021e33c39c89e0edf859c5aab466425d23b73 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 26 Jun 2023 16:56:11 +0100
Subject: [PATCH 24/25] Move button on message popup

---
 components/MessageModal.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/MessageModal.vue b/components/MessageModal.vue
index 2ff4abff..86967671 100644
--- a/components/MessageModal.vue
+++ b/components/MessageModal.vue
@@ -17,6 +17,16 @@
             />
             <hr />
             <div class="d-flex justify-content-between p-2 mb-2 p-md-0 mb-md-0">
+              <div class="w-50 pl-2">
+                <b-button
+                  size="lg"
+                  variant="primary"
+                  block
+                  @click="showImages = false"
+                >
+                  View description
+                </b-button>
+              </div>
               <div class="pr-2 w-50">
                 <b-button
                   variant="secondary"
@@ -28,15 +38,6 @@
                   Close
                 </b-button>
               </div>
-              <b-button
-                size="lg"
-                variant="primary"
-                block
-                class="w-50 pl-2"
-                @click="showImages = false"
-              >
-                View description
-              </b-button>
             </div>
           </div>
           <MessageExpanded

From 967d0f7ea148971ece3ff5ce206b57fc21ed4c71 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 26 Jun 2023 16:56:29 +0100
Subject: [PATCH 25/25] When searching, message about not finding anything may
 be below the fold.

---
 components/AdaptiveMap.vue             | 33 ++++++++++++++++----------
 components/GroupHeader.vue             | 16 +++++++++++--
 components/IsochronePostMapAndList.vue | 12 ++++++++--
 components/MessageList.vue             | 17 +++++--------
 4 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/components/AdaptiveMap.vue b/components/AdaptiveMap.vue
index 3a0194c6..0c286234 100644
--- a/components/AdaptiveMap.vue
+++ b/components/AdaptiveMap.vue
@@ -132,24 +132,30 @@
             </b-input-group>
           </div>
         </div>
-        <div
-          v-if="
+        <NoticeMessage v-if="noneFound">
+          <p>
+            Sorry, we didn't find anything. Things come and go quickly, though,
+            so you could try later. Or you could:
+          </p>
+          <GiveAsk class="bg-info" />
+        </NoticeMessage>
+        <NoticeMessage
+          v-else-if="
             mapVisible && !postsVisible && messagesOnMap && messagesOnMap.length
           "
-          class="d-flex justify-content-center mt-1 mb-1"
+          variant="info"
         >
-          <NoticeMessage variant="info">
-            <v-icon icon="angle-double-down" class="pulsate" />
-            Scroll down to see
-            <span v-if="searchOn"
-              >results for "<strong>{{ searchOn }}</strong
-              >"</span
-            ><span v-else>the posts</span>.
-            <v-icon icon="angle-double-down" class="pulsate" />
-          </NoticeMessage>
-        </div>
+          <v-icon icon="angle-double-down" class="pulsate" />
+          Scroll down to see
+          <span v-if="searchOn"
+            >results for "<strong>{{ searchOn }}</strong
+            >"</span
+          ><span v-else>the posts</span>.
+          <v-icon icon="angle-double-down" class="pulsate" />
+        </NoticeMessage>
         <MessageList
           v-model:visible="postsVisible"
+          v-model:none="noneFound"
           :selected-group="selectedGroup"
           :selected-type="selectedType"
           :messages-for-list="filteredMessages"
@@ -390,6 +396,7 @@ export default {
       ],
       selectedGroup: 0,
       context: null,
+      none: false,
     }
   },
   computed: {
diff --git a/components/GroupHeader.vue b/components/GroupHeader.vue
index 2b00ddc0..95f8a890 100644
--- a/components/GroupHeader.vue
+++ b/components/GroupHeader.vue
@@ -60,13 +60,13 @@
       </div>
     </div>
     <div class="group-description">
-      <p v-if="!group.description">
+      <p v-if="!description">
         Give and get stuff for free with {{ group.namedisplay }}. Offer things
         you don't need, and ask for things you'd like. Don't just recycle -
         reuse with Freegle!
       </p>
       <!-- eslint-disable-next-line -->
-      <span v-if="group.description" v-html="group.description"/>
+      <span v-else="description" v-html="description"/>
     </div>
     <div v-if="showGiveFind" class="d-flex justify-content-between flex-wrap">
       <b-button to="/give" class="mt-1" size="lg" block variant="primary">
@@ -188,6 +188,18 @@ export default {
     amAMember() {
       return this.authStore?.member(this.group?.id)
     },
+    description() {
+      let description = this.group?.description
+
+      if (description) {
+        // Remove some whitespace which appears in some group descriptions.
+        description = description.replace(/<p><br><\/p>/g, '')
+        description = description.replace(/<p><\/p>/g, '')
+      }
+
+      console.log('Return', description)
+      return description
+    },
   },
   methods: {
     async leave() {
diff --git a/components/IsochronePostMapAndList.vue b/components/IsochronePostMapAndList.vue
index 13f42777..b11385e0 100644
--- a/components/IsochronePostMapAndList.vue
+++ b/components/IsochronePostMapAndList.vue
@@ -126,8 +126,15 @@
             </b-input-group>
           </div>
         </div>
+        <NoticeMessage v-if="noneFound">
+          <p>
+            Sorry, we didn't find anything. Things come and go quickly, though,
+            so you could try later. Or you could:
+          </p>
+          <GiveAsk class="bg-info" />
+        </NoticeMessage>
         <div
-          v-if="!postsVisible && messagesOnMap?.length"
+          v-else-if="!postsVisible && messagesOnMap?.length"
           class="d-flex justify-content-center mt-1 mb-1"
         >
           <NoticeMessage variant="info">
@@ -140,11 +147,11 @@
             <v-icon icon="angle-double-down" class="pulsate" />
           </NoticeMessage>
         </div>
-
         <h2 class="visually-hidden">List of wanteds and offers</h2>
         <MessageList
           v-if="updatedMessagesOnMap || messagesOnMap.length"
           v-model:visible="postsVisible"
+          v-model:none="noneFound"
           :selected-group="selectedGroup"
           :selected-type="selectedType"
           :messages-for-list="filteredMessages"
@@ -321,6 +328,7 @@ export default {
       ],
       selectedGroup: null,
       context: null,
+      noneFound: false,
     }
   },
   computed: {
diff --git a/components/MessageList.vue b/components/MessageList.vue
index b7c16e1d..59d0e112 100644
--- a/components/MessageList.vue
+++ b/components/MessageList.vue
@@ -48,13 +48,6 @@
           </div>
         </template>
       </infinite-loading>
-      <NoticeMessage v-if="!loading && !messagesForList?.length">
-        <p>
-          Sorry, we didn't find anything. Things come and go quickly, though, so
-          you could try later. Or you could:
-        </p>
-        <GiveAsk class="bg-info" />
-      </NoticeMessage>
     </div>
     <template #fallback>
       <div class="text-center">
@@ -73,11 +66,9 @@ import { useIsochroneStore } from '../stores/isochrone'
 import { ref } from '#imports'
 import InfiniteLoading from '~/components/InfiniteLoading'
 import { useMiscStore } from '~/stores/misc'
-const NoticeMessage = () => import('./NoticeMessage')
 const OurMessage = () => import('~/components/OurMessage.vue')
 const GroupHeader = () => import('~/components/GroupHeader.vue')
 const JobsTopBar = () => import('~/components/JobsTopBar')
-const GiveAsk = () => import('~/components/GiveAsk.vue')
 
 const MIN_TO_SHOW = 10
 
@@ -85,10 +76,8 @@ export default {
   components: {
     OurMessage,
     GroupHeader,
-    NoticeMessage,
     InfiniteLoading,
     JobsTopBar,
-    GiveAsk,
   },
   props: {
     messagesForList: {
@@ -309,6 +298,9 @@ export default {
 
       return ret
     },
+    noneFound() {
+      return !this.loading && !this.messagesForList?.length
+    },
   },
   watch: {
     toShow: {
@@ -343,6 +335,9 @@ export default {
       // visible.
       this.scrollToMessage = null
     },
+    noneFound(newVal) {
+      this.$emit('update:none', newVal)
+    },
   },
   methods: {
     async loadMore($state) {