From e1776c98fa740667d2f251934da8ed9b3f10c329 Mon Sep 17 00:00:00 2001
From: Daniel Constantin <hello@danielconstantin.net>
Date: Sun, 27 May 2018 14:29:12 +0200
Subject: [PATCH 1/2] Add subscribe button to welcome window

---
 app/windows/Welcome/Components/WelcomePage.jsx | 3 ++-
 app/windows/Welcome/renderer.jsx               | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/windows/Welcome/Components/WelcomePage.jsx b/app/windows/Welcome/Components/WelcomePage.jsx
index 70dd362..68d8153 100644
--- a/app/windows/Welcome/Components/WelcomePage.jsx
+++ b/app/windows/Welcome/Components/WelcomePage.jsx
@@ -14,7 +14,7 @@ const Centered = styled.div`
   text-align: center !important;
 `
 
-function WelcomePage ({ onNext }) {
+function WelcomePage ({ onNext, onSubscribe }) {
   return (
     <Window>
       <Content>
@@ -24,6 +24,7 @@ function WelcomePage ({ onNext }) {
           <h3>Welcome</h3>
           <p>Siderus Orion is the easiest way to start using the decentralised web with IPFS and Siderus Network. It supports a larger number of dApps as wel as the IPFS Browser Companion, to speed up your connection when surfing the decentralised web.</p>
           <p>This wizard will help you with the initial requirements.</p>
+          <Button text="Subscribe to Siderus Newsletter" ptStyle="positive" ptSize="large" onClick={onSubscribe} />
         </Centered>
       </Content>
       <Toolbar ptType="footer">
diff --git a/app/windows/Welcome/renderer.jsx b/app/windows/Welcome/renderer.jsx
index cf9fc40..2a3453d 100644
--- a/app/windows/Welcome/renderer.jsx
+++ b/app/windows/Welcome/renderer.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDom from 'react-dom'
-import { remote } from 'electron'
+import { remote, shell } from 'electron'
 import Settings from 'electron-settings'
 
 import WelcomePage from './Components/WelcomePage'
@@ -27,12 +27,16 @@ class WelcomeWindow extends React.Component {
     window.close()
   }
 
+  handleSubscribe = () => {
+    shell.openExternal('http://eepurl.com/dfB6q5')
+  }
+
   render () {
     const { page } = this.state
 
     return (
       page === 0
-        ? <WelcomePage onNext={this.handleNext} />
+        ? <WelcomePage onNext={this.handleNext} onSubscribe={this.handleSubscribe} />
         : <TermsOfServicePage onQuit={this.handleQuit} onAccept={this.handleAccept} />
     )
   }

From 15d68fa245ca68ffa973618cef708f9524dcbc4e Mon Sep 17 00:00:00 2001
From: Daniel Constantin <hello@danielconstantin.net>
Date: Tue, 29 May 2018 10:10:19 +0200
Subject: [PATCH 2/2] Move handleSubscribe to WelcomePage

---
 app/windows/Welcome/Components/WelcomePage.jsx | 9 +++++++--
 app/windows/Welcome/renderer.jsx               | 8 ++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/windows/Welcome/Components/WelcomePage.jsx b/app/windows/Welcome/Components/WelcomePage.jsx
index 68d8153..a819d37 100644
--- a/app/windows/Welcome/Components/WelcomePage.jsx
+++ b/app/windows/Welcome/Components/WelcomePage.jsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import OrionLogo from '../../../../docs/logo.svg'
 import styled from 'styled-components'
+import { shell } from 'electron'
 
 import {
   Window,
@@ -14,7 +15,11 @@ const Centered = styled.div`
   text-align: center !important;
 `
 
-function WelcomePage ({ onNext, onSubscribe }) {
+const handleSubscribe = () => {
+  shell.openExternal('http://eepurl.com/dfB6q5')
+}
+
+function WelcomePage ({ onNext }) {
   return (
     <Window>
       <Content>
@@ -24,7 +29,7 @@ function WelcomePage ({ onNext, onSubscribe }) {
           <h3>Welcome</h3>
           <p>Siderus Orion is the easiest way to start using the decentralised web with IPFS and Siderus Network. It supports a larger number of dApps as wel as the IPFS Browser Companion, to speed up your connection when surfing the decentralised web.</p>
           <p>This wizard will help you with the initial requirements.</p>
-          <Button text="Subscribe to Siderus Newsletter" ptStyle="positive" ptSize="large" onClick={onSubscribe} />
+          <Button text="Subscribe to Siderus Newsletter" ptStyle="positive" ptSize="large" onClick={handleSubscribe} />
         </Centered>
       </Content>
       <Toolbar ptType="footer">
diff --git a/app/windows/Welcome/renderer.jsx b/app/windows/Welcome/renderer.jsx
index 2a3453d..cf9fc40 100644
--- a/app/windows/Welcome/renderer.jsx
+++ b/app/windows/Welcome/renderer.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDom from 'react-dom'
-import { remote, shell } from 'electron'
+import { remote } from 'electron'
 import Settings from 'electron-settings'
 
 import WelcomePage from './Components/WelcomePage'
@@ -27,16 +27,12 @@ class WelcomeWindow extends React.Component {
     window.close()
   }
 
-  handleSubscribe = () => {
-    shell.openExternal('http://eepurl.com/dfB6q5')
-  }
-
   render () {
     const { page } = this.state
 
     return (
       page === 0
-        ? <WelcomePage onNext={this.handleNext} onSubscribe={this.handleSubscribe} />
+        ? <WelcomePage onNext={this.handleNext} />
         : <TermsOfServicePage onQuit={this.handleQuit} onAccept={this.handleAccept} />
     )
   }