From dbfa2f7128e3442e2921d47d72d422b4572a16e1 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 15 Mar 2026 00:29:59 +0000
Subject: [PATCH] Rework

---
 .../xpipe/app/hub/comp/StoreCategoryIconComp.java   |  2 +-
 .../java/io/xpipe/app/pwman/OnePasswordManager.java | 13 ++++++++-----
 lang/strings/translations_en.properties             |  6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java
index aa6f01f0e..7a05a776f 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java
@@ -22,7 +22,7 @@ public class StoreCategoryIconComp extends SimpleRegionBuilder {
     protected Region createSimple() {
         var imageComp = PrettyImageHelper.ofFixedSize(wrapper.getIconFile(), size, size);
         var storeIcon = imageComp.build();
-        storeIcon.setPadding(new Insets(0, 0, 1, 0));
+        storeIcon.setPadding(new Insets(0, 0, 1.5, 0));
 
         var dots = new FontIcon("mdi2d-dots-horizontal");
         dots.setIconSize((int) (size * 1.1));
diff --git a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java
index c04841c70..65d099692 100644
--- a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java
+++ b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java
@@ -130,7 +130,7 @@ public class OnePasswordManager implements PasswordManager {
         availableAccounts.clear();
         availableAccounts.putAll(accounts);
         if (availableAccounts.isEmpty()) {
-            throw ErrorEventFactory.expected(new IllegalStateException("No accounts are registered to the 1password CLI"));
+            return null;
         }
         return availableAccounts.entrySet().iterator().next().getValue();
     }
@@ -176,12 +176,15 @@ public class OnePasswordManager implements PasswordManager {
         }
 
         try {
-            var account = getActiveAccount();
             var b = CommandBuilder.of()
                     .add("op", "item", "get")
-                    .addLiteral(name)
-                    .add("--account").addLiteral(account)
-                    .add("--format", "json");
+                    .addLiteral(name);
+            var account = getActiveAccount();
+            if (account != null) {
+                   b .add("--account")
+                        .addLiteral(account);
+            }
+            b.add("--format", "json");
             if (vault != null) {
                 b.add("--vault").addLiteral(vault);
             }
diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties
index 589069e38..9bb82805d 100644
--- a/lang/strings/translations_en.properties
+++ b/lang/strings/translations_en.properties
@@ -1602,9 +1602,11 @@ actionApiUrl=$URL$ (Copy json body)
 copyBody=Copy request body
 gitRepoTerminalOpen=Open repository in terminal
 gitRepoTerminalOpenDescription=Take a look at the repository yourself with the command-line
-gitRepoOverwriteLocal=Overwrite local repository
+#force
+gitRepoOverwriteLocal=Overwrite local changes
 gitRepoOverwriteLocalDescription=Replace all local changes with changes from the remote
-gitRepoForcePush=Overwrite remote repository
+#force
+gitRepoForcePush=Overwrite remote changes
 gitRepoForcePushDescription=Use git push --force to apply your local changes to the remote
 gitRepoDontWarn=Don't warn anymore
 gitRepoDontWarnDescription=If this is expected, make XPipe ignore this error in the future