From 0d0aa71e5e79052ebd2efa19f29d74af0b274bd2 Mon Sep 17 00:00:00 2001
From: Crystal Lemire <crystal@hntlabs.com>
Date: Wed, 5 Jun 2024 13:28:23 -0700
Subject: [PATCH 1/3] Re-use existing method for creating entitlement struct
 for role updates.

---
 core/web3/src/v3/SpaceDapp.ts | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/core/web3/src/v3/SpaceDapp.ts b/core/web3/src/v3/SpaceDapp.ts
index 722f0fa131..dadf893af4 100644
--- a/core/web3/src/v3/SpaceDapp.ts
+++ b/core/web3/src/v3/SpaceDapp.ts
@@ -915,26 +915,7 @@ export class SpaceDapp implements ISpaceDapp {
         space: Space,
         params: UpdateRoleParams,
     ): Promise<IRolesBase.CreateEntitlementStruct[]> {
-        const updatedEntitlements: IRolesBase.CreateEntitlementStruct[] = []
-        const [userEntitlement, ruleEntitlement] = await Promise.all([
-            space.findEntitlementByType(EntitlementModuleType.UserEntitlement),
-            space.findEntitlementByType(EntitlementModuleType.RuleEntitlement),
-        ])
-        if (params.users.length > 0 && userEntitlement?.address) {
-            const entitlementData = createUserEntitlementStruct(
-                userEntitlement.address,
-                params.users,
-            )
-            updatedEntitlements.push(entitlementData)
-        }
-        if (params.ruleData && ruleEntitlement?.address) {
-            const entitlementData = createRuleEntitlementStruct(
-                ruleEntitlement.address as `0x${string}`,
-                params.ruleData,
-            )
-            updatedEntitlements.push(entitlementData)
-        }
-        return updatedEntitlements
+        return createEntitlementStruct(space, params.users, params.ruleData);
     }
 
     public getSpaceAddress(receipt: ContractReceipt): string | undefined {

From 71b6e4387f5527a2bb2c563e776202538af942eb Mon Sep 17 00:00:00 2001
From: Crystal Lemire <crystal@hntlabs.com>
Date: Wed, 5 Jun 2024 13:33:14 -0700
Subject: [PATCH 2/3] prettier fix.

---
 core/web3/src/v3/SpaceDapp.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/web3/src/v3/SpaceDapp.ts b/core/web3/src/v3/SpaceDapp.ts
index dadf893af4..cd163cbaf6 100644
--- a/core/web3/src/v3/SpaceDapp.ts
+++ b/core/web3/src/v3/SpaceDapp.ts
@@ -915,7 +915,7 @@ export class SpaceDapp implements ISpaceDapp {
         space: Space,
         params: UpdateRoleParams,
     ): Promise<IRolesBase.CreateEntitlementStruct[]> {
-        return createEntitlementStruct(space, params.users, params.ruleData);
+        return createEntitlementStruct(space, params.users, params.ruleData)
     }
 
     public getSpaceAddress(receipt: ContractReceipt): string | undefined {

From d5493750328f1b69e7136279703404f9aef2f32d Mon Sep 17 00:00:00 2001
From: Crystal Lemire <crystal@hntlabs.com>
Date: Wed, 5 Jun 2024 13:42:01 -0700
Subject: [PATCH 3/3] Lint fix.

---
 core/web3/src/v3/SpaceDapp.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/web3/src/v3/SpaceDapp.ts b/core/web3/src/v3/SpaceDapp.ts
index cd163cbaf6..43bd9aa656 100644
--- a/core/web3/src/v3/SpaceDapp.ts
+++ b/core/web3/src/v3/SpaceDapp.ts
@@ -15,7 +15,6 @@ import {
     UpdateChannelParams,
     UpdateRoleParams,
 } from '../ISpaceDapp'
-import { createRuleEntitlementStruct, createUserEntitlementStruct } from '../ConvertersEntitlements'
 
 import { IRolesBase } from './IRolesShim'
 import { Space } from './Space'