From 46c0c6b08e81b215bbdaca8f03f6f6b529cec419 Mon Sep 17 00:00:00 2001
From: Alex Risch <alex@xmtp.com>
Date: Tue, 20 Aug 2024 20:35:15 -0600
Subject: [PATCH] fix consent, bump xmtp

---
 ios/Podfile                     |  4 ++--
 ios/Podfile.lock                | 20 ++++++++++----------
 package.json                    |  2 +-
 queries/useGroupConsentQuery.ts |  3 ++-
 yarn.lock                       |  8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ios/Podfile b/ios/Podfile
index b71edb743..94c92d2a9 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -17,8 +17,8 @@ install! 'cocoapods',
 
 
 # Version must match version from XMTP Podspec (matching @xmtp/react-native-sdk from package.json)
-# https://github.com/xmtp/xmtp-react-native/blob/v2.4.5/ios/XMTPReactNative.podspec#L29
-$xmtpVersion = '0.14.6'
+# https://github.com/xmtp/xmtp-react-native/blob/v2.4.6/ios/XMTPReactNative.podspec#L29
+$xmtpVersion = '0.14.7'
 
 # Pinning MMKV to 1.3.3 that has included that fix https://github.com/Tencent/MMKV/pull/1222#issuecomment-1905164314
 $mmkvVersion = '1.3.3'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 84ab03643..35bd86ab3 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -387,7 +387,7 @@ PODS:
   - libwebp/sharpyuv (1.3.2)
   - libwebp/webp (1.3.2):
     - libwebp/sharpyuv
-  - LibXMTP (0.5.7-beta3)
+  - LibXMTP (0.5.7-beta4)
   - Logging (1.0.0)
   - MessagePacker (0.4.7)
   - MMKV (1.3.3):
@@ -1792,16 +1792,16 @@ PODS:
     - GenericJSON (~> 2.0)
     - Logging (~> 1.0.0)
     - secp256k1.swift (~> 0.1)
-  - XMTP (0.14.6):
+  - XMTP (0.14.7):
     - Connect-Swift (= 0.12.0)
     - GzipSwift
-    - LibXMTP (= 0.5.7-beta3)
+    - LibXMTP (= 0.5.7-beta4)
     - web3.swift
-  - XMTPReactNative (2.4.5):
+  - XMTPReactNative (2.4.6):
     - ExpoModulesCore
     - MessagePacker
     - secp256k1.swift
-    - XMTP (= 0.14.6)
+    - XMTP (= 0.14.7)
   - Yoga (0.0.0)
 
 DEPENDENCIES:
@@ -1937,7 +1937,7 @@ DEPENDENCIES:
   - Sentry/HybridSDK (= 8.29.1)
   - SQLite.swift
   - UMAppLoader (from `../node_modules/unimodules-app-loader/ios`)
-  - XMTP (= 0.14.6)
+  - XMTP (= 0.14.7)
   - "XMTPReactNative (from `../node_modules/@xmtp/react-native-sdk/ios`)"
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
@@ -2286,7 +2286,7 @@ SPEC CHECKSUMS:
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
   libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  LibXMTP: b6b930f9d2394a560d7f83b02be6ccd789472422
+  LibXMTP: 794ebc442e5d66ca808b87142bb91bc6c7f4661f
   Logging: 9ef4ecb546ad3169398d5a723bc9bea1c46bef26
   MessagePacker: ab2fe250e86ea7aedd1a9ee47a37083edd41fd02
   MMKV: f902fb6719da13c2ab0965233d8963a59416f911
@@ -2385,10 +2385,10 @@ SPEC CHECKSUMS:
   SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
   UMAppLoader: f17a5ee8e85b536ace0fc254b447a37ed198d57e
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
-  XMTP: 0f36b44b3922a5933e3487bf09671655e05dcb8d
-  XMTPReactNative: b387e226544a3307aee3159da8d665eddc065af4
+  XMTP: 65c9c75509211f99a251cecd0d90a6552c523269
+  XMTPReactNative: 7e1b6a7c3c4c183c1c82ace82f8838ef9d49966e
   Yoga: 1ab23c1835475da69cf14e211a560e73aab24cb0
 
-PODFILE CHECKSUM: adfe86590813a4fc1f6e2dd9c7efd0dac5793aed
+PODFILE CHECKSUM: 98503034e62ce717139a4a18a626edf36438d6b1
 
 COCOAPODS: 1.15.2
diff --git a/package.json b/package.json
index d75fb9d71..be237f862 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "@xmtp/content-type-transaction-reference": "^1.0.3",
     "@xmtp/frames-client": "^0.5.0",
     "@xmtp/proto": "^3.60.0",
-    "@xmtp/react-native-sdk": "^2.4.5",
+    "@xmtp/react-native-sdk": "^2.4.6",
     "@xmtp/xmtp-js": "11.5.0",
     "amazon-cognito-identity-js": "^6.3.12",
     "axios": "^1.2.1",
diff --git a/queries/useGroupConsentQuery.ts b/queries/useGroupConsentQuery.ts
index 6f1e940ed..76ada3ac1 100644
--- a/queries/useGroupConsentQuery.ts
+++ b/queries/useGroupConsentQuery.ts
@@ -1,5 +1,6 @@
 import { useSettingsStore } from "@data/store/accountsStore";
 import { QueryObserverOptions, useQuery } from "@tanstack/react-query";
+import { getGroupIdFromTopic } from "@utils/groupUtils/groupId";
 import { useShallow } from "zustand/react/shallow";
 
 import { groupConsentQueryKey } from "./QueryKeys";
@@ -14,7 +15,7 @@ export const useGroupConsentQuery = (
   queryOptions?: Partial<QueryObserverOptions<"allowed" | "denied" | "unknown">>
 ) => {
   const statusFromState = useSettingsStore(
-    useShallow((s) => s.groupStatus[topic])
+    useShallow((s) => s.groupStatus[getGroupIdFromTopic(topic)])
   );
   const { data: group } = useGroupQuery(account, topic);
   return useQuery({
diff --git a/yarn.lock b/yarn.lock
index 909759143..e1efa66ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9586,10 +9586,10 @@
     rxjs "^7.8.0"
     undici "^5.8.1"
 
-"@xmtp/react-native-sdk@^2.4.5":
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/@xmtp/react-native-sdk/-/react-native-sdk-2.4.5.tgz#4bccab8f18fb59a76fbac09aac91945b544f2f3f"
-  integrity sha512-ZZQsBAqrw7lIUTgwNKKRW/fuHF2+sdQXa3xruj3uhXexIYP29fJojKmtXFXcNoAveVzj098meRiO5i/5fudXGw==
+"@xmtp/react-native-sdk@^2.4.6":
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@xmtp/react-native-sdk/-/react-native-sdk-2.4.6.tgz#5b8b702c4c91bdf4e12faa53030551031a244128"
+  integrity sha512-Ix4j33dOlQ0zOEPRG/PwhvJGDzZfux/8QJfGuPbVbQheQYpQrVqhLFVFlMXiZC77o3j7f8RLLjpi5dYbwG8RmQ==
   dependencies:
     "@ethersproject/bytes" "^5.7.0"
     "@msgpack/msgpack" "^3.0.0-beta2"