From 58fcd8849a7ceb0a4bf2b579a0012462f0c3347b Mon Sep 17 00:00:00 2001
From: Regev Brody <regevb@nayax.com>
Date: Mon, 27 Jan 2025 16:00:34 +0200
Subject: [PATCH] fix: middleware sort issues

---
 packages/core/middleware/middleware-module.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/core/middleware/middleware-module.ts b/packages/core/middleware/middleware-module.ts
index 1935c82e786..b201eb39754 100644
--- a/packages/core/middleware/middleware-module.ts
+++ b/packages/core/middleware/middleware-module.ts
@@ -150,13 +150,17 @@ export class MiddlewareModule<
       ([moduleA], [moduleB]) => {
         const moduleARef = this.container.getModuleByKey(moduleA)!;
         const moduleBRef = this.container.getModuleByKey(moduleB)!;
-        if (moduleARef.distance === Number.MAX_VALUE) {
+        const isModuleAGlobal = moduleARef.distance === Number.MAX_VALUE;
+        const isModuleBGlobal = moduleBRef.distance === Number.MAX_VALUE;
+        if (isModuleAGlobal && isModuleBGlobal) {
+          return 0;
+        }
+        if (isModuleAGlobal) {
           return -1;
         }
-        if (moduleBRef.distance === Number.MAX_VALUE) {
+        if (isModuleBGlobal) {
           return 1;
         }
-
         return moduleARef.distance - moduleBRef.distance;
       },
     );