From d551ecd7fb00f5ffd9fb94a3c23d9c5195a81e6f Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Fri, 17 Apr 2020 19:29:03 +0100
Subject: [PATCH] fix: start on login (#1381)

License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
---
 public/locales/en/settings.json | 2 +-
 src/bundles/ipfs-desktop.js     | 6 ++++--
 src/settings/DesktopSettings.js | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/locales/en/settings.json b/public/locales/en/settings.json
index ec29df931..d9b261666 100644
--- a/public/locales/en/settings.json
+++ b/public/locales/en/settings.json
@@ -30,7 +30,7 @@
   "takeScreenshotDescription": "Use <0>{key1}</0> + <2>{key2}</2> + <3>{key3}</3> to take screenshots and add them to your repository.",
   "downloadHash": "Download hash",
   "downloadHashDescription": "Use <0>{key1}</0> + <2>{key2}</2> + <3>{key3}</3> to download the last copied hash or path to your system.",
-  "launchOnStartup": "Launch on startup",
+  "launchOnStartup": "Launch on login",
   "globalShortcuts": "Global Shortcuts",
   "globalShortcutsAre": "IPFS Desktop provides some features that can be globally accessed through keyboard shortcuts. You can enable or disable them here.",
   "AnalyticsToggle": {
diff --git a/src/bundles/ipfs-desktop.js b/src/bundles/ipfs-desktop.js
index 26f52d10f..21efbd940 100644
--- a/src/bundles/ipfs-desktop.js
+++ b/src/bundles/ipfs-desktop.js
@@ -34,6 +34,8 @@ if (window.ipfsDesktop) {
 
     selectDesktopSettings: state => state.ipfsDesktop,
 
+    selectDesktopPlatform: state => state.ipfsDesktop.platform,
+
     selectDesktopVersion: () => window.ipfsDesktop.version,
 
     selectDesktopCountlyDeviceId: () => window.ipfsDesktop.countlyDeviceId,
@@ -41,7 +43,7 @@ if (window.ipfsDesktop) {
     selectDesktopCountlyActions: () => window.ipfsDesktop.countlyActions,
 
     doDesktopStartListening: () => async ({ dispatch, store }) => {
-      window.ipfsDesktop.onConfigChanged(({ config, changed, success }) => {
+      window.ipfsDesktop.onConfigChanged(({ platform, config, changed, success }) => {
         const prevConfig = store.selectDesktopSettings()
 
         if (Object.keys(prevConfig).length === 0) {
@@ -82,7 +84,7 @@ if (window.ipfsDesktop) {
 
         dispatch({
           type: 'DESKTOP_SETTINGS_CHANGED',
-          payload: config
+          payload: config ? { ...config, platform } : undefined
         })
       })
     },
diff --git a/src/settings/DesktopSettings.js b/src/settings/DesktopSettings.js
index 94a727498..86202152a 100644
--- a/src/settings/DesktopSettings.js
+++ b/src/settings/DesktopSettings.js
@@ -1,5 +1,4 @@
 import React from 'react'
-import os from 'os'
 import { connect } from 'redux-bundler-react'
 import { withTranslation, Trans } from 'react-i18next'
 import Box from '../components/box/Box'
@@ -33,18 +32,18 @@ const CheckboxSetting = ({ children, title, ...props }) => (
 
 const Key = ({ children }) => <span className='monospace br2 bg-snow ph1'>{ children }</span>
 
-export function DesktopSettings ({ t, doDesktopSettingsToggle, desktopSettings }) {
+export function DesktopSettings ({ t, doDesktopSettingsToggle, desktopSettings, desktopPlatform }) {
   return (
     <Box className='mb3 pa4'>
       <Title>{t('ipfsDesktop')}</Title>
 
       <CheckboxSetting checked={desktopSettings.autoLaunch || false}
         title={t('launchOnStartup')}
-        disabled={!(['win32', 'darwin', 'linux'].includes(os.platform()) && process.env.NODE_ENV !== 'development')}
+        disabled={!(['win32', 'darwin', 'linux'].includes(desktopPlatform))}
         onChange={() => doDesktopSettingsToggle('autoLaunch')} />
       <CheckboxSetting checked={desktopSettings.ipfsOnPath || false}
         title={t('ipfsCmdTools')}
-        disabled={os.platform() === 'win32'}
+        disabled={desktopPlatform === 'win32'}
         onChange={() => doDesktopSettingsToggle('ipfsOnPath')}>
         <Trans
           i18nKey='ipfsCmdToolsDescription'
@@ -89,6 +88,7 @@ export const TranslatedDesktopSettings = withTranslation('settings')(DesktopSett
 
 export default connect(
   'selectDesktopSettings',
+  'selectDesktopPlatform',
   'doDesktopSettingsToggle',
   TranslatedDesktopSettings
 )