Merge branch 'develop' into feat/refactor_supabase_services

Author: bitbeckers

src/lib/marketplace/EOACreateOrderStrategy.ts

@@ -17,7 +17,7 @@ import { MarketplaceOrdersService } from "../../services/database/entities/Marke
 
 @injectable()
 export default class EOACreateOrderStrategy extends MarketplaceStrategy {
-  private request!: EOACreateOrderRequest;
+  private request!: Omit<EOACreateOrderRequest, "type">;
 
   constructor(
     @inject(MarketplaceOrdersService)
@@ -26,7 +26,7 @@ export default class EOACreateOrderStrategy extends MarketplaceStrategy {
     super();
   }
 
-  initialize(request: EOACreateOrderRequest): this {
+  initialize(request: Omit<EOACreateOrderRequest, "type">): this {
     this.request = request;
     return this;
   }

src/lib/marketplace/MarketplaceStrategyFactory.ts

@@ -8,14 +8,15 @@ import MultisigCreateOrderStrategy from "./MultisigCreateOrderStrategy.js";
 import { container } from "tsyringe";
 
 export function createMarketplaceStrategy(
-  request: MultisigCreateOrderRequest | EOACreateOrderRequest,
+  type,
+  ...request: MultisigCreateOrderRequest | EOACreateOrderRequest,
 ): MarketplaceStrategy {
-  switch (request.type) {
+  switch (type) {
     case "eoa": {
-      return container.resolve(EOACreateOrderStrategy).initialize(request);
+      return container.resolve(EOACreateOrderStrategy).initialize(request as Omit<EOACreateOrderRequest, "type">);
     }
     case "multisig": {
-      return container.resolve(MultisigCreateOrderStrategy).initialize(request);
+      return container.resolve(MultisigCreateOrderStrategy).initialize(request as Omit<MultisigCreateOrderRequest, "type">);
     }
     default:
       throw new Error("Invalid marketplace request type");

src/lib/marketplace/MultisigCreateOrderStrategy.ts

@@ -33,7 +33,7 @@ type OrderDetails = SafeCreateOrderMessage["message"];
 @injectable()
 export default class MultisigCreateOrderStrategy extends MarketplaceStrategy {
   private safeApiKit!: SafeApiKit.default;
-  private request!: MultisigCreateOrderRequest;
+  private request!: Omit<MultisigCreateOrderRequest, "type">;
 
   constructor(
     @inject(MarketplaceOrdersService)
@@ -44,7 +44,7 @@ export default class MultisigCreateOrderStrategy extends MarketplaceStrategy {
     super();
   }
 
-  initialize(request: MultisigCreateOrderRequest): this {
+  initialize(request: Omit<MultisigCreateOrderRequest, "type">): this {
     this.safeApiKit = SafeApiStrategyFactory.getStrategy(
       request.chainId,
     ).createInstance();