From cfd4e8a05dd8e9430c7efc5d7d6b19e83879aeb3 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 15 Oct 2020 19:06:05 -0400
Subject: [PATCH] rc fixes for electron 9

---
 ui/component/common/file-selector.jsx | 17 ++++++++++++++---
 ui/component/walletBackup/view.jsx    |  2 +-
 ui/page/help/view.jsx                 |  6 +++---
 ui/redux/actions/file.js              |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ui/component/common/file-selector.jsx b/ui/component/common/file-selector.jsx
index ea298efc8..9341b0952 100644
--- a/ui/component/common/file-selector.jsx
+++ b/ui/component/common/file-selector.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-
+import { remote } from 'electron';
 import Button from 'component/button';
 import { FormField } from 'component/common/form';
 
@@ -49,11 +49,22 @@ class FileSelector extends React.PureComponent<Props> {
     }
 
     const file = files[0];
+
     if (this.props.onFileChosen) {
       this.props.onFileChosen(file);
     }
   };
 
+  handleDirectoryInputSelection = () => {
+    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then(result => {
+      const path = result && result.filePaths[0];
+      if (path) {
+        // $FlowFixMe
+        this.props.onFileChosen({ path });
+      }
+    });
+  };
+
   fileInputButton = () => {
     this.fileInput.current.click();
   };
@@ -80,7 +91,7 @@ class FileSelector extends React.PureComponent<Props> {
               autoFocus={autoFocus}
               button="secondary"
               disabled={disabled}
-              onClick={this.fileInputButton}
+              onClick={type === 'openDirectory' ? this.handleDirectoryInputSelection : this.fileInputButton}
               label={__('Browse')}
             />
           }
@@ -90,7 +101,7 @@ class FileSelector extends React.PureComponent<Props> {
           style={{ display: 'none' }}
           accept={accept}
           ref={this.fileInput}
-          onChange={() => this.handleFileInputSelection()}
+          onChange={() => (type === 'openDirectory' ? () => {} : this.handleFileInputSelection())}
           webkitdirectory={type === 'openDirectory' ? 'True' : null}
         />
       </React.Fragment>
diff --git a/ui/component/walletBackup/view.jsx b/ui/component/walletBackup/view.jsx
index aa25c3d1c..3592cbdfb 100644
--- a/ui/component/walletBackup/view.jsx
+++ b/ui/component/walletBackup/view.jsx
@@ -144,7 +144,7 @@ class WalletBackup extends React.PureComponent<Props, State> {
                 label={__('Create Backup')}
                 onClick={() => this.backupWalletDir(lbryumWalletDir)}
               />
-              <Button button="link" label={__('Open Folder')} onClick={() => shell.openItem(lbryumWalletDir)} />
+              <Button button="link" label={__('Open Folder')} onClick={() => shell.openPath(lbryumWalletDir)} />
             </div>
           </React.Fragment>
         }
diff --git a/ui/page/help/view.jsx b/ui/page/help/view.jsx
index b0d9d4c3e..1fc227406 100644
--- a/ui/page/help/view.jsx
+++ b/ui/page/help/view.jsx
@@ -89,9 +89,9 @@ class HelpPage extends React.PureComponent<Props, State> {
     const logFileName = 'lbrynet.log';
     const os = this.state.versionInfo.os_system;
     if (os === 'Darwin' || os === 'Linux') {
-      shell.openItem(`${userHomeDirectory}/${logFileName}`);
+      shell.openPath(`${userHomeDirectory}/${logFileName}`);
     } else {
-      shell.openItem(`${userHomeDirectory}\\${logFileName}`);
+      shell.openPath(`${userHomeDirectory}\\${logFileName}`);
     }
   }
 
@@ -202,7 +202,7 @@ class HelpPage extends React.PureComponent<Props, State> {
                 button="secondary"
                 label={__('Open Log Folder')}
                 icon={ICONS.OPEN_LOG_FOLDER}
-                onClick={() => shell.openItem(dataDirectory)}
+                onClick={() => shell.openPath(dataDirectory)}
               />
             </div>
           }
diff --git a/ui/redux/actions/file.js b/ui/redux/actions/file.js
index 3aef48aa0..7bdc84e11 100644
--- a/ui/redux/actions/file.js
+++ b/ui/redux/actions/file.js
@@ -23,7 +23,7 @@ export function doOpenFileInFolder(path) {
 
 export function doOpenFileInShell(path) {
   return dispatch => {
-    const success = shell.openItem(path);
+    const success = shell.openPath(path);
     if (!success) {
       dispatch(doOpenFileInFolder(path));
     }