fix electron dark mode bug. fix add identities immer issue

shared/desktop/app/main-window.desktop.tsx

@@ -1,4 +1,5 @@
 import URL from 'url-parse'
+import * as SafeElectron from '../../util/safe-electron.desktop'
 import * as Electron from 'electron'
 import * as ConfigGen from '../../actions/config-gen'
 import * as fs from 'fs'
@@ -132,7 +133,7 @@ const loadWindowState = () => {
       switch (darkMode) {
         case 'system':
           darkModePreference = darkMode
-          isDarkMode = isDarwin && Electron.systemPreferences.isDarkMode()
+          isDarkMode = SafeElectron.workingIsDarkMode()
           break
         case 'alwaysDark':
           darkModePreference = darkMode

shared/desktop/renderer/main.desktop.tsx

@@ -5,6 +5,6 @@ import {_setSystemIsDarkMode, _setSystemSupported} from '../../styles/dark-mode'
 import {isDarwin} from '../../constants/platform'
 import * as SafeElectron from '../../util/safe-electron.desktop'
 
-_setSystemIsDarkMode(isDarwin && SafeElectron.getSystemPreferences().isDarkMode())
+_setSystemIsDarkMode(SafeElectron.workingIsDarkMode())
 _setSystemSupported(isDarwin)
 require('./main2.desktop')

shared/desktop/renderer/main2.desktop.tsx

@@ -170,7 +170,7 @@ const setupDarkMode = () => {
       () => {
         store.dispatch(
           ConfigGen.createSetSystemDarkMode({
-            dark: isDarwin && SafeElectron.getSystemPreferences().isDarkMode(),
+            dark: SafeElectron.workingIsDarkMode(),
           })
         )
       }

shared/profile/generic/proofs-list/container.tsx

@@ -6,29 +6,24 @@ import openURL from '../../../util/open-url'
 
 type OwnProps = RouteProps
 
-const mapStateToProps = state => ({
-  _proofSuggestions: state.tracker2.proofSuggestions,
-})
-
-const mapDispatchToProps = dispatch => ({
-  onCancel: () => dispatch(RouteTreeGen.createNavigateUp()),
-  providerClicked: (key: string) => dispatch(ProfileGen.createAddProof({platform: key, reason: 'profile'})),
-})
-
-const mergeProps = (stateProps, dispatchProps, _: OwnProps) => ({
-  onCancel: dispatchProps.onCancel,
-  onClickLearn: () => openURL('https://keybase.io/docs/proof_integration_guide'),
-  providerClicked: dispatchProps.providerClicked,
-  providers: stateProps._proofSuggestions
-    .map(s => ({
+export default namedConnect(
+  state => ({_proofSuggestions: state.tracker2.proofSuggestions}),
+  dispatch => ({
+    onCancel: () => dispatch(RouteTreeGen.createNavigateUp()),
+    providerClicked: (key: string) => dispatch(ProfileGen.createAddProof({platform: key, reason: 'profile'})),
+  }),
+  (stateProps, dispatchProps, _: OwnProps) => ({
+    onCancel: dispatchProps.onCancel,
+    onClickLearn: () => openURL('https://keybase.io/docs/proof_integration_guide'),
+    providerClicked: dispatchProps.providerClicked,
+    providers: stateProps._proofSuggestions.map(s => ({
       desc: s.pickerSubtext,
       icon: s.pickerIcon,
       key: s.assertionKey,
       name: s.pickerText,
       new: s.metas.some(({label}) => label === 'new'),
-    }))
-    .toArray(),
-  title: 'Prove your...',
-})
-
-export default namedConnect(mapStateToProps, mapDispatchToProps, mergeProps, 'ProofsList')(ProofsList)
+    })),
+    title: 'Prove your...',
+  }),
+  'ProofsList'
+)(ProofsList)

shared/util/safe-electron.desktop.tsx

@@ -27,6 +27,14 @@ export const getApp = () => {
   return app
 }
 
+// some kind of electron bug
+// https://github.com/electron/electron/issues/19125
+export const workingIsDarkMode = () => {
+  const platform = process.platform
+  const isDarwin = platform === 'darwin'
+  return isDarwin && getSystemPreferences().getUserDefault('AppleInterfaceStyle', 'string') == 'Dark'
+}
+
 export const getSystemPreferences = () => {
   const systemPreferences = Electron.systemPreferences || getRemote().systemPreferences
   if (!systemPreferences) {