From 4f1009aad7199c6e4a13ee84ea139d196202c5c7 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 2 Jun 2024 14:23:33 +0000
Subject: [PATCH] Merge fixes

---
 app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java | 1 +
 app/src/main/java/module-info.java                            | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
index 92a9c76b..49bbcae0 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
@@ -410,6 +410,7 @@ public abstract class StoreEntryComp extends SimpleComp {
             var move = new Menu(AppI18n.get("moveTo"), new FontIcon("mdi2f-folder-move-outline"));
             StoreViewState.get()
                     .getSortedCategories(wrapper.getCategory().getValue().getRoot())
+                    .getList()
                     .forEach(storeCategoryWrapper -> {
                         MenuItem m = new MenuItem();
                         m.textProperty().setValue("  ".repeat(storeCategoryWrapper.getDepth()) + storeCategoryWrapper.getName().getValue());
diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java
index a5a0f64f..36bd6ba7 100644
--- a/app/src/main/java/module-info.java
+++ b/app/src/main/java/module-info.java
@@ -113,7 +113,6 @@ open module io.xpipe.app {
             AppJacksonModule;
     provides ModuleLayerLoader with
             DataStorageExtensionProvider.Loader,
-            MessageExchangeImpls.Loader,
             DataStoreProviders.Loader,
             ActionProvider.Loader,
             PrefsProvider.Loader,