Merge branch 'development' into beta

ivpn · Jan 31, 2024 · 3a445ae · 3a445ae
2 parents 13b89bf + fbfaba4
commit 3a445ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/ui/References/macOS/HelperProjects/helper/IVPN Helper-Launchd.plist b/ui/References/macOS/HelperProjects/helper/IVPN Helper-Launchd.plist
@@ -12,6 +12,10 @@
 		<true/>
 	</dict>
 	<key>RunAtLoad</key>
-		<true/>
+	<true/>
+	<key>AssociatedBundleIdentifiers</key>
+	<array>
+		<string>com.electron.ivpn-ui</string>
+	</array>
 </dict>
 </plist>
diff --git a/ui/src/components/Component-Init.vue b/ui/src/components/Component-Init.vue
@@ -33,6 +33,13 @@
             Not connected to daemon. Please, ensure IVPN daemon is running and
             try to reconnect.
           </div>
+          <div v-if="isMacOS" class="small_text">
+            Ensure that the <span>'IVPN'</span> background item is enabled in
+            your system settings. If it's not enabled, please turn it on and
+            then reboot your system. (<span
+              >General -> Login Items -> Allow in the Background</span
+            >)
+          </div>
           <div class="small_text">
             The latest version of the IVPN software can be downloaded from the
             <button
@@ -57,6 +64,7 @@
 
 <script>
 import spinner from "@/components/controls/control-spinner.vue";
+import { Platform, PlatformEnum } from "@/platform/platform";
 import { DaemonConnectionType } from "@/store/types";
 const sender = window.ipcSender;
 import config from "@/config";
@@ -121,6 +129,9 @@ export default {
     daemonIsOldVersionError: function () {
       return this.$store.state.daemonIsOldVersionError;
     },
+    isMacOS: function () {
+      return Platform() === PlatformEnum.macOS;
+    },
   },
   watch: {
     isConnecting() {