From e44f43350a91175bf042843e503f2a5abf4ac42f Mon Sep 17 00:00:00 2001
From: Ladd Hoffman <laddhoffman@gmail.com>
Date: Fri, 26 Apr 2024 19:08:02 -0500
Subject: [PATCH] proposal info reply in thread

---
 backend/contract-addresses.json  | 8 ++++----
 backend/src/matrix.js            | 9 ++++++++-
 ethereum/contract-addresses.json | 8 ++++----
 frontend/contract-addresses.json | 8 ++++----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/backend/contract-addresses.json b/backend/contract-addresses.json
index f3e468c..9bc0c65 100644
--- a/backend/contract-addresses.json
+++ b/backend/contract-addresses.json
@@ -1,9 +1,9 @@
 {
   "localhost": {
-    "DAO": "0x8d914D38dD301FC4606f5aa9fEcF8A76389020d3",
-    "Work1": "0xfe58B9EB03F75A603de1B286584f5E9532ab8fB5",
-    "Onboarding": "0x1d63FDe5B461106729fE1e5e38A02fc68C518Af5",
-    "Proposals": "0x050C420Cc4995B41217Eba1B54B82Fd5687e9139"
+    "DAO": "0x57BDFFf79108E5198dec6268A6BFFD8B62ECfA38",
+    "Work1": "0xB8f0cd092979F273b752FDa060F82BF2745f192e",
+    "Onboarding": "0x8F00038542C87A5eAf18d5938B7723bF2A04A4e4",
+    "Proposals": "0x6c18eb38b7450F8DaE5A5928A40fcA3952493Ee4"
   },
   "sepolia": {
     "DAO": "0x8e5bd58B2ca8910C5F9be8de847d6883B15c60d2",
diff --git a/backend/src/matrix.js b/backend/src/matrix.js
index e7b615b..fa86047 100644
--- a/backend/src/matrix.js
+++ b/backend/src/matrix.js
@@ -96,7 +96,14 @@ const start = async () => {
       try {
         const proposalEventId = await proposalEventIds.get(proposalIndex);
         const proposalEventUri = `https://matrix.to/#/${roomId}/${proposalEventId}`;
-        await client.sendText(roomId, `Proposal ${proposalIndex}: ${proposalEventUri}`);
+        const content = {
+          body: `Proposal ${proposalIndex}: ${proposalEventUri}`,
+          msgtype: 'm.text',
+        };
+        if (event.content['m.relates_to']?.rel_type === 'm.thread') {
+          content['m.relates_to'] = event.content['m.relates_to'];
+        }
+        await client.sendEvent(roomId, 'm.room.message', content);
       } catch (e) {
         // Not found
       }
diff --git a/ethereum/contract-addresses.json b/ethereum/contract-addresses.json
index f3e468c..9bc0c65 100644
--- a/ethereum/contract-addresses.json
+++ b/ethereum/contract-addresses.json
@@ -1,9 +1,9 @@
 {
   "localhost": {
-    "DAO": "0x8d914D38dD301FC4606f5aa9fEcF8A76389020d3",
-    "Work1": "0xfe58B9EB03F75A603de1B286584f5E9532ab8fB5",
-    "Onboarding": "0x1d63FDe5B461106729fE1e5e38A02fc68C518Af5",
-    "Proposals": "0x050C420Cc4995B41217Eba1B54B82Fd5687e9139"
+    "DAO": "0x57BDFFf79108E5198dec6268A6BFFD8B62ECfA38",
+    "Work1": "0xB8f0cd092979F273b752FDa060F82BF2745f192e",
+    "Onboarding": "0x8F00038542C87A5eAf18d5938B7723bF2A04A4e4",
+    "Proposals": "0x6c18eb38b7450F8DaE5A5928A40fcA3952493Ee4"
   },
   "sepolia": {
     "DAO": "0x8e5bd58B2ca8910C5F9be8de847d6883B15c60d2",
diff --git a/frontend/contract-addresses.json b/frontend/contract-addresses.json
index f3e468c..9bc0c65 100644
--- a/frontend/contract-addresses.json
+++ b/frontend/contract-addresses.json
@@ -1,9 +1,9 @@
 {
   "localhost": {
-    "DAO": "0x8d914D38dD301FC4606f5aa9fEcF8A76389020d3",
-    "Work1": "0xfe58B9EB03F75A603de1B286584f5E9532ab8fB5",
-    "Onboarding": "0x1d63FDe5B461106729fE1e5e38A02fc68C518Af5",
-    "Proposals": "0x050C420Cc4995B41217Eba1B54B82Fd5687e9139"
+    "DAO": "0x57BDFFf79108E5198dec6268A6BFFD8B62ECfA38",
+    "Work1": "0xB8f0cd092979F273b752FDa060F82BF2745f192e",
+    "Onboarding": "0x8F00038542C87A5eAf18d5938B7723bF2A04A4e4",
+    "Proposals": "0x6c18eb38b7450F8DaE5A5928A40fcA3952493Ee4"
   },
   "sepolia": {
     "DAO": "0x8e5bd58B2ca8910C5F9be8de847d6883B15c60d2",