From f212c31c8e462d90ec6c03590691bcfd2cc39004 Mon Sep 17 00:00:00 2001
From: Jan-Felix <jfschwarz@users.noreply.github.com>
Date: Fri, 16 Feb 2024 16:44:39 +0100
Subject: [PATCH 1/3] css fix: concurrent specificity

---
 extension/src/browser/ProvideProvider.tsx                       | 2 +-
 extension/src/components/Address/index.tsx                      | 2 +-
 extension/src/components/BlockButton/index.tsx                  | 2 +-
 extension/src/components/BoxButton/index.tsx                    | 2 +-
 extension/src/components/IconButton/index.tsx                   | 2 +-
 extension/src/components/Tag/index.tsx                          | 2 +-
 .../src/connections/ConnectionsDrawer/List/style.module.css     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extension/src/browser/ProvideProvider.tsx b/extension/src/browser/ProvideProvider.tsx
index cf6c34d8..3b0837c6 100644
--- a/extension/src/browser/ProvideProvider.tsx
+++ b/extension/src/browser/ProvideProvider.tsx
@@ -8,7 +8,7 @@ import React, {
 } from 'react'
 import { decodeSingle, encodeMulti, encodeSingle } from 'react-multisend'
 
-import { ChainId, MULTI_SEND_ADDRESS } from '../chains'
+import { MULTI_SEND_ADDRESS } from '../chains'
 import {
   ForkProvider,
   useTenderlyProvider,
diff --git a/extension/src/components/Address/index.tsx b/extension/src/components/Address/index.tsx
index ca150730..0ccb91cd 100644
--- a/extension/src/components/Address/index.tsx
+++ b/extension/src/components/Address/index.tsx
@@ -53,7 +53,7 @@ const Address: React.FC<Props> = ({
   const displayAddress = shortenAddress(checksumAddress)
 
   return (
-    <Box rounded className={cn(className, classes.container)}>
+    <Box rounded className={cn(classes.container, className)}>
       <div className={classes.address}>{displayAddress}</div>
       <Box rounded className={classes.blockieContainer}>
         {address && <Blockie address={address} className={classes.blockies} />}
diff --git a/extension/src/components/BlockButton/index.tsx b/extension/src/components/BlockButton/index.tsx
index fc4ed55e..d15c04ac 100644
--- a/extension/src/components/BlockButton/index.tsx
+++ b/extension/src/components/BlockButton/index.tsx
@@ -9,7 +9,7 @@ type Props = React.DetailedHTMLProps<
 >
 
 const BoxButton: React.FC<Props> = ({ className, ...rest }) => (
-  <button className={cn(className, classes.button)} {...rest} />
+  <button className={cn(classes.button, className)} {...rest} />
 )
 
 export default BoxButton
diff --git a/extension/src/components/BoxButton/index.tsx b/extension/src/components/BoxButton/index.tsx
index fefc02e6..b09d682b 100644
--- a/extension/src/components/BoxButton/index.tsx
+++ b/extension/src/components/BoxButton/index.tsx
@@ -9,7 +9,7 @@ type Props = React.DetailedHTMLProps<
 >
 
 const BlockButton: React.FC<Props> = ({ className, ...rest }) => (
-  <button className={cn(className, classes.button)} {...rest} />
+  <button className={cn(classes.button, className)} {...rest} />
 )
 
 export default BlockButton
diff --git a/extension/src/components/IconButton/index.tsx b/extension/src/components/IconButton/index.tsx
index 0b65465b..ccb0f495 100644
--- a/extension/src/components/IconButton/index.tsx
+++ b/extension/src/components/IconButton/index.tsx
@@ -12,7 +12,7 @@ type Props = React.DetailedHTMLProps<
 
 const IconButton: React.FC<Props> = ({ className, danger, ...rest }) => (
   <button
-    className={cn(classes.button, className, { [classes.danger]: danger })}
+    className={cn(classes.button, { [classes.danger]: danger }, className)}
     {...rest}
   />
 )
diff --git a/extension/src/components/Tag/index.tsx b/extension/src/components/Tag/index.tsx
index e236e07e..db17381e 100644
--- a/extension/src/components/Tag/index.tsx
+++ b/extension/src/components/Tag/index.tsx
@@ -11,7 +11,7 @@ interface Props {
 }
 
 const Tag: React.FC<Props> = ({ head, children, color, className }) => (
-  <div className={cn(className, classes.container, classes[color])}>
+  <div className={cn(classes.container, classes[color], className)}>
     {head && <div className={classes.head}>{head}</div>}
     {children && <div className={classes.body}>{children}</div>}
   </div>
diff --git a/extension/src/connections/ConnectionsDrawer/List/style.module.css b/extension/src/connections/ConnectionsDrawer/List/style.module.css
index 905bdc70..2219234b 100644
--- a/extension/src/connections/ConnectionsDrawer/List/style.module.css
+++ b/extension/src/connections/ConnectionsDrawer/List/style.module.css
@@ -58,7 +58,7 @@ button.removeButton:hover {
 }
 
 .modifyButton {
-  position: absolute;
+  position: absolute !important;
   top: var(--spacing-4);
   right: var(--spacing-4);
   background: none;

From 37a47fcf95555686676738e0b46add5232f70981 Mon Sep 17 00:00:00 2001
From: Jan-Felix <jfschwarz@users.noreply.github.com>
Date: Fri, 16 Feb 2024 16:49:40 +0100
Subject: [PATCH 2/3] reduce number of rpc requests on connections list

---
 extension/src/connections/useZodiacModules.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/src/connections/useZodiacModules.ts b/extension/src/connections/useZodiacModules.ts
index c1cbd2a8..73398c15 100644
--- a/extension/src/connections/useZodiacModules.ts
+++ b/extension/src/connections/useZodiacModules.ts
@@ -14,6 +14,7 @@ import { useEffect, useState } from 'react'
 import { validateAddress } from '../utils'
 import { useConnection } from './connectionHooks'
 import { ChainId, RPC } from '../chains'
+import { getReadOnlyProvider } from '../providers/readOnlyProvider'
 
 const SUPPORTED_MODULES = [
   KnownContracts.DELAY,
@@ -44,7 +45,7 @@ export const useZodiacModules = (
 
   useEffect(() => {
     if (!chainId) return
-    const provider = new JsonRpcBatchProvider(RPC[chainId as ChainId], chainId)
+    const provider = getReadOnlyProvider(chainId as ChainId)
 
     setLoading(true)
     setError(false)

From e29b1c87176d0b7a6df67233a8856d54644929a2 Mon Sep 17 00:00:00 2001
From: Jan-Felix <jfschwarz@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:10:58 +0100
Subject: [PATCH 3/3] fix detection of roles v1 mod

---
 extension/src/connections/useZodiacModules.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extension/src/connections/useZodiacModules.ts b/extension/src/connections/useZodiacModules.ts
index 73398c15..b4565c54 100644
--- a/extension/src/connections/useZodiacModules.ts
+++ b/extension/src/connections/useZodiacModules.ts
@@ -94,6 +94,9 @@ async function fetchModules(
 
       const implementationAddress = mastercopyAddress || moduleAddress
 
+      // 'roles' is the old name for roles_v1 is still configured as an alias in the zodiac package for backwards compatibility
+      if (type === KnownContracts.ROLES) type = KnownContracts.ROLES_V1
+
       if (!type) {
         // Not a proxy to one of our master copies. It might be a custom deployment.
         // We try to detect selectors from byte code and match them against the ABIs of known Zodiac modules.