diff --git a/e2e/meta-tx-gateway/src/services/meta-tx.ts b/e2e/meta-tx-gateway/src/services/meta-tx.ts
index 1f0316eda..8a006f4f9 100644
--- a/e2e/meta-tx-gateway/src/services/meta-tx.ts
+++ b/e2e/meta-tx-gateway/src/services/meta-tx.ts
@@ -5,8 +5,6 @@ import { Interface } from "@ethersproject/abi";
 import { ethers } from "ethers";
 import { Config, getConfig } from "../config";
 import { getSigner } from "../utils/web3";
-import { BytesLike } from "@ethersproject/bytes";
-import { BigNumberish } from "@ethersproject/bignumber";
 
 export type PostMetaTxBody = {
   to: string;
diff --git a/packages/core-sdk/src/core-sdk.ts b/packages/core-sdk/src/core-sdk.ts
index a15b33a27..001b51c29 100644
--- a/packages/core-sdk/src/core-sdk.ts
+++ b/packages/core-sdk/src/core-sdk.ts
@@ -92,6 +92,10 @@ export class CoreSDK extends BaseCoreSDK {
     return this._getTxExplorerUrl;
   }
 
+  public get web3Lib() {
+    return this._web3Lib;
+  }
+
   public checkMetaTxConfigSet(
     args: {
       contractAddress?: string;
diff --git a/packages/core-sdk/src/offers/mixin.ts b/packages/core-sdk/src/offers/mixin.ts
index 567a3a7ad..a1ee1a5b5 100644
--- a/packages/core-sdk/src/offers/mixin.ts
+++ b/packages/core-sdk/src/offers/mixin.ts
@@ -19,7 +19,6 @@ import { BigNumber, BigNumberish } from "@ethersproject/bignumber";
 import { getValueFromLogs, getValuesFromLogs } from "../utils/logs";
 import { ITokenInfo, TokenInfoManager } from "../utils/tokenInfoManager";
 import { batchTasks } from "../utils/promises";
-import { ExchangesMixin } from "../exchanges/mixin";
 import { EventLogsMixin } from "../event-logs/mixin";
 import { AccountsMixin } from "../accounts/mixin";
 
diff --git a/packages/react-kit/src/components/cta/common/CtaButton.tsx b/packages/react-kit/src/components/cta/common/CtaButton.tsx
index ce6ef93c7..7e0edf9c4 100644
--- a/packages/react-kit/src/components/cta/common/CtaButton.tsx
+++ b/packages/react-kit/src/components/cta/common/CtaButton.tsx
@@ -2,13 +2,13 @@ import React from "react";
 import { providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { useCtaClickHandler, Action } from "../../../hooks/useCtaClickHandler";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type Props<T> = CtaButtonProps<T> & {
   defaultLabel?: string;
@@ -35,8 +35,8 @@ export function CtaButton<T>({
   coreSdkConfig,
   ...rest
 }: Props<T>) {
-  const coreSdk = useCoreSdk(coreSdkConfig);
-  const signerAddress = useSignerAddress(coreSdkConfig.web3Provider);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
 
   const { clickHandler, isLoading } = useCtaClickHandler<T>({
     waitBlocks,
diff --git a/packages/react-kit/src/components/cta/dispute/AddFeesDisputeResolverButton.tsx b/packages/react-kit/src/components/cta/dispute/AddFeesDisputeResolverButton.tsx
index bb34130c2..38405070b 100644
--- a/packages/react-kit/src/components/cta/dispute/AddFeesDisputeResolverButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/AddFeesDisputeResolverButton.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { CreateSellerArgs, TransactionResponse } from "@bosonprotocol/common";
 import { DisputeResolutionFee } from "@bosonprotocol/core-sdk/dist/cjs/accounts";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 export type IAddFeesDisputeResolverButton = {
   exchangeId: BigNumberish;
   createSellerArgs: CreateSellerArgs;
@@ -39,7 +39,7 @@ export const AddFeesDisputeResolverButton = ({
   coreSdkConfig,
   ...rest
 }: IAddFeesDisputeResolverButton) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   return (
diff --git a/packages/react-kit/src/components/cta/dispute/AddSellerToDisputeResolverButton.tsx b/packages/react-kit/src/components/cta/dispute/AddSellerToDisputeResolverButton.tsx
index 9746f962a..5643c66c5 100644
--- a/packages/react-kit/src/components/cta/dispute/AddSellerToDisputeResolverButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/AddSellerToDisputeResolverButton.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { CreateSellerArgs, TransactionResponse } from "@bosonprotocol/common";
 import { DisputeResolutionFee } from "@bosonprotocol/core-sdk/dist/cjs/accounts";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 export type IAddSellerToDisputeResolver = {
   exchangeId: BigNumberish;
   createSellerArgs: CreateSellerArgs;
@@ -41,7 +41,7 @@ export const AddSellerToDisputeResolver = ({
   coreSdkConfig,
   ...rest
 }: IAddSellerToDisputeResolver) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   return (
diff --git a/packages/react-kit/src/components/cta/dispute/CreateDisputeResolverButton.tsx b/packages/react-kit/src/components/cta/dispute/CreateDisputeResolverButton.tsx
index bd2a64767..12e63e193 100644
--- a/packages/react-kit/src/components/cta/dispute/CreateDisputeResolverButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/CreateDisputeResolverButton.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { TransactionResponse } from "@bosonprotocol/common";
 import { accounts } from "@bosonprotocol/core-sdk";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 export type ICreateDisputeResolverButton = {
   exchangeId: BigNumberish;
   disputeResolverToCreate: accounts.CreateDisputeResolverArgs;
@@ -33,7 +33,7 @@ export const CreateDisputeResolverButton = ({
   coreSdkConfig,
   ...rest
 }: ICreateDisputeResolverButton) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   return (
diff --git a/packages/react-kit/src/components/cta/dispute/DecideDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/DecideDisputeButton.tsx
index 1d49d4fdc..03059e5cb 100644
--- a/packages/react-kit/src/components/cta/dispute/DecideDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/DecideDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -23,7 +23,9 @@ export const DecideDisputeButton = ({
   variant = "primaryFill",
   ...restProps
 }: IDecideDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
   const actions = [
     {
       writeContractFn: () => coreSdk.decideDispute(exchangeId, buyerPercent)
diff --git a/packages/react-kit/src/components/cta/dispute/EscalateDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/EscalateDisputeButton.tsx
index 6620273eb..292f592af 100644
--- a/packages/react-kit/src/components/cta/dispute/EscalateDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/EscalateDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -21,7 +21,9 @@ export const EscalateDisputeButton = ({
   exchangeId,
   ...restProps
 }: IEscalateDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/dispute/ExpireDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/ExpireDisputeButton.tsx
index 50c310236..8f72c2312 100644
--- a/packages/react-kit/src/components/cta/dispute/ExpireDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/ExpireDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -21,7 +21,9 @@ export const ExpireDisputeButton = ({
   exchangeId,
   ...restProps
 }: IExpireDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/dispute/ExpireEscalationDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/ExpireEscalationDisputeButton.tsx
index 55641e255..e95c755db 100644
--- a/packages/react-kit/src/components/cta/dispute/ExpireEscalationDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/ExpireEscalationDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -21,7 +21,9 @@ export const ExpireEscalationDisputeButton = ({
   variant = "secondaryFill",
   ...restProps
 }: IExpireEscalationDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
   const actions = [
     {
       writeContractFn: () => coreSdk.expireEscalatedDispute(exchangeId)
diff --git a/packages/react-kit/src/components/cta/dispute/ExtendDisputeTimeoutButton.tsx b/packages/react-kit/src/components/cta/dispute/ExtendDisputeTimeoutButton.tsx
index b3e0e2569..1ec41012b 100644
--- a/packages/react-kit/src/components/cta/dispute/ExtendDisputeTimeoutButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/ExtendDisputeTimeoutButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -23,7 +23,9 @@ export const ExtendDisputeTimeoutButton = ({
   newDisputeTimeout,
   ...restProps
 }: IExtendDisputeTimeoutButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/dispute/RaiseDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/RaiseDisputeButton.tsx
index 71d971f59..cbedfafea 100644
--- a/packages/react-kit/src/components/cta/dispute/RaiseDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/RaiseDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -21,7 +21,9 @@ export const RaiseDisputeButton = ({
   exchangeId,
   ...restProps
 }: IRaiseDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/dispute/RefuseDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/RefuseDisputeButton.tsx
index 9e2b8db31..e012b78a4 100644
--- a/packages/react-kit/src/components/cta/dispute/RefuseDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/RefuseDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -21,7 +21,9 @@ export const RefuseDisputeButton = ({
   variant = "secondaryFill",
   ...restProps
 }: IRefuseDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
   const actions = [
     {
       writeContractFn: () => coreSdk.refuseEscalatedDispute(exchangeId)
diff --git a/packages/react-kit/src/components/cta/dispute/RemoveSellerFromDisputeResolverButton.tsx b/packages/react-kit/src/components/cta/dispute/RemoveSellerFromDisputeResolverButton.tsx
index 2da9458c6..9d1cea507 100644
--- a/packages/react-kit/src/components/cta/dispute/RemoveSellerFromDisputeResolverButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/RemoveSellerFromDisputeResolverButton.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { CreateSellerArgs, TransactionResponse } from "@bosonprotocol/common";
 import { DisputeResolutionFee } from "@bosonprotocol/core-sdk/dist/cjs/accounts";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 export type IRemoveSellerFromDisputeResolverButton = {
   exchangeId: BigNumberish;
   createSellerArgs: CreateSellerArgs;
@@ -41,7 +41,7 @@ export const RemoveSellerFromDisputeResolverButton = ({
   coreSdkConfig,
   ...rest
 }: IRemoveSellerFromDisputeResolverButton) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   return (
diff --git a/packages/react-kit/src/components/cta/dispute/ResolveDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/ResolveDisputeButton.tsx
index be5e90ae1..62872fdab 100644
--- a/packages/react-kit/src/components/cta/dispute/ResolveDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/ResolveDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish, utils } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -27,7 +27,9 @@ export const ResolveDisputeButton = ({
   variant = "primaryFill",
   ...restProps
 }: IResolveDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
   const signature = utils.splitSignature(proposal.signature);
 
   const actions = [
diff --git a/packages/react-kit/src/components/cta/dispute/RetractDisputeButton.tsx b/packages/react-kit/src/components/cta/dispute/RetractDisputeButton.tsx
index 3abef3856..10e6c3856 100644
--- a/packages/react-kit/src/components/cta/dispute/RetractDisputeButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/RetractDisputeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -21,7 +21,9 @@ export const RetractDisputeButton = ({
   variant = "primaryFill",
   ...restProps
 }: IRetractDisputeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/dispute/UpdateDisputeResolverButton.tsx b/packages/react-kit/src/components/cta/dispute/UpdateDisputeResolverButton.tsx
index 1b7b53f1e..2508f8303 100644
--- a/packages/react-kit/src/components/cta/dispute/UpdateDisputeResolverButton.tsx
+++ b/packages/react-kit/src/components/cta/dispute/UpdateDisputeResolverButton.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { CreateSellerArgs, TransactionResponse } from "@bosonprotocol/common";
 import { accounts } from "@bosonprotocol/core-sdk";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 export type IUpdateDisputeResolverButton = {
   exchangeId: BigNumberish;
   disputeResolverId: BigNumberish;
@@ -37,7 +37,7 @@ export const UpdateDisputeResolverButton = ({
   coreSdkConfig,
   ...rest
 }: IUpdateDisputeResolverButton) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   return (
diff --git a/packages/react-kit/src/components/cta/exchange/BatchCompleteButton.tsx b/packages/react-kit/src/components/cta/exchange/BatchCompleteButton.tsx
index 31c6c6b9c..a07f39161 100644
--- a/packages/react-kit/src/components/cta/exchange/BatchCompleteButton.tsx
+++ b/packages/react-kit/src/components/cta/exchange/BatchCompleteButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   /**
@@ -23,7 +23,9 @@ export const BatchCompleteButton = ({
   variant = "primaryFill",
   ...restProps
 }: Props) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/exchange/CancelButton.tsx b/packages/react-kit/src/components/cta/exchange/CancelButton.tsx
index a2ccb28a9..b0e2f52e2 100644
--- a/packages/react-kit/src/components/cta/exchange/CancelButton.tsx
+++ b/packages/react-kit/src/components/cta/exchange/CancelButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -20,7 +20,9 @@ export const CancelButton = ({
   exchangeId,
   ...restProps
 }: ICancelButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/exchange/CompleteButton.tsx b/packages/react-kit/src/components/cta/exchange/CompleteButton.tsx
index 55ec8869e..973a83469 100644
--- a/packages/react-kit/src/components/cta/exchange/CompleteButton.tsx
+++ b/packages/react-kit/src/components/cta/exchange/CompleteButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -20,7 +20,9 @@ export const CompleteButton = ({
   variant = "primaryFill",
   ...restProps
 }: Props) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/exchange/ExpireButton.tsx b/packages/react-kit/src/components/cta/exchange/ExpireButton.tsx
index 10719e8ee..a64e17c97 100644
--- a/packages/react-kit/src/components/cta/exchange/ExpireButton.tsx
+++ b/packages/react-kit/src/components/cta/exchange/ExpireButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -20,7 +20,9 @@ export const ExpireButton = ({
   variant = "secondaryFill",
   ...restProps
 }: IExpireButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/exchange/RedeemButton.tsx b/packages/react-kit/src/components/cta/exchange/RedeemButton.tsx
index 2a8b75fee..94821f12d 100644
--- a/packages/react-kit/src/components/cta/exchange/RedeemButton.tsx
+++ b/packages/react-kit/src/components/cta/exchange/RedeemButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -20,7 +20,9 @@ export const RedeemButton = ({
   variant = "primaryFill",
   ...restProps
 }: IRedeemButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/exchange/RevokeButton.tsx b/packages/react-kit/src/components/cta/exchange/RevokeButton.tsx
index dfaf14625..975e6fe78 100644
--- a/packages/react-kit/src/components/cta/exchange/RevokeButton.tsx
+++ b/packages/react-kit/src/components/cta/exchange/RevokeButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeId: BigNumberish;
@@ -20,7 +20,9 @@ export const RevokeButton = ({
   variant = "secondaryFill",
   ...restProps
 }: IRevokeButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
 
   const actions = [
     {
diff --git a/packages/react-kit/src/components/cta/funds/DepositFundsButton.tsx b/packages/react-kit/src/components/cta/funds/DepositFundsButton.tsx
index 95dc88f01..c8f48af72 100644
--- a/packages/react-kit/src/components/cta/funds/DepositFundsButton.tsx
+++ b/packages/react-kit/src/components/cta/funds/DepositFundsButton.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { BigNumber, BigNumberish, constants, ethers } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { TransactionReceipt } from "@bosonprotocol/common";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   exchangeToken: string;
@@ -25,8 +25,10 @@ export const DepositFundsButton = ({
   amountToDeposit,
   ...restProps
 }: IDepositFundsButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
-  const signerAddress = useSignerAddress(restProps.coreSdkConfig.web3Provider);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
 
   const actions = [
     // Approve exchange token
diff --git a/packages/react-kit/src/components/cta/funds/WithdrawAllFundsButton.tsx b/packages/react-kit/src/components/cta/funds/WithdrawAllFundsButton.tsx
index 5353993b5..8cb920e9d 100644
--- a/packages/react-kit/src/components/cta/funds/WithdrawAllFundsButton.tsx
+++ b/packages/react-kit/src/components/cta/funds/WithdrawAllFundsButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
 import { TransactionReceipt } from "@bosonprotocol/common";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   accountId: string;
@@ -19,7 +19,9 @@ export const WithdrawAllFundsButton = ({
   variant = "primaryFill",
   ...restProps
 }: IWithdrawAllFundsButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
   const actions = [
     // Withdraw all funds
     {
diff --git a/packages/react-kit/src/components/cta/funds/WithdrawFundsButton.tsx b/packages/react-kit/src/components/cta/funds/WithdrawFundsButton.tsx
index fa9205f6c..e6ddea407 100644
--- a/packages/react-kit/src/components/cta/funds/WithdrawFundsButton.tsx
+++ b/packages/react-kit/src/components/cta/funds/WithdrawFundsButton.tsx
@@ -1,11 +1,11 @@
 import React, { useMemo } from "react";
 import { BigNumber, BigNumberish } from "ethers";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { CtaButtonProps } from "../common/types";
 import { CtaButton } from "../common/CtaButton";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { TransactionReceipt } from "@bosonprotocol/common";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   accountId: string;
@@ -26,8 +26,10 @@ export const WithdrawFundsButton = ({
   tokensToWithdraw,
   ...restProps
 }: IWithdrawFundsButton) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
-  const signerAddress = useSignerAddress(restProps.coreSdkConfig.web3Provider);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
   const tokenList = useMemo(
     () => tokensToWithdraw.map((t) => t.address),
     [tokensToWithdraw]
diff --git a/packages/react-kit/src/components/cta/offer/BatchVoidButton.tsx b/packages/react-kit/src/components/cta/offer/BatchVoidButton.tsx
index 031d61809..7ac9cfb38 100644
--- a/packages/react-kit/src/components/cta/offer/BatchVoidButton.tsx
+++ b/packages/react-kit/src/components/cta/offer/BatchVoidButton.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { ButtonSize } from "../../ui/buttonSize";
 import { TransactionResponse } from "@bosonprotocol/common";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type Props = {
   /**
@@ -35,10 +35,10 @@ export const BatchVoidButton = ({
   coreSdkConfig,
   ...rest
 }: Props) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const signerAddress = useSignerAddress(coreSdkConfig.web3Provider);
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
 
   return (
     <Button
diff --git a/packages/react-kit/src/components/cta/offer/CommitButton.tsx b/packages/react-kit/src/components/cta/offer/CommitButton.tsx
index 5757e7219..8d2e4953e 100644
--- a/packages/react-kit/src/components/cta/offer/CommitButton.tsx
+++ b/packages/react-kit/src/components/cta/offer/CommitButton.tsx
@@ -2,11 +2,11 @@ import { AddressZero } from "@ethersproject/constants";
 import { BigNumber, BigNumberish } from "ethers";
 import React, { useEffect } from "react";
 
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { Action } from "../../../hooks/useCtaClickHandler";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { CtaButton } from "../common/CtaButton";
 import { CtaButtonProps } from "../common/types";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type AdditionalProps = {
   /**
@@ -36,8 +36,10 @@ export const CommitButton = ({
   onGetSignerAddress,
   ...restProps
 }: Props) => {
-  const coreSdk = useCoreSdk(restProps.coreSdkConfig);
-  const signerAddress = useSignerAddress(restProps.coreSdkConfig.web3Provider);
+  const coreSdk = useCoreSdkOverrides({
+    coreSdkConfig: restProps.coreSdkConfig
+  });
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
 
   useEffect(() => {
     if (onGetSignerAddress) {
diff --git a/packages/react-kit/src/components/cta/offer/CreateOfferButton.tsx b/packages/react-kit/src/components/cta/offer/CreateOfferButton.tsx
index ada18cc41..ed486b3d9 100644
--- a/packages/react-kit/src/components/cta/offer/CreateOfferButton.tsx
+++ b/packages/react-kit/src/components/cta/offer/CreateOfferButton.tsx
@@ -2,7 +2,6 @@ import React, { useState } from "react";
 import { providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
@@ -10,6 +9,7 @@ import { Loading } from "../../Loading";
 import { offers, accounts } from "@bosonprotocol/core-sdk";
 import { TransactionResponse } from "@bosonprotocol/common";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type Props = {
   hasSellerAccount: boolean;
@@ -39,8 +39,8 @@ export const CreateOfferButton = ({
   coreSdkConfig,
   ...rest
 }: Props) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
-  const signerAddress = useSignerAddress(coreSdkConfig.web3Provider);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
 
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
diff --git a/packages/react-kit/src/components/cta/offer/VoidButton.tsx b/packages/react-kit/src/components/cta/offer/VoidButton.tsx
index 9c08b77fb..cb7e8166a 100644
--- a/packages/react-kit/src/components/cta/offer/VoidButton.tsx
+++ b/packages/react-kit/src/components/cta/offer/VoidButton.tsx
@@ -3,12 +3,12 @@ import { BigNumberish, providers } from "ethers";
 import { TransactionResponse } from "@bosonprotocol/common";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 type Props = {
   /**
@@ -35,10 +35,10 @@ export const VoidButton = ({
   coreSdkConfig,
   ...rest
 }: Props) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const signerAddress = useSignerAddress(coreSdkConfig.web3Provider);
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
 
   return (
     <Button
diff --git a/packages/react-kit/src/components/cta/seller/CreateSellerButton.tsx b/packages/react-kit/src/components/cta/seller/CreateSellerButton.tsx
index cf310451f..5b58afc29 100644
--- a/packages/react-kit/src/components/cta/seller/CreateSellerButton.tsx
+++ b/packages/react-kit/src/components/cta/seller/CreateSellerButton.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { useSignerAddress } from "../../../hooks/useSignerAddress";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { CreateSellerArgs, TransactionResponse } from "@bosonprotocol/common";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 export type ICreateSellerButton = {
   exchangeId: BigNumberish;
   createSellerArgs: CreateSellerArgs;
@@ -33,10 +33,10 @@ export const CreateSellerButton = ({
   coreSdkConfig,
   ...rest
 }: ICreateSellerButton) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const signerAddress = useSignerAddress(coreSdkConfig.web3Provider);
+  const signerAddress = useSignerAddress(coreSdk.web3Lib);
 
   return (
     <Button
diff --git a/packages/react-kit/src/components/cta/seller/UpdateSellerButton.tsx b/packages/react-kit/src/components/cta/seller/UpdateSellerButton.tsx
index aad275c38..56ebb469c 100644
--- a/packages/react-kit/src/components/cta/seller/UpdateSellerButton.tsx
+++ b/packages/react-kit/src/components/cta/seller/UpdateSellerButton.tsx
@@ -2,12 +2,12 @@ import React, { useState } from "react";
 import { BigNumberish, providers } from "ethers";
 
 import { Button } from "../../buttons/Button";
-import { useCoreSdk } from "../../../hooks/useCoreSdk";
 import { ButtonTextWrapper, ExtraInfo, LoadingWrapper } from "../common/styles";
 import { CtaButtonProps } from "../common/types";
 import { Loading } from "../../Loading";
 import { UpdateSellerArgs, TransactionResponse } from "@bosonprotocol/common";
 import { ButtonSize } from "../../ui/buttonSize";
+import { useCoreSdkOverrides } from "../../../hooks/useCoreSdkOverrides";
 
 export type IUpdateSellerButton = {
   exchangeId: BigNumberish;
@@ -33,7 +33,7 @@ export const UpdateSellerButton = ({
   coreSdkConfig,
   ...rest
 }: IUpdateSellerButton) => {
-  const coreSdk = useCoreSdk(coreSdkConfig);
+  const coreSdk = useCoreSdkOverrides({ coreSdkConfig });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   return (
diff --git a/packages/react-kit/src/components/magicLink/Login.tsx b/packages/react-kit/src/components/magicLink/Login.tsx
index 8e6aca37d..aa7413b36 100644
--- a/packages/react-kit/src/components/magicLink/Login.tsx
+++ b/packages/react-kit/src/components/magicLink/Login.tsx
@@ -5,36 +5,6 @@ import { useMagic } from "../../hooks";
 import { Button } from "../buttons/Button";
 import { Spinner } from "../ui/loading/Spinner";
 
-const GoogleLogo = () => {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      x="0px"
-      y="0px"
-      width="20"
-      height="20"
-      viewBox="0 0 48 48"
-    >
-      <path
-        fill="#FFC107"
-        d="M43.611,20.083H42V20H24v8h11.303c-1.649,4.657-6.08,8-11.303,8c-6.627,0-12-5.373-12-12c0-6.627,5.373-12,12-12c3.059,0,5.842,1.154,7.961,3.039l5.657-5.657C34.046,6.053,29.268,4,24,4C12.955,4,4,12.955,4,24c0,11.045,8.955,20,20,20c11.045,0,20-8.955,20-20C44,22.659,43.862,21.35,43.611,20.083z"
-      ></path>
-      <path
-        fill="#FF3D00"
-        d="M6.306,14.691l6.571,4.819C14.655,15.108,18.961,12,24,12c3.059,0,5.842,1.154,7.961,3.039l5.657-5.657C34.046,6.053,29.268,4,24,4C16.318,4,9.656,8.337,6.306,14.691z"
-      ></path>
-      <path
-        fill="#4CAF50"
-        d="M24,44c5.166,0,9.86-1.977,13.409-5.192l-6.19-5.238C29.211,35.091,26.715,36,24,36c-5.202,0-9.619-3.317-11.283-7.946l-6.522,5.025C9.505,39.556,16.227,44,24,44z"
-      ></path>
-      <path
-        fill="#1976D2"
-        d="M43.611,20.083H42V20H24v8h11.303c-0.792,2.237-2.231,4.166-4.087,5.571c0.001-0.001,0.002-0.001,0.003-0.002l6.19,5.238C36.971,39.205,44,34,44,24C44,22.659,43.862,21.35,43.611,20.083z"
-      ></path>
-    </svg>
-  );
-};
-
 export const MagicLoginButton = () => {
   const magic = useMagic();
   const { setUser } = useUser();
@@ -68,9 +38,7 @@ export const MagicLoginButton = () => {
           <Spinner size={20} />
         </>
       ) : (
-        <>
-          Login with email or <GoogleLogo />
-        </>
+        <>Login</>
       )}
     </Button>
   );
diff --git a/packages/react-kit/src/components/modal/components/SellerFinance/FinanceDeposit.tsx b/packages/react-kit/src/components/modal/components/SellerFinance/FinanceDeposit.tsx
index 1b9810369..7ad34ff52 100644
--- a/packages/react-kit/src/components/modal/components/SellerFinance/FinanceDeposit.tsx
+++ b/packages/react-kit/src/components/modal/components/SellerFinance/FinanceDeposit.tsx
@@ -122,9 +122,11 @@ export default function FinanceDeposit({
             >
               {symbol}
             </Typography>
-            <Typography $fontSize="0.625rem" margin="0">
-              Balance {dataBalance?.formatted}
-            </Typography>
+            {dataBalance && (
+              <Typography $fontSize="0.625rem" margin="0">
+                Balance {dataBalance.formatted}
+              </Typography>
+            )}
           </div>
         </InputWrapper>
       </AmountWrapper>
@@ -176,7 +178,7 @@ export default function FinanceDeposit({
                 break;
             }
           }}
-          onSuccess={async () => {
+          onSuccess={async (...args) => {
             await poll(
               async () => {
                 const balance = await refetch();
diff --git a/packages/react-kit/src/components/signer/SignerContext.tsx b/packages/react-kit/src/components/signer/SignerContext.tsx
new file mode 100644
index 000000000..cd47ca5af
--- /dev/null
+++ b/packages/react-kit/src/components/signer/SignerContext.tsx
@@ -0,0 +1,25 @@
+import React, { createContext, ReactNode } from "react";
+import { Web3LibAdapter } from "@bosonprotocol/common";
+import { useProvideExternalSigner } from "../../lib/signer/externalSigner";
+
+export const SignerContext = createContext<Web3LibAdapter | undefined>(
+  undefined
+);
+
+type SignerProviderProps = {
+  children: ReactNode;
+  parentOrigin: `http${string}` | null | undefined;
+};
+export const SignerProvider = ({
+  children,
+  parentOrigin
+}: SignerProviderProps) => {
+  const externalSigner = useProvideExternalSigner({
+    parentOrigin
+  });
+  return (
+    <SignerContext.Provider value={externalSigner}>
+      {children}
+    </SignerContext.Provider>
+  );
+};
diff --git a/packages/react-kit/src/components/signer/useExternalSigner.ts b/packages/react-kit/src/components/signer/useExternalSigner.ts
new file mode 100644
index 000000000..eddfe21cc
--- /dev/null
+++ b/packages/react-kit/src/components/signer/useExternalSigner.ts
@@ -0,0 +1,7 @@
+import { useContext } from "react";
+import { SignerContext } from "./SignerContext";
+
+export const useExternalSigner = () => {
+  const context = useContext(SignerContext);
+  return context;
+};
diff --git a/packages/react-kit/src/components/wallet/ConnectButton.tsx b/packages/react-kit/src/components/wallet/ConnectButton.tsx
index bdf06eb1d..f5d488922 100644
--- a/packages/react-kit/src/components/wallet/ConnectButton.tsx
+++ b/packages/react-kit/src/components/wallet/ConnectButton.tsx
@@ -89,10 +89,7 @@ export default function ConnectButton({
         account && Sentry.setTag("wallet_address", account?.address);
 
         return (
-          <div
-            style={{ display: "flex", gap: 12, padding: "10px 0" }}
-            {...rest}
-          >
+          <div style={{ display: "flex", gap: 12 }} {...rest}>
             <InnerProvider>
               <InnerContext.Consumer>
                 {({ isMagicLoggedIn, chainId, globalAccount, disconnect }) => {
diff --git a/packages/react-kit/src/components/wallet/WalletConnectionProvider.tsx b/packages/react-kit/src/components/wallet/WalletConnectionProvider.tsx
index 50c9bc85e..1a4094fe5 100644
--- a/packages/react-kit/src/components/wallet/WalletConnectionProvider.tsx
+++ b/packages/react-kit/src/components/wallet/WalletConnectionProvider.tsx
@@ -1,6 +1,5 @@
 import "@rainbow-me/rainbowkit/styles.css";
 
-import { EnvironmentType } from "@bosonprotocol/core-sdk";
 import {
   AvatarComponent,
   darkTheme,
diff --git a/packages/react-kit/src/components/widgets/finance/Finance.tsx b/packages/react-kit/src/components/widgets/finance/Finance.tsx
index 37b19d666..9d5283d56 100644
--- a/packages/react-kit/src/components/widgets/finance/Finance.tsx
+++ b/packages/react-kit/src/components/widgets/finance/Finance.tsx
@@ -29,16 +29,19 @@ import {
   Currencies,
   CurrencyDisplay
 } from "../../currencyDisplay/CurrencyDisplay";
-import ThemedButton from "../../ui/ThemedButton";
 import { ExchangeTokensProps } from "./exchange-tokens/useExchangeTokens";
+import ThemedButton from "../../ui/ThemedButton";
+import { useAccount } from "../../../hooks/connection/connection";
 dayjs.extend(isBetween);
+const colors = theme.colors.light;
 const BosonButton = Button;
+
 const Table = styled.table`
   width: 100%;
   border-collapse: collapse;
   th {
     font-weight: 600;
-    color: ${theme.colors.light.darkGrey};
+    color: ${colors.darkGrey};
     :not([data-sortable]) {
       cursor: default !important;
     }
@@ -48,11 +51,10 @@ const Table = styled.table`
   }
   td {
     font-weight: 400;
-    color: ${theme.colors.light.black};
+    color: ${colors.black};
   }
   th,
   td {
-    font-family: "Plus Jakarta Sans";
     font-style: normal;
     font-size: 0.75rem;
     line-height: 1.5;
@@ -60,7 +62,7 @@ const Table = styled.table`
   thead {
     tr {
       th {
-        border-bottom: 2px solid ${theme.colors.light.border};
+        border-bottom: 2px solid ${colors.border};
         text-align: left;
         padding: 0.5rem;
         &:first-child {
@@ -76,13 +78,13 @@ const Table = styled.table`
     tr {
       :hover {
         td {
-          background-color: ${theme.colors.light.darkGrey}08;
+          background-color: ${colors.darkGrey}08;
           cursor: pointer;
         }
       }
       &:not(:last-child) {
         td {
-          border-bottom: 1px solid ${theme.colors.light.border};
+          border-bottom: 1px solid ${colors.border};
         }
       }
       td {
@@ -114,30 +116,30 @@ const HeaderSorter = styled.span`
 const Pagination = styled.div`
   width: 100%;
   padding-top: 1rem;
-  border-top: 2px solid ${theme.colors.light.border};
+  border-top: 2px solid ${colors.border};
 
   select {
     padding: 0.5rem;
-    border: 1px solid ${theme.colors.light.border};
-    background: ${theme.colors.light.white};
+    border: 1px solid ${colors.border};
+    background: ${colors.white};
     margin: 0 1rem;
   }
 `;
 const Span = styled.span`
   font-size: 0.75rem;
-  color: ${theme.colors.light.darkGrey};
+  color: ${colors.darkGrey};
   &:not(:last-of-type) {
     margin-right: 1rem;
   }
 `;
 
 const WithdrawButton = styled(ThemedButton)`
-  color: ${theme.colors.light.secondary};
+  color: ${colors.secondary};
   border-color: transparent;
 `;
 const WarningWrapper = styled(Grid)`
   svg {
-    color: ${theme.colors.light.orange};
+    color: ${colors.orange};
   }
 `;
 
@@ -214,7 +216,8 @@ export default function Finance({
   offersBacked,
   sellerRoles
 }: Props) {
-  const { showModal, modalTypes } = useModal();
+  const { address } = useAccount();
+  const { showModal } = useModal();
   const { funds, reload, fundStatus } = fundsData;
   const {
     isLoading: isLoadingExchangesTokens,
@@ -282,7 +285,7 @@ export default function Finance({
   const offersBackedCell = useCallback(
     (value: number | null) => {
       if (value === null) {
-        return "";
+        return null;
       }
       if (Number(value) < threshold) {
         return (
@@ -337,13 +340,17 @@ export default function Finance({
           action: (
             <Grid justifyContent="flex-end" gap="1rem">
               <WithdrawButton
-                theme="blank"
+                theme="outline"
                 size="small"
-                disabled={!sellerRoles.isClerk}
-                tooltip="This action is restricted to only the clerk wallet" // check
+                disabled={!sellerRoles.isAssistant || !address}
+                tooltip={
+                  address
+                    ? "This action is restricted to only the assistant wallet"
+                    : "Please connect your wallet"
+                }
                 onClick={() => {
                   showModal(
-                    modalTypes.FINANCE_WITHDRAW_MODAL,
+                    "FINANCE_WITHDRAW_MODAL",
                     {
                       title: `Withdraw ${fund.token.symbol}`,
                       protocolBalance: withdrawable,
@@ -364,9 +371,11 @@ export default function Finance({
               <BosonButton
                 variant="accentInverted"
                 size="small"
+                disabled={!address}
+                tooltip={"Please connect your wallet"}
                 onClick={() => {
                   showModal(
-                    modalTypes.FINANCE_DEPOSIT_MODAL,
+                    "FINANCE_DEPOSIT_MODAL",
                     {
                       title: `Deposit ${fund.token.symbol}`,
                       protocolBalance: withdrawable,
@@ -388,16 +397,15 @@ export default function Finance({
         };
       }),
     [
-      funds,
-      sellerLockedFunds,
       offersBackedCell,
-      offersBackedFn,
-      sellerRoles.isClerk,
-      showModal,
-      modalTypes.FINANCE_WITHDRAW_MODAL,
-      modalTypes.FINANCE_DEPOSIT_MODAL,
+      reloadData,
       sellerId,
-      reloadData
+      sellerLockedFunds,
+      showModal,
+      funds,
+      sellerRoles,
+      offersBackedFn,
+      address
     ]
   );
 
@@ -445,6 +453,10 @@ export default function Finance({
     );
   }, [pageCount, pageIndex]);
 
+  if (!address) {
+    return <p style={{ textAlign: "center" }}>Please connect your wallet</p>;
+  }
+
   if (!isFundsInitialized || isLoadingSellerData || isLoadingExchangesTokens) {
     return <Loading />;
   }
@@ -568,8 +580,7 @@ export default function Finance({
             <Grid justifyContent="flex-end" gap="1rem">
               <Button
                 size="small"
-                // theme="blank"
-                variant="secondaryFill" // check
+                theme="blank"
                 onClick={() => previousPage()}
                 disabled={!canPreviousPage}
               >
@@ -579,16 +590,15 @@ export default function Finance({
                 <Button
                   key={`page_btn_${pageNumber}`}
                   size="small"
-                  // theme="blank"
-                  variant="secondaryFill" // check
+                  theme="blank"
                   style={{
                     color:
                       pageNumber === pageIndex
-                        ? theme.colors.light.secondary
-                        : theme.colors.light.black,
+                        ? colors.secondary
+                        : colors.black,
                     background:
                       pageNumber === pageIndex
-                        ? theme.colors.light.lightGrey
+                        ? colors.lightGrey
                         : "transparent"
                   }}
                   onClick={() => gotoPage(pageNumber)}
@@ -598,8 +608,7 @@ export default function Finance({
               ))}
               <Button
                 size="small"
-                // theme="blank"
-                variant="secondaryFill" // check
+                theme="blank"
                 onClick={() => nextPage()}
                 disabled={!canNextPage}
               >
diff --git a/packages/react-kit/src/components/widgets/finance/FinanceWidget.tsx b/packages/react-kit/src/components/widgets/finance/FinanceWidget.tsx
index 68324ff3c..3cc84da9b 100644
--- a/packages/react-kit/src/components/widgets/finance/FinanceWidget.tsx
+++ b/packages/react-kit/src/components/widgets/finance/FinanceWidget.tsx
@@ -3,7 +3,6 @@ import isBetween from "dayjs/plugin/isBetween";
 
 import React, { useMemo } from "react";
 import styled from "styled-components";
-
 import useOffersBacked from "./useOffersBacked";
 import Loading from "../../ui/loading/Loading";
 import Finance, { Props } from "./Finance";
@@ -29,47 +28,66 @@ import {
 } from "../../config/ConfigProvider";
 import { CONFIG } from "../../../lib/config/config";
 import { MagicProvider } from "../../magicLink/MagicContext";
+import { SignerProvider } from "../../signer/SignerContext";
+import ConnectButton from "../../wallet/ConnectButton";
+import Grid from "../../ui/Grid";
+import { useCurrentSellers } from "../../../hooks/useCurrentSellers";
+import { useAccount } from "../../../hooks/connection/connection";
+import { useDisconnect } from "../../../hooks/connection/useDisconnect";
+import { ethers } from "ethers";
 dayjs.extend(isBetween);
 
+const StyledConnectButton = styled(ConnectButton)`
+  padding: 10px;
+`;
+
 const Wrapper = styled.div`
   text-align: center;
 `;
 
 function WithSellerData(WrappedComponent: React.ComponentType<Props>) {
-  const ComponentWithSellerData = (props: Pick<Props, "sellerId">) => {
+  const ComponentWithSellerData = (props: Partial<Pick<Props, "sellerId">>) => {
     const sellerId = props.sellerId;
-    const sellerRoles = useSellerRoles(sellerId || "");
+    const { address } = useAccount();
+    const { sellerIds } = useCurrentSellers({
+      address,
+      sellerId: sellerId,
+      enabled: !sellerId
+    });
+    const sellerIdToUse = sellerId || sellerIds?.[0] || "";
+    const { sellerRoles, seller } = useSellerRoles(sellerIdToUse);
     const {
       store: { tokens }
     } = useConvertionRate();
 
     const exchangesTokens = useExchangeTokens(
       {
-        sellerId: sellerId || ""
+        sellerId: sellerIdToUse
       },
       {
-        enabled: !!sellerId
+        enabled: !!sellerIdToUse
       }
     );
     const sellerDeposit = useSellerDeposit(
       {
-        sellerId: sellerId || ""
+        sellerId: sellerIdToUse
       },
-      { enabled: !!sellerId }
+      { enabled: !!sellerIdToUse }
     );
-    const funds = useFunds(sellerId || "", tokens);
+    const funds = useFunds(sellerIdToUse, tokens);
     const newProps = useMemo(
       () => ({
-        sellerId,
+        sellerId: sellerIdToUse,
         exchangesTokens,
         sellerDeposit,
         funds,
         sellerRoles
       }),
-      [sellerId, exchangesTokens, sellerDeposit, funds, sellerRoles]
+      [sellerIdToUse, exchangesTokens, sellerDeposit, funds, sellerRoles]
     );
 
     const offersBacked = useOffersBacked({ ...newProps });
+    const disconnect = useDisconnect();
 
     if (exchangesTokens.isLoading || sellerDeposit.isLoading) {
       return (
@@ -78,6 +96,39 @@ function WithSellerData(WrappedComponent: React.ComponentType<Props>) {
         </Wrapper>
       );
     }
+    if (!address) {
+      return <p style={{ textAlign: "center" }}>Please connect your wallet</p>;
+    }
+
+    if (!sellerIdToUse) {
+      return (
+        <p style={{ textAlign: "center" }}>
+          Connect a wallet that has a seller account
+        </p>
+      );
+    }
+    const forcedAccount =
+      sellerId && !sellerRoles.isAssistant ? seller?.assistant : "";
+    if (
+      forcedAccount &&
+      address &&
+      forcedAccount.toLowerCase() !== address.toLowerCase()
+    ) {
+      // force disconnection as the current connected wallet is not the forced one
+      disconnect();
+    }
+
+    if (forcedAccount) {
+      return (
+        <p style={{ textAlign: "center" }}>
+          Please connect this wallet account{" "}
+          <strong>{ethers.utils.getAddress(forcedAccount)}</strong> (which is
+          linked to the <strong>assistant</strong> role of the seller id{" "}
+          <strong>{sellerId}</strong>). The connected address is {address}
+        </p>
+      );
+    }
+
     return (
       <WrappedComponent {...props} {...newProps} offersBacked={offersBacked} />
     );
@@ -98,16 +149,20 @@ type FinanceWidgetProps = {
   walletConnectProjectId: string;
 } & Omit<ConfigProviderProps, "magicLinkKey" | "infuraKey"> &
   EnvironmentProviderProps &
-  ConvertionRateProviderProps &
-  Parameters<typeof Component>[0];
+  ConvertionRateProviderProps & {
+    parentOrigin: `http${string}` | undefined | null;
+    sellerId: string | null | undefined;
+  };
 
 const { infuraKey, magicLinkKey } = CONFIG;
+
 export function FinanceWidget({
   envName,
   configId,
   walletConnectProjectId,
   sellerId,
   metaTx,
+  parentOrigin,
   ...rest
 }: FinanceWidgetProps) {
   return (
@@ -121,19 +176,26 @@ export function FinanceWidget({
         infuraKey={infuraKey}
         {...rest}
       >
-        <MagicProvider>
-          <WalletConnectionProvider
-            walletConnectProjectId={walletConnectProjectId}
-          >
-            <QueryClientProvider client={queryClient}>
-              <ConvertionRateProvider>
-                <ModalProvider>
-                  <Component sellerId={sellerId} />
-                </ModalProvider>
-              </ConvertionRateProvider>
-            </QueryClientProvider>
-          </WalletConnectionProvider>
-        </MagicProvider>
+        <SignerProvider parentOrigin={parentOrigin}>
+          <MagicProvider>
+            <WalletConnectionProvider
+              walletConnectProjectId={walletConnectProjectId}
+            >
+              <QueryClientProvider client={queryClient}>
+                <ConvertionRateProvider>
+                  <ModalProvider>
+                    {!parentOrigin && (
+                      <Grid justifyContent="flex-end">
+                        <StyledConnectButton showChangeWallet />
+                      </Grid>
+                    )}
+                    <Component sellerId={sellerId ?? undefined} />
+                  </ModalProvider>
+                </ConvertionRateProvider>
+              </QueryClientProvider>
+            </WalletConnectionProvider>
+          </MagicProvider>
+        </SignerProvider>
       </ConfigProvider>
     </EnvironmentProvider>
   );
diff --git a/packages/react-kit/src/components/widgets/finance/convertion-rate/ConvertionRateProvider.tsx b/packages/react-kit/src/components/widgets/finance/convertion-rate/ConvertionRateProvider.tsx
index 526f00a02..2d72346de 100644
--- a/packages/react-kit/src/components/widgets/finance/convertion-rate/ConvertionRateProvider.tsx
+++ b/packages/react-kit/src/components/widgets/finance/convertion-rate/ConvertionRateProvider.tsx
@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { getDefaultTokens } from "../exchange-tokens/tokens";
 
 import { useTokens } from "../exchange-tokens/useTokens";
 import { saveItemInStorage } from "../storage/useLocalStorage";
diff --git a/packages/react-kit/src/components/widgets/finance/useSellerRoles.ts b/packages/react-kit/src/components/widgets/finance/useSellerRoles.ts
index 52aabc3d2..0b8b3052e 100644
--- a/packages/react-kit/src/components/widgets/finance/useSellerRoles.ts
+++ b/packages/react-kit/src/components/widgets/finance/useSellerRoles.ts
@@ -64,7 +64,7 @@ export function useSellerRoles(id: string) {
   );
 
   const sellerProps = useMemo(
-    () => ({
+    (): SellerRolesProps => ({
       isSeller: data !== null,
       isActive: data ? data?.active : false,
       isAdmin: data ? lowerCase(data?.admin) === lowerCase(address) : false,
@@ -79,5 +79,5 @@ export function useSellerRoles(id: string) {
     [data, address]
   );
 
-  return sellerProps as SellerRolesProps;
+  return { sellerRoles: sellerProps, seller: data };
 }
diff --git a/packages/react-kit/src/hooks/connection/connection.ts b/packages/react-kit/src/hooks/connection/connection.ts
index be98a7e7b..fc55ec20f 100644
--- a/packages/react-kit/src/hooks/connection/connection.ts
+++ b/packages/react-kit/src/hooks/connection/connection.ts
@@ -11,11 +11,18 @@ import {
 } from "../magic";
 import { useEthersSigner } from "../ethers/useEthersSigner";
 import { useConfigContext } from "../../components/config/ConfigContext";
+import { useExternalSigner } from "../../components/signer/useExternalSigner";
+import { useSignerAddress } from "../useSignerAddress";
 
 export function useAccount() {
   const { address: account } = useWagmiAccount();
   const { user } = useUser();
-  return useMemo(() => ({ address: account ?? user }), [account, user]);
+  const externalSigner = useExternalSigner();
+  const externalSignerAddress = useSignerAddress(externalSigner);
+  return useMemo(
+    () => ({ address: externalSignerAddress ?? account ?? user }),
+    [account, user, externalSignerAddress]
+  );
 }
 
 export function useChainId() {
diff --git a/packages/react-kit/src/hooks/connection/useDisconnect.ts b/packages/react-kit/src/hooks/connection/useDisconnect.ts
index 94fa154d1..010e65953 100644
--- a/packages/react-kit/src/hooks/connection/useDisconnect.ts
+++ b/packages/react-kit/src/hooks/connection/useDisconnect.ts
@@ -17,7 +17,6 @@ export const useDisconnect = () => {
     }
   }, [disconnectAsync, status]);
 
-
   return useCallback(async () => {
     remove();
     if (isMagicLoggedIn) {
diff --git a/packages/react-kit/src/hooks/useCoreSdk.tsx b/packages/react-kit/src/hooks/useCoreSdk.tsx
index 88d36f3d6..421f1e074 100644
--- a/packages/react-kit/src/hooks/useCoreSdk.tsx
+++ b/packages/react-kit/src/hooks/useCoreSdk.tsx
@@ -8,7 +8,7 @@ import {
 } from "@bosonprotocol/core-sdk";
 import { EthersAdapter, Provider } from "@bosonprotocol/ethers-sdk";
 import { IpfsMetadataStorage } from "@bosonprotocol/ipfs-storage";
-import { LensContracts } from "@bosonprotocol/common";
+import { LensContracts, Web3LibAdapter } from "@bosonprotocol/common";
 import { providers } from "ethers";
 
 export type CoreSdkConfig = {
@@ -63,6 +63,8 @@ export type CoreSdkConfig = {
   lensContracts?: LensContracts;
 };
 
+type CoreSdkOverrides = { web3Lib?: Web3LibAdapter };
+
 /**
  * Hook that initializes an instance of `CoreSDK` from the `@bosonprotocol/core-sdk`
  * package. The instance will be reinitialized when the passed in `web3Provider`
@@ -70,21 +72,26 @@ export type CoreSdkConfig = {
  * @param config - Configuration arguments.
  * @returns Instance of `CoreSDK`.
  */
-export function useCoreSdk(config: CoreSdkConfig) {
-  const [coreSdk, setCoreSdk] = useState<CoreSDK>(initCoreSdk(config));
+export function useCoreSdk(
+  config: CoreSdkConfig,
+  overrides?: CoreSdkOverrides
+): CoreSDK {
+  const [coreSdk, setCoreSdk] = useState<CoreSDK>(
+    initCoreSdk(config, overrides)
+  );
 
   useEffect(() => {
-    const newCoreSdk = initCoreSdk(config);
+    const newCoreSdk = initCoreSdk(config, overrides);
     setCoreSdk(newCoreSdk);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [config.web3Provider, config.configId]);
+  }, [config.web3Provider, config.configId, overrides]);
 
   return coreSdk;
 }
 
-function initCoreSdk(config: CoreSdkConfig) {
+function initCoreSdk(config: CoreSdkConfig, overrides?: CoreSdkOverrides) {
   const defaultConfig = getEnvConfigById(config.envName, config.configId);
-  const connectedProvider =
+  const getConnectedProvider = () =>
     config.web3Provider ||
     createDefaultProvider(config.jsonRpcUrl || defaultConfig.jsonRpcUrl);
   const metadataStorageUrl =
@@ -97,7 +104,7 @@ function initCoreSdk(config: CoreSdkConfig) {
 
   const instance = new CoreSDK({
     ...defaultConfig,
-    web3Lib: new EthersAdapter(connectedProvider),
+    web3Lib: overrides?.web3Lib ?? new EthersAdapter(getConnectedProvider()),
     protocolDiamond:
       config.protocolDiamond || defaultConfig.contracts.protocolDiamond,
     subgraphUrl: config.subgraphUrl || defaultConfig.subgraphUrl,
diff --git a/packages/react-kit/src/hooks/useCoreSdkOverrides.ts b/packages/react-kit/src/hooks/useCoreSdkOverrides.ts
new file mode 100644
index 000000000..cbaec55a0
--- /dev/null
+++ b/packages/react-kit/src/hooks/useCoreSdkOverrides.ts
@@ -0,0 +1,16 @@
+import { useMemo } from "react";
+import { useExternalSigner } from "../components/signer/useExternalSigner";
+import { CoreSdkConfig, useCoreSdk } from "./useCoreSdk";
+
+export const useCoreSdkOverrides = ({
+  coreSdkConfig
+}: {
+  coreSdkConfig: CoreSdkConfig;
+}) => {
+  const externalSigner = useExternalSigner();
+  const overrides = useMemo(() => {
+    return externalSigner ? { web3Lib: externalSigner } : undefined;
+  }, [externalSigner]);
+  const coreSdk = useCoreSdk(coreSdkConfig, overrides);
+  return coreSdk;
+};
diff --git a/packages/react-kit/src/hooks/useCoreSdkWithContext.ts b/packages/react-kit/src/hooks/useCoreSdkWithContext.ts
index 2ee2a7be4..8abcff2ad 100644
--- a/packages/react-kit/src/hooks/useCoreSdkWithContext.ts
+++ b/packages/react-kit/src/hooks/useCoreSdkWithContext.ts
@@ -3,26 +3,34 @@ import { getEnvConfigById, hooks } from "..";
 import { useEnvContext } from "../components/environment/EnvironmentContext";
 import { Token } from "../components/widgets/finance/convertion-rate/ConvertionRateContext";
 import { useSigner } from "./connection/connection";
+import { useMemo } from "react";
+import { useExternalSigner } from "../components/signer/useExternalSigner";
 
 export function useCoreSDKWithContext() {
   const { envName, configId, metaTx } = useEnvContext();
+  const externalSigner = useExternalSigner();
   const signer = useSigner();
   const defaultConfig = getEnvConfigById(envName, configId);
-
-  return hooks.useCoreSdk({
-    envName,
-    configId,
-    web3Provider: signer?.provider as providers.Web3Provider,
-    metaTx: {
-      ...defaultConfig.metaTx,
-      apiKey: metaTx?.apiKey,
-      apiIds: getMetaTxApiIds(
-        defaultConfig.contracts.protocolDiamond,
-        defaultConfig.defaultTokens || [],
-        metaTx?.apiIds
-      )
-    }
-  });
+  const overrides = useMemo(() => {
+    return externalSigner ? { web3Lib: externalSigner } : undefined;
+  }, [externalSigner]);
+  return hooks.useCoreSdk(
+    {
+      envName,
+      configId,
+      web3Provider: signer?.provider as providers.Web3Provider,
+      metaTx: {
+        ...defaultConfig.metaTx,
+        apiKey: metaTx?.apiKey,
+        apiIds: getMetaTxApiIds(
+          defaultConfig.contracts.protocolDiamond,
+          defaultConfig.defaultTokens || [],
+          metaTx?.apiIds
+        )
+      }
+    },
+    overrides
+  );
 }
 
 function getMetaTxApiIds(
diff --git a/packages/react-kit/src/hooks/useCurrentSellers.ts b/packages/react-kit/src/hooks/useCurrentSellers.ts
index 7f2140e66..50b5c2569 100644
--- a/packages/react-kit/src/hooks/useCurrentSellers.ts
+++ b/packages/react-kit/src/hooks/useCurrentSellers.ts
@@ -15,10 +15,16 @@ interface Props {
   address?: string;
   sellerId?: string;
   lensTokenId?: string;
+  enabled?: boolean;
 }
 
 const getSellersByIds =
-  (coreSDK: CoreSDK) => (sellerIds: string[], isSellerId: boolean) => {
+  (coreSDK: CoreSDK) =>
+  (
+    sellerIds: string[],
+    isSellerId: boolean,
+    { enabled }: Pick<Props, "enabled">
+  ) => {
     const resultSellerByIds = useQuery(
       ["seller-by-ids", { sellerIds }],
       async () => {
@@ -88,7 +94,7 @@ const getSellersByIds =
         return result.sellers;
       },
       {
-        enabled: isSellerId
+        enabled: isSellerId && enabled
       }
     );
     return resultSellerByIds;
@@ -101,11 +107,9 @@ const getSellersByIds =
  * @param
  * @returns
  */
-export function useCurrentSellers({
-  address,
-  sellerId,
-  lensTokenId
-}: Props = {}) {
+export function useCurrentSellers(
+  { address, sellerId, lensTokenId, enabled }: Props = { enabled: true }
+) {
   const coreSDK = useCoreSDKWithContext();
   const fetchSellers = getSellersByIds(coreSDK);
   const { address: loggedInUserAddress } = useAccount();
@@ -165,13 +169,14 @@ export function useCurrentSellers({
       };
     },
     {
-      enabled: enableResultByAddress
+      enabled: enableResultByAddress && enabled
     }
   );
   const enableResultById = !!sellerAddress && sellerAddressType === "SELLER_ID";
   const { data: sellers } = fetchSellers(
     typeof sellerAddress === "string" ? [sellerAddress] : [],
-    enableResultById
+    enableResultById,
+    { enabled }
   );
 
   const resultById = useQuery(
@@ -188,7 +193,7 @@ export function useCurrentSellers({
       );
     },
     {
-      enabled: enableResultById
+      enabled: enableResultById && enabled
     }
   );
 
@@ -243,7 +248,7 @@ export function useCurrentSellers({
       );
     },
     {
-      enabled: enableResultLensId
+      enabled: enableResultLensId && enabled
     }
   );
 
@@ -262,7 +267,8 @@ export function useCurrentSellers({
   const enableSellerById = !!sellerIdsToQuery?.length;
   const { data: sellers2, refetch: refetchFetchSellers } = fetchSellers(
     sellerIdsToQuery,
-    enableSellerById
+    enableSellerById,
+    { enabled }
   );
   const sellerById = useQuery(
     ["current-seller-by-id", { sellerIds: sellerIdsToQuery, sellers2 }],
@@ -288,7 +294,7 @@ export function useCurrentSellers({
       };
     },
     {
-      enabled: enableSellerById
+      enabled: enableSellerById && enabled
     }
   );
   const sellerValues = useMemo(
@@ -319,7 +325,7 @@ export function useCurrentSellers({
       profileIds
     },
     {
-      enabled: enableResultLens
+      enabled: enableResultLens && enabled
     }
   );
   const lens: Profile[] = useMemo(() => {
diff --git a/packages/react-kit/src/hooks/useSignerAddress.tsx b/packages/react-kit/src/hooks/useSignerAddress.tsx
index 96d263904..e1fb937b0 100644
--- a/packages/react-kit/src/hooks/useSignerAddress.tsx
+++ b/packages/react-kit/src/hooks/useSignerAddress.tsx
@@ -1,19 +1,17 @@
-import { Provider } from "@bosonprotocol/ethers-sdk";
+import { Web3LibAdapter } from "@bosonprotocol/common";
+
 import { useEffect, useState } from "react";
 
-export function useSignerAddress(providerFromConfig?: Provider) {
+export function useSignerAddress(web3Lib: Web3LibAdapter | undefined) {
   const [signerAddress, setSignerAddress] = useState<string | undefined>();
 
   useEffect(() => {
-    if (
-      providerFromConfig &&
-      providerFromConfig.getSigner &&
-      providerFromConfig.getSigner()
-    ) {
-      providerFromConfig
-        .getSigner()
-        .getAddress()
-        .then(setSignerAddress)
+    if (web3Lib?.getSignerAddress) {
+      web3Lib
+        .getSignerAddress()
+        .then((address) => {
+          setSignerAddress(address);
+        })
         .catch((e) => {
           console.error(e);
           setSignerAddress(undefined);
@@ -21,7 +19,7 @@ export function useSignerAddress(providerFromConfig?: Provider) {
     }
 
     return () => setSignerAddress(undefined);
-  }, [providerFromConfig]);
+  }, [web3Lib]);
 
   return signerAddress;
 }
diff --git a/packages/react-kit/src/index.tsx b/packages/react-kit/src/index.tsx
index bec054af2..89a8e3774 100644
--- a/packages/react-kit/src/index.tsx
+++ b/packages/react-kit/src/index.tsx
@@ -46,3 +46,5 @@ export * from "./lib/magicLink/logout";
 export * from "./lib/magicLink/provider";
 export * from "./lib/const/networks";
 export * from "./lib/errors/transactions";
+export * from "./lib/signer/externalSigner";
+export * from "./lib/signer/useCallSignerFromIframe";
diff --git a/packages/react-kit/src/lib/signer/externalSigner.ts b/packages/react-kit/src/lib/signer/externalSigner.ts
new file mode 100644
index 000000000..716c4ea26
--- /dev/null
+++ b/packages/react-kit/src/lib/signer/externalSigner.ts
@@ -0,0 +1,195 @@
+import {
+  Web3LibAdapter,
+  TransactionRequest,
+  TransactionResponse,
+  TransactionReceipt
+} from "@bosonprotocol/common";
+import { BigNumberish } from "ethers";
+import { useEffect, useMemo, useState } from "react";
+
+const getDefaultHandleSignerFunction = <R>({
+  parentOrigin,
+  functionName,
+  args
+}: {
+  parentOrigin: string;
+  functionName: keyof Web3LibAdapter;
+  args: unknown[] | undefined;
+}): Promise<R> => {
+  return new Promise<R>((resolve, reject) => {
+    function onMessageReceived(event: MessageEvent) {
+      if (event.origin === parentOrigin) {
+        if (event.data.function === functionName) {
+          if (event.data.error) {
+            reject(new Error(event.data.error));
+          } else if (event.data.result) {
+            resolve(event.data.result);
+          }
+          window.removeEventListener("message", onMessageReceived);
+        }
+      }
+    }
+    window.addEventListener("message", onMessageReceived);
+    window.parent.postMessage(
+      {
+        function: functionName,
+        args
+      },
+      parentOrigin
+    );
+  });
+};
+
+const getExternalSignerListener = ({
+  parentOrigin
+}: {
+  parentOrigin: `http${string}`;
+}): Web3LibAdapter => {
+  return {
+    getSignerAddress: (): Promise<string> => {
+      return getDefaultHandleSignerFunction<string>({
+        parentOrigin,
+        functionName: "getSignerAddress",
+        args: undefined
+      });
+    },
+    getChainId: async (): Promise<number> => {
+      return getDefaultHandleSignerFunction<number>({
+        parentOrigin,
+        functionName: "getChainId",
+        args: undefined
+      });
+    },
+    getBalance: async (...args): Promise<BigNumberish> => {
+      return getDefaultHandleSignerFunction<BigNumberish>({
+        parentOrigin,
+        functionName: "getBalance",
+        args
+      });
+    },
+    sendTransaction: async (
+      transactionRequest: TransactionRequest
+    ): Promise<TransactionResponse> => {
+      return new Promise<TransactionResponse>((resolve, reject) => {
+        const functionName = "sendTransaction";
+        function onMessageReceived(event: MessageEvent) {
+          if (event.origin === parentOrigin) {
+            if (event.data.function === functionName) {
+              if (event.data.error) {
+                reject(new Error(event.data.error));
+              } else if (event.data.result) {
+                const txResponseWithoutWait = event.data.result;
+                resolve({
+                  ...txResponseWithoutWait,
+                  wait: async (
+                    confirmations?: number
+                  ): Promise<TransactionReceipt> => {
+                    return new Promise<TransactionReceipt>(
+                      (resolve, reject) => {
+                        function onWaitMessageReceived(event: MessageEvent) {
+                          if (event.origin === parentOrigin) {
+                            if (
+                              event.data.function === "wait" &&
+                              event.data.originalFunction === functionName
+                            ) {
+                              if (event.data.error) {
+                                reject(new Error(event.data.error));
+                              } else if (event.data.result) {
+                                resolve(event.data.result);
+                              }
+                              window.removeEventListener(
+                                "message",
+                                onWaitMessageReceived
+                              );
+                            }
+                          }
+                        }
+                        window.addEventListener(
+                          "message",
+                          onWaitMessageReceived
+                        );
+                        window.parent.postMessage(
+                          {
+                            originalFunction: functionName,
+                            originalArgs: [transactionRequest],
+                            txResponse: txResponseWithoutWait,
+                            function: "wait",
+                            args:
+                              confirmations === undefined ? [] : [confirmations]
+                          },
+                          "*"
+                        );
+                      }
+                    );
+                  }
+                });
+              }
+            }
+          }
+        }
+        window.addEventListener("message", onMessageReceived);
+        window.parent.postMessage(
+          {
+            function: functionName,
+            args: [transactionRequest]
+          },
+          parentOrigin
+        );
+      });
+    },
+    call: async (...args): Promise<string> => {
+      return getDefaultHandleSignerFunction<string>({
+        parentOrigin,
+        functionName: "call",
+        args
+      });
+    },
+    send: async (...args): Promise<string> => {
+      return getDefaultHandleSignerFunction<string>({
+        parentOrigin,
+        functionName: "send",
+        args
+      });
+    },
+    getTransactionReceipt: async (...args): Promise<TransactionReceipt> => {
+      return getDefaultHandleSignerFunction<TransactionReceipt>({
+        parentOrigin,
+        functionName: "getTransactionReceipt",
+        args
+      });
+    }
+  };
+};
+
+export const useProvideExternalSigner = ({
+  parentOrigin
+}: {
+  parentOrigin: `http${string}` | null | undefined;
+}) => {
+  const externalSignerListener = useMemo(
+    () =>
+      parentOrigin ? getExternalSignerListener({ parentOrigin }) : undefined,
+    [parentOrigin]
+  );
+  const [externalSigner, setExternalSigner] = useState<
+    Web3LibAdapter | undefined
+  >();
+  useEffect(() => {
+    function onMessageReceived(event: MessageEvent) {
+      if (event.origin === parentOrigin) {
+        if ([true, false].includes(event.data.hasSigner)) {
+          if (event.data.hasSigner) {
+            setExternalSigner(externalSignerListener);
+          } else {
+            setExternalSigner(undefined);
+          }
+        }
+      }
+    }
+    window.addEventListener("message", onMessageReceived);
+    return () => {
+      window.removeEventListener("message", onMessageReceived);
+    };
+  }, [externalSigner, externalSignerListener, parentOrigin]);
+  return externalSigner;
+};
diff --git a/packages/react-kit/src/lib/signer/useCallSignerFromIframe.ts b/packages/react-kit/src/lib/signer/useCallSignerFromIframe.ts
new file mode 100644
index 000000000..e1a708fa9
--- /dev/null
+++ b/packages/react-kit/src/lib/signer/useCallSignerFromIframe.ts
@@ -0,0 +1,134 @@
+import { TransactionResponse } from "@bosonprotocol/common";
+import { EthersAdapter, Provider } from "@bosonprotocol/ethers-sdk";
+import { Signer } from "ethers";
+import { RefObject, useEffect, useMemo, useState } from "react";
+type TransactionResponseHash = string;
+export const useCallSignerFromIframe = ({
+  signer,
+  iframeRef,
+  isIframeLoaded,
+  childIframeOrigin
+}: {
+  signer: Signer | undefined;
+  iframeRef: RefObject<HTMLIFrameElement>;
+  isIframeLoaded: boolean;
+  childIframeOrigin: `http${string}`;
+}) => {
+  const ethersSigner = useMemo(
+    () =>
+      signer?.provider ? new EthersAdapter(signer.provider as Provider) : null,
+    [signer]
+  );
+  const [txMap, setTxMap] = useState(
+    new Map<TransactionResponseHash, TransactionResponse>()
+  );
+  useEffect(() => {
+    if (ethersSigner) {
+      setTxMap(new Map<TransactionResponseHash, TransactionResponse>());
+    }
+  }, [ethersSigner]);
+  useEffect(() => {
+    async function onMessageReceived(event: MessageEvent) {
+      if (event.origin === childIframeOrigin) {
+        const functionName = event.data.function;
+        if (functionName === "wait") {
+          const commonPostMessage = {
+            function: functionName,
+            originalFunction: event.data.originalFunction
+          };
+          try {
+            const txResponseWithoutWait = event.data.txResponse;
+            const args = event.data.args ?? [];
+            const txResponseWithWait = txMap.get(txResponseWithoutWait.hash);
+            if (txResponseWithWait) {
+              const txReceipt = await txResponseWithWait.wait(...args);
+              iframeRef.current?.contentWindow?.postMessage(
+                {
+                  ...commonPostMessage,
+                  result: txReceipt
+                },
+                childIframeOrigin
+              );
+            }
+          } catch (error) {
+            console.error(error);
+            const eventMessage = {
+              ...commonPostMessage,
+              error:
+                error && typeof error === "object" && "message" in error
+                  ? error.message
+                  : error
+            };
+            iframeRef.current?.contentWindow?.postMessage(
+              eventMessage,
+              childIframeOrigin
+            );
+          }
+        } else if (functionName) {
+          const fn: keyof typeof EthersAdapter["prototype"] = functionName;
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const args: any[] = event.data.args ?? [];
+
+          try {
+            const result = await ethersSigner?.[fn]?.(args[0], args[1]);
+            if (
+              functionName === "sendTransaction" &&
+              typeof result === "object" &&
+              "wait" in result
+            ) {
+              const txResponse = result;
+              // the wait function can not be serialized when sending the txResponse over postMessage so we exclude it
+              // eslint-disable-next-line @typescript-eslint/no-unused-vars
+              const { wait, ...txResponseWithoutWait } = txResponse;
+              txMap.set(txResponse.hash, txResponse);
+              const eventMessage = {
+                function: functionName,
+                result: txResponseWithoutWait
+              };
+              iframeRef.current?.contentWindow?.postMessage(
+                eventMessage,
+                childIframeOrigin
+              );
+            } else {
+              const eventMessage = {
+                function: functionName,
+                result
+              };
+              iframeRef.current?.contentWindow?.postMessage(
+                eventMessage,
+                childIframeOrigin
+              );
+            }
+          } catch (error) {
+            console.error(error);
+            const eventMessage = {
+              function: functionName,
+              error:
+                error && typeof error === "object" && "message" in error
+                  ? error.message
+                  : error
+            };
+            iframeRef.current?.contentWindow?.postMessage(
+              eventMessage,
+              childIframeOrigin
+            );
+          }
+        }
+      }
+    }
+    if (isIframeLoaded) {
+      iframeRef.current?.contentWindow?.postMessage(
+        {
+          hasSigner: !!ethersSigner
+        },
+        childIframeOrigin
+      );
+      if (ethersSigner) {
+        window.addEventListener("message", onMessageReceived);
+      }
+    }
+    return () => {
+      window.removeEventListener("message", onMessageReceived);
+    };
+  }, [ethersSigner, iframeRef, isIframeLoaded, txMap, childIframeOrigin]);
+};
diff --git a/packages/react-kit/src/stories/helpers/connect-wallet.ts b/packages/react-kit/src/stories/helpers/connect-wallet.ts
index 32c3d6a39..e6d40c065 100644
--- a/packages/react-kit/src/stories/helpers/connect-wallet.ts
+++ b/packages/react-kit/src/stories/helpers/connect-wallet.ts
@@ -2,7 +2,7 @@ import { initializeConnector } from "@web3-react/core";
 import { MetaMask } from "@web3-react/metamask";
 
 export const [metaMask, hooks] = initializeConnector<MetaMask>(
-  (actions) => new MetaMask(actions, true)
+  (actions) => new MetaMask(actions)
 );
 
 export function connectWallet(chainId?: number) {