Merge remote-tracking branch 'origin/master'

Author: Crecket

src/background.js

@@ -7,6 +7,7 @@ import { devMenuTemplate } from "./menu/dev_menu_template";
 import { editMenuTemplate } from "./menu/edit_menu_template";
 import createWindow from "./helpers/window";
 import registerShortcuts from "./helpers/shortcuts";
+import registerTouchBar from './helpers/touchbar';
 
 // Special module holding environment variables which you declared
 // in config/env_xxx.json file.
@@ -62,6 +63,7 @@ app.on("ready", () => {
     );
 
     registerShortcuts(mainWindow, app);
+    registerTouchBar(mainWindow);
 
     if (env.name === "development") {
         mainWindow.openDevTools();

src/helpers/touchbar.js

@@ -0,0 +1,43 @@
+import { TouchBar } from 'electron'
+
+const { TouchBarButton } = TouchBar;
+
+export default (window) => {
+
+    const dashboardButton = new TouchBarButton({
+        label: '🏠 Dashboard',
+        click: () => {
+            window.webContents.send('change-path', '/')
+        }
+    });
+
+    const payButton = new TouchBarButton({
+        label: '👆 Pay',
+        click: () => {
+            window.webContents.send('change-path', '/pay')
+        }
+    });
+
+    const requestButton = new TouchBarButton({
+        label: '👇 Request',
+        click: () => {
+            window.webContents.send('change-path', '/request')
+        }
+    });
+
+    const bunqMeButton = new TouchBarButton({
+        label: '💰 bunq.me requests',
+        click: () => {
+            window.webContents.send('change-path', '/bunqme-tab')
+        }
+    });
+
+    const bar = new TouchBar([
+        dashboardButton,
+        payButton,
+        requestButton,
+        bunqMeButton
+    ]);
+
+    window.setTouchBar(bar);
+}

src/react/Components/Layout.jsx

@@ -5,6 +5,7 @@ import Grid from "material-ui/Grid";
 import { withStyles } from "material-ui/styles";
 import MuiThemeProvider from "material-ui/styles/MuiThemeProvider";
 import createMuiTheme from "material-ui/styles/createMuiTheme";
+import { ipcRenderer } from 'electron'
 
 // custom components
 import Logger from "../Helpers/Logger";
@@ -60,6 +61,15 @@ class Layout extends React.Component {
         this.state = {
             initialBunqConnect: false
         };
+
+
+        ipcRenderer.on('change-path', (event, path) => {
+            const currentPath = this.props.history.location.pathname;
+
+            if (currentPath !== path) {
+                this.props.history.push(path);
+            }
+        });
     }
 
     componentDidMount() {