Merge branch 'app' into app-publish

Freegle · Oct 18, 2023 · bfbf2ff · bfbf2ff
2 parents 7384617 + 3232002
commit bfbf2ff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/components/ModMemberSearchbox.vue b/components/ModMemberSearchbox.vue
@@ -49,13 +49,16 @@ export default {
         return this.value
       },
       set(val) {
-        this.$emit('input', val)
+        if (val) {
+          this.$emit('input', val)
+        }
       }
     }
   },
   methods: {
     search() {
       // Tick to allow value to appear.
+      console.log('Search', this.term)
       this.$nextTick(() => {
         const url =
           (this.spam

diff --git a/mobile/modtools/android/config.xml b/mobile/modtools/android/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="410" id="org.ilovefreegle.modtools" version="0.3.99" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="411" id="org.ilovefreegle.modtools" version="0.3.100" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>ModTools</name>
   <description>Tool to help moderators of Freegle groups</description>
   <author email="[email protected]" href="https://ilovefreegle.org">Chris Cant, Freegle Ltd</author>

diff --git a/mobile/modtools/android/package.json b/mobile/modtools/android/package.json
@@ -48,7 +48,7 @@
     "phonegap-plugin-multidex": "^1.0.0"
   },
   "devDependencies": {
-    "@havesource/cordova-plugin-push": "git+https://github.com/havesource/cordova-plugin-push.git",
+    "@havesource/cordova-plugin-push": "git+https://github.com/havesource/cordova-plugin-push.git#c3fb5b894afe17a05e21be135961f5831bafb1e0",
     "cordova-android": "^11.0.0",
     "cordova-clipboard": "1.3.0",
     "cordova-plugin-zoom-control-2": "^0.4.2"

diff --git a/mobile/modtools/ios/config.xml b/mobile/modtools/ios/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.ilovefreegle.modtools" ios-CFBundleVersion="404" version="0.3.99" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.ilovefreegle.modtools" ios-CFBundleVersion="405" version="0.3.100" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>ModTools</name>
     <description>Tool to help moderators of Freegle and similar groups</description>
     <author email="[email protected]" href="https://ilovefreegle.org">

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -8,7 +8,7 @@ const SENTRY_DSN = 'https://[email protected]
 const YAHOO_CLIENTID =
   'dj0yJmk9N245WTRqaDd2dnA4JmQ9WVdrOWIzTlZNMU01TjJjbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWRh'
 const MOBILE_VERSION = '2.0.120'
-const MODTOOLS_VERSION = '0.3.99'
+const MODTOOLS_VERSION = '0.3.100'
 
 require('dotenv').config()
 

diff --git a/pages/modtools/giftaid.vue b/pages/modtools/giftaid.vue
@@ -21,6 +21,9 @@
             </ExternalLink>)
             user ID&nbsp;<v-icon name="hashtag" class="text-muted mt-1" />{{ result.userid }}
             -&nbsp;
+            <span v-if="result.period === 'Declined'">
+              Gift Aid declined
+            </span>
             <span v-if="result.period === 'Since'">
               Gift Aid consent for all since {{ dateonly(result.timestamp) }}
             </span>