Merge pull request #310 from keyboardio/navigate/welcome-screen-fix

App.js: Fix onKeyboardConnect()'s navigate targets
keyboardio · Feb 8, 2019 · de53c20 · de53c20
2 parents 592ba42 + b6c0d47
commit de53c20
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/renderer/App.js b/src/renderer/App.js
@@ -154,7 +154,7 @@ class App extends React.Component {
       }
     });
     await navigate(
-      commands.includes("keymap.custom") > 0 ? "./layout-editor" : "./welcome"
+      commands.includes("keymap.custom") > 0 ? "/layout-editor" : "/welcome"
     );
   };
 

diff --git a/src/renderer/screens/KeyboardSelect.js b/src/renderer/screens/KeyboardSelect.js
@@ -45,7 +45,6 @@ import Hardware from "@chrysalis-api/hardware";
 import usb from "usb";
 
 import i18n from "../i18n";
-import { navigate } from "../routerHistory";
 
 const styles = theme => ({
   loader: {
@@ -216,7 +215,6 @@ class KeyboardSelect extends React.Component {
 
     try {
       await this.props.onConnect(devices[this.state.selectedPortIndex]);
-      await navigate("/layout-editor");
     } catch (err) {
       this.setState({
         opening: false