From d83a9666b6bcbbd579bab3145b78deda2218ef2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Uhl=C3=AD=C5=99?= <adam@uhlir.dev>
Date: Thu, 8 Sep 2022 08:53:26 +0200
Subject: [PATCH 1/4] feat: bee 1.8 support and installer removal

---
 README.md                      |  21 ++--
 assets/splash.html             |  12 ++-
 src/browser.ts                 |   4 -
 src/config-yaml.ts             |  37 -------
 src/config.ts                  |  57 +++++++++-
 src/downloader.ts              |   3 +-
 src/electron.ts                |  21 +---
 src/index.ts                   |  68 ++++++------
 src/launcher.ts                | 103 ++++++------------
 src/server.ts                  |  15 +--
 src/splash.ts                  |  20 ++--
 src/status.ts                  |  14 +--
 ui/package-lock.json           |  44 --------
 ui/package.json                |   1 -
 ui/src/dashboard.tsx           |   5 -
 ui/src/index.tsx               |  12 +--
 ui/src/installer/Box.tsx       |  14 ---
 ui/src/installer/Center.tsx    |   5 -
 ui/src/installer/Circle.tsx    |  21 ----
 ui/src/installer/Container.tsx |  13 ---
 ui/src/installer/SwarmLogo.tsx |   9 --
 ui/src/installer/index.css     | 138 ------------------------
 ui/src/installer/index.tsx     | 190 ---------------------------------
 23 files changed, 162 insertions(+), 665 deletions(-)
 delete mode 100644 src/config-yaml.ts
 delete mode 100644 ui/src/dashboard.tsx
 delete mode 100644 ui/src/installer/Box.tsx
 delete mode 100644 ui/src/installer/Center.tsx
 delete mode 100644 ui/src/installer/Circle.tsx
 delete mode 100644 ui/src/installer/Container.tsx
 delete mode 100644 ui/src/installer/SwarmLogo.tsx
 delete mode 100644 ui/src/installer/index.css
 delete mode 100644 ui/src/installer/index.tsx

diff --git a/README.md b/README.md
index 27159fa..4222cee 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ It also stores configuration files, Bee assets and other things in application's
 
 As there are several independent components it bit depends on what you want to develop.
 
-**Be aware!** The UIs (Installer and Dashboard) won't automatically open during development in order not to confuse on which
+**Be aware!** The UI won't automatically open during development in order not to confuse on which
 environment they are running. You have to open them manually.
 
 #### Electron Desktop
@@ -86,21 +86,12 @@ To work on the Electron Desktop back-end you just need to do your work and then
 Electron app and shows the Tray icon. No UI will be opened automatically. If you need to make more adjustment you have to exit
 the process with `SIGINT (CTRL+C)` and relaunch.
 
-#### Installer
-
-To work on the Installer, run first `npm start` that will spin up the Electron Desktop back-end and also launches the `/installer` development
-server. In order for the UI to be able to access the Desktop API it needs to have injected API token, which you can do by running `npm run open:installer`
-that will open the Installer UI served by the development server with API key be passed in the URL. Changes to the Installer UI are automatically
-hot-reloaded.
-
-The UI served by the Desktop itself is updated only when you restart the `npm start`.
-
-#### Dashboard
+#### UI (Dashboard)
 
 To work on the Dashboard, run first `npm start` that will spin up the Electron Desktop back-end. Then go to your locally cloned `bee-dashboard` repo and
-in it start the development server with `npm start`. Similarly to Installer, the Dashboard also needs to have API key injected in order to use the
-Desktop's API. You can inject it similarly by running `npm run desktop` in the Dashboard repo that will open the Dashboard UI with API key in the URL.
-Changes to the Installer UI are automatically hot-reloaded.
+in it start the development server with `npm start`. Dashboard also needs to have API key injected in order to use the
+Desktop's API. You can inject it by running `npm run desktop` in the Dashboard repo that will open the Dashboard UI with API key in the URL.
+Changes are automatically hot-reloaded.
 
 The UI served by the Desktop itself is updated only when you update the `@ethersphere/bee-dashboard` NPM package in the Desktop repo.
 
@@ -109,7 +100,7 @@ The UI served by the Desktop itself is updated only when you update the `@ethers
 There are several handy scripts:
 
  - `npm run purge:data` that purge's the Desktop's data folder
- - `npm run purge:logs` that purge's the Dekstop's logs folder
+ - `npm run purge:logs` that purge's the Desktop's logs folder
 
 ## Maintainers
 
diff --git a/assets/splash.html b/assets/splash.html
index cfcdc57..fada32d 100644
--- a/assets/splash.html
+++ b/assets/splash.html
@@ -40,9 +40,9 @@
     }
 
     .Initializing {
-      width: 112px;
+      width: 220px;
       height: 23px;
-      margin: 124px 94px 0;
+      margin: 124px 0 0 90px;
       font-family: iA-Writer, serif;
       font-size: 18px;
       font-weight: normal;
@@ -67,10 +67,16 @@
 <div class='Rectangle'>
   <div class='Hello'>Hello</div>
   <img src='splash-logo.svg' class='logo'>
-  <div class='Initializing'>Initializing<span id='dots'>...</span></div>
+  <div class='Initializing'><span id='message'>Starting</span><span id='dots'>...</span></div>
 </div>
 </body>
 <script>
+  const urlParams = new URLSearchParams(window.location.search)
+
+  if (urlParams.has('msg')) {
+    document.getElementById('message').innerText = decodeURI(urlParams.get('msg'))
+  }
+
   const dotsElem = document.getElementById('dots')
   setInterval(() => {
     if (dotsElem.innerText.length >= 3) {
diff --git a/src/browser.ts b/src/browser.ts
index a6ef093..3cfb730 100644
--- a/src/browser.ts
+++ b/src/browser.ts
@@ -2,10 +2,6 @@ import { shell } from 'electron'
 import { getApiKey } from './api-key'
 import { port } from './port'
 
-export function openInstallerInBrowser() {
-  shell.openExternal(`http://localhost:${port.value}/installer/?v=${getApiKey()}`)
-}
-
 export function openDashboardInBrowser() {
   shell.openExternal(`http://localhost:${port.value}/dashboard/?v=${getApiKey()}`)
 }
diff --git a/src/config-yaml.ts b/src/config-yaml.ts
deleted file mode 100644
index 62613d5..0000000
--- a/src/config-yaml.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs'
-import { dump, FAILSAFE_SCHEMA, load } from 'js-yaml'
-import { getPath } from './path'
-
-export function configYamlExists(): boolean {
-  return existsSync(getPath('config.yaml'))
-}
-
-export function readConfigYaml(): Record<string, unknown> {
-  const raw = readFileSync(getPath('config.yaml'), 'utf-8')
-  const data = load(raw, {
-    schema: FAILSAFE_SCHEMA,
-  })
-
-  return data as Record<string, unknown>
-}
-
-export function writeConfigYaml(newValues: Record<string, unknown>) {
-  const data = readConfigYaml()
-  for (const [key, value] of Object.entries(newValues)) {
-    data[key] = value
-  }
-  writeFileSync(getPath('config.yaml'), dump(data))
-}
-
-export function readWalletPasswordOrThrow(): string {
-  if (!configYamlExists()) {
-    throw Error('Attempted to read password, but config.yaml is not found')
-  }
-  const config = readConfigYaml()
-
-  if (!config.password) {
-    throw Error('Attempted to read password, but config.yaml does not contain it')
-  }
-
-  return config.password as string
-}
diff --git a/src/config.ts b/src/config.ts
index 4055f02..3859fe5 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,13 +1,62 @@
-export type EnvironmentVariables = Partial<{
-  // Logging
-  LOG_LEVEL: string
-}>
+import { existsSync, readFileSync, writeFileSync } from 'fs'
+import { getPath } from './path'
+import { dump, FAILSAFE_SCHEMA, load } from 'js-yaml'
+import PACKAGE_JSON from '../package.json'
 
 export const SUPPORTED_LEVELS = ['critical', 'error', 'warn', 'info', 'verbose', 'debug'] as const
 export type SupportedLevels = typeof SUPPORTED_LEVELS[number]
 export const DEFAULT_LOG_LEVEL = 'info'
+const DESKTOP_VERSION_FILE = 'desktop.version'
 
 export const logLevel =
   process.env.LOG_LEVEL && SUPPORTED_LEVELS.includes(process.env.LOG_LEVEL as SupportedLevels)
     ? process.env.LOG_LEVEL
     : DEFAULT_LOG_LEVEL
+
+export function configYamlExists(): boolean {
+  return existsSync(getPath('config.yaml'))
+}
+
+export function readConfigYaml(): Record<string, unknown> {
+  const raw = readFileSync(getPath('config.yaml'), 'utf-8')
+  const data = load(raw, {
+    schema: FAILSAFE_SCHEMA,
+  })
+
+  return data as Record<string, unknown>
+}
+
+export function writeConfigYaml(newValues: Record<string, unknown>) {
+  const data = readConfigYaml()
+  for (const [key, value] of Object.entries(newValues)) {
+    data[key] = value
+  }
+  writeFileSync(getPath('config.yaml'), dump(data))
+}
+
+export function getDesktopVersionFromFile(): string | undefined {
+  try {
+    const desktopFile = readFileSync(getPath(DESKTOP_VERSION_FILE))
+
+    return desktopFile.toString('utf-8')
+  } catch (e) {
+    return
+  }
+}
+
+export function writeDesktopVersionFile() {
+  writeFileSync(getPath(DESKTOP_VERSION_FILE), PACKAGE_JSON.version)
+}
+
+export function readWalletPasswordOrThrow(): string {
+  if (!configYamlExists()) {
+    throw Error('Attempted to read password, but config.yaml is not found')
+  }
+  const config = readConfigYaml()
+
+  if (!config.password) {
+    throw Error('Attempted to read password, but config.yaml does not contain it')
+  }
+
+  return config.password as string
+}
diff --git a/src/downloader.ts b/src/downloader.ts
index e381962..4c47d48 100644
--- a/src/downloader.ts
+++ b/src/downloader.ts
@@ -41,7 +41,8 @@ export async function runDownloader(force = false): Promise<void> {
   }
   await ensureDir(paths.data)
   await ensureAsset(
-    `https://github.com/ethersphere/bee/releases/download/v1.7.0/bee-${platformString}-${archString}${suffixString}`,
+    // TODO: Add final release before merge
+    `https://github.com/ethersphere/bee/releases/download/v1.8.0-rc1/bee-${platformString}-${archString}${suffixString}`,
     `bee${suffixString}`,
     { chmod: process.platform !== 'win32', force },
   )
diff --git a/src/electron.ts b/src/electron.ts
index 454de63..dd780f0 100644
--- a/src/electron.ts
+++ b/src/electron.ts
@@ -1,10 +1,9 @@
 import { app, Menu, Tray } from 'electron'
-import { openDashboardInBrowser, openInstallerInBrowser } from './browser'
+import { openDashboardInBrowser } from './browser'
 import { runLauncher } from './launcher'
 import { BeeManager } from './lifecycle'
 import { createNotification } from './notify'
 import { getAssetPath } from './path'
-import { getStatus } from './status'
 
 let tray: Tray
 
@@ -12,24 +11,6 @@ export function rebuildElectronTray() {
   if (!tray) {
     return
   }
-
-  if (!getStatus().hasInitialTransaction) {
-    const contextMenu = Menu.buildFromTemplate([
-      {
-        label: 'Open Installer',
-        click: openInstallerInBrowser,
-      },
-      {
-        label: 'Quit',
-        click: async () => {
-          app.quit()
-        },
-      },
-    ])
-    tray.setContextMenu(contextMenu)
-
-    return
-  }
   const contextMenu = Menu.buildFromTemplate([
     {
       label: 'Open Web UI',
diff --git a/src/index.ts b/src/index.ts
index 81f5e85..f21fac0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,27 +1,31 @@
-import { readFileSync, writeFileSync } from 'fs-extra'
 import * as Sentry from '@sentry/electron'
 import { dialog, app } from 'electron'
 import updater from 'update-electron-app'
 
-import { openDashboardInBrowser, openInstallerInBrowser } from './browser'
+import {
+  configYamlExists,
+  getDesktopVersionFromFile,
+  readConfigYaml,
+  writeConfigYaml,
+  writeDesktopVersionFile,
+} from './config'
+import { openDashboardInBrowser } from './browser'
 import { runDownloader } from './downloader'
 import { runElectronTray } from './electron'
-import { runKeepAliveLoop, runLauncher } from './launcher'
+import { initializeBee, runKeepAliveLoop, runLauncher } from './launcher'
 import { findFreePort } from './port'
 import { runServer } from './server'
 import { getStatus } from './status'
 import SENTRY from './.sentry.json'
 import PACKAGE_JSON from '../package.json'
 import { logger } from './logger'
-import { getPath } from './path'
 import { ensureApiKey } from './api-key'
 
 // TODO: Add types definition
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import squirrelInstallingExecution from 'electron-squirrel-startup'
-import { initSplash } from './splash'
-import { configYamlExists, readConfigYaml, writeConfigYaml } from './config-yaml'
+import { initSplash, Splash } from './splash'
 
 // TODO: remove this after 1.0.0 release
 // this is a migration path for pioneers
@@ -32,22 +36,21 @@ if (squirrelInstallingExecution) {
   app.quit()
 }
 
-const DESKTOP_VERSION_FILE = 'desktop.version'
-
-function getDesktopVersionFromFile(): string | undefined {
-  try {
-    const desktopFile = readFileSync(getPath(DESKTOP_VERSION_FILE))
+function errorHandler(e: Error | string) {
+  if (splash) {
+    splash.hide()
+  }
 
-    return desktopFile.toString('utf-8')
-  } catch (e) {
-    return
+  if (typeof e !== 'string') {
+    e = e.message
   }
-}
 
-function writeDesktopVersionFile() {
-  writeFileSync(getPath(DESKTOP_VERSION_FILE), PACKAGE_JSON.version)
+  logger.error(e)
+  dialog.showErrorBox('There was an error in Swarm Desktop', e)
 }
 
+let splash: Splash | undefined
+
 async function main() {
   logger.info(`Bee Desktop version: ${PACKAGE_JSON.version} (${process.env.NODE_ENV ?? 'production'})`)
   const sentryKey = SENTRY.KEY || process.env.SENTRY_KEY
@@ -76,9 +79,9 @@ async function main() {
       // },
     })
   }
-  const hideSplash = await initSplash()
+  splash = await initSplash()
 
-  // Auto updaterg
+  // Auto updater
   // @ts-ignore: https://github.com/electron/update-electron-app/pull/96
   updater({ logger: { log: (...args) => logger.info(...args) } })
 
@@ -91,28 +94,29 @@ async function main() {
   )
 
   if (force) {
-    await runDownloader(force)
+    splash.setMessage('Downloading Bee')
+    await runDownloader(true)
     writeDesktopVersionFile()
   }
 
   ensureApiKey()
   await findFreePort()
   runServer()
-  runElectronTray()
 
-  if (getStatus().hasInitialTransaction) {
-    runLauncher()
-
-    if (process.env.NODE_ENV !== 'development') openDashboardInBrowser()
-  } else {
-    if (process.env.NODE_ENV !== 'development') openInstallerInBrowser()
+  if (!getStatus().config) {
+    logger.info('No Bee config found, initializing Bee')
+    splash.setMessage('Initializing Bee')
+    await initializeBee()
   }
 
-  hideSplash()
+  runLauncher().catch(errorHandler)
+  runElectronTray()
+
+  if (process.env.NODE_ENV !== 'development') openDashboardInBrowser()
+  splash.hide()
+  splash = undefined
+
   runKeepAliveLoop()
 }
 
-main().catch(e => {
-  logger.error(e)
-  dialog.showErrorBox('There was an error in Swarm Desktop', e.message)
-})
+main().catch(errorHandler)
diff --git a/src/launcher.ts b/src/launcher.ts
index 7ed1db8..cc06b87 100644
--- a/src/launcher.ts
+++ b/src/launcher.ts
@@ -1,10 +1,7 @@
 import { spawn } from 'child_process'
-import { mkdirSync, readFileSync, writeFileSync } from 'fs'
-import fetch from 'node-fetch'
+import { mkdirSync, writeFileSync } from 'fs'
 import { platform } from 'os'
-import { join } from 'path'
 import { v4 } from 'uuid'
-import { writeConfigYaml } from './config-yaml'
 import { rebuildElectronTray } from './electron'
 import { BeeManager } from './lifecycle'
 import { logger } from './logger'
@@ -27,20 +24,40 @@ function getBeeExecutable() {
   return 'bee'
 }
 
-export async function createConfigFileAndAddress() {
-  writeFileSync(getPath('config.yaml'), createStubConfiguration())
-  await initializeBee()
-}
+function createConfiguration() {
+  // TODO: Revert before merging
+  return `
+allow-private-cidrs: true
+bootnode: /dns4/bootnode-bee-0-headless.incentives-test.svc.cluster.local/tcp/1634/p2p/16Uiu2HAm6i4dFaJt584m2jubyvnieEECgqM2YMpQ9nusXfy8XFzL
+network-id: 12345
+postage-stamp-address: 0x2c3de8a0407a8a3e33bc130194ac8bcd532c8e95
+price-oracle-address: 0x4f600964c166786245d7521760d652a543021887
 
-export async function createInitialTransaction() {
-  const config = readFileSync(getPath('config.yaml'), 'utf-8')
+api-addr: 127.0.0.1:1633
+debug-api-addr: 127.0.0.1:1635
+debug-api-enable: true
+swap-enable: false
+swap-initial-deposit: 1000000000000000
+mainnet: false
+full-node: false
+chain-enable: false
+cors-allowed-origins: '*'
+use-postage-snapshot: true
+resolver-options: https://cloudflare-eth.com
+data-dir: ${getPath('data-dir')}
+password: ${v4()}`
+}
 
-  if (!config.includes('block-hash')) {
-    const { address } = JSON.parse(readFileSync(getPath('data-dir/keys/swarm.key')).toString())
-    logger.info('Sending transaction to address', address)
-    const { transaction, blockHash } = await sendTransaction(address)
-    createConfiguration(transaction, blockHash)
+export async function initializeBee() {
+  if (!checkPath('config.yaml')) {
+    logger.info('Creating new Bee config.yaml')
+    writeFileSync(getPath('config.yaml'), createConfiguration())
   }
+
+  const configPath = getPath('config.yaml')
+  logger.debug(`Executing process: bee init --config=${configPath}`)
+
+  return runProcess(getPath(getBeeExecutable()), ['init', `--config=${configPath}`], new AbortController())
 }
 
 export async function runLauncher() {
@@ -50,21 +67,6 @@ export async function runLauncher() {
     mkdirSync(getPath('data-dir'))
   }
 
-  if (!checkPath('config.yaml')) {
-    writeFileSync(getPath('config.yaml'), createStubConfiguration())
-  }
-
-  if (!checkPath(join('data-dir', 'keys', 'swarm.key'))) {
-    await launchBee().catch()
-  }
-  const config = readFileSync(getPath('config.yaml'), 'utf-8')
-
-  if (!config.includes('block-hash')) {
-    const { address } = JSON.parse(readFileSync(getPath(join('data-dir', 'keys', 'swarm.key'))).toString())
-    logger.info('Sending transaction to address', address)
-    const { transaction, blockHash } = await sendTransaction(address)
-    createConfiguration(transaction, blockHash)
-  }
   BeeManager.setUserIntention(true)
   const subprocess = launchBee(abortController).catch(reason => {
     logger.error(reason)
@@ -78,51 +80,14 @@ export async function runLauncher() {
   rebuildElectronTray()
 }
 
-async function sendTransaction(address: string) {
-  const response = await fetch(`https://onboarding.ethswarm.org/faucet/overlay/${address}`, {
-    method: 'POST',
-    headers: { 'app-name': 'swarm-desktop' },
-  })
-  const json = await response.json()
-
-  return { transaction: json.transactionHash, blockHash: json.nextBlockHashBee }
-}
-
-function createStubConfiguration() {
-  return `api-addr: 127.0.0.1:1633
-debug-api-addr: 127.0.0.1:1635
-debug-api-enable: true
-swap-enable: false
-swap-initial-deposit: 1000000000000000
-mainnet: true
-full-node: false
-chain-enable: false
-cors-allowed-origins: '*'
-use-postage-snapshot: true
-resolver-options: https://cloudflare-eth.com
-data-dir: ${getPath('data-dir')}
-password: ${v4()}`
-}
-
-function createConfiguration(transaction: string, blockHash: string) {
-  writeConfigYaml({
-    transaction,
-    'block-hash': blockHash,
-  })
-}
-
-async function initializeBee() {
-  const configPath = getPath('config.yaml')
-
-  return runProcess(getPath(getBeeExecutable()), ['init', `--config=${configPath}`], new AbortController())
-}
-
 async function launchBee(abortController?: AbortController) {
   if (!abortController) {
     abortController = new AbortController()
   }
   const configPath = getPath('config.yaml')
 
+  logger.debug(`Executing process: bee start --config=${configPath}`)
+
   return runProcess(getPath(getBeeExecutable()), ['start', `--config=${configPath}`], abortController)
 }
 
diff --git a/src/server.ts b/src/server.ts
index 43e2bce..5b5b264 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -13,9 +13,7 @@ import { URL } from 'url'
 import PACKAGE_JSON from '../package.json'
 import { getApiKey } from './api-key'
 import { sendBzzTransaction, sendNativeTransaction } from './blockchain'
-import { readConfigYaml, readWalletPasswordOrThrow, writeConfigYaml } from './config-yaml'
-import { rebuildElectronTray } from './electron'
-import { createConfigFileAndAddress, createInitialTransaction, runLauncher } from './launcher'
+import { runLauncher } from './launcher'
 import { BeeManager } from './lifecycle'
 import { logger, readBeeDesktopLogs, readBeeLogs, subscribeLogServerRequests } from './logger'
 import { getPath } from './path'
@@ -23,6 +21,7 @@ import { port } from './port'
 import { getStatus } from './status'
 import { swap } from './swap'
 import { bufferRequest } from './utility'
+import { readConfigYaml, writeConfigYaml, readWalletPasswordOrThrow } from './config'
 
 const UI_DIST = path.join(__dirname, '..', '..', 'ui')
 
@@ -31,7 +30,6 @@ const AUTO_UPDATE_ENABLED_PLATFORMS = ['darwin', 'win32']
 export function runServer() {
   const app = new Koa()
   logger.info(`Serving UI from path: ${UI_DIST}`)
-  app.use(mount('/installer', serve(UI_DIST)))
   app.use(mount('/dashboard', serve(UI_DIST)))
 
   app.use(async (context, next) => {
@@ -133,15 +131,6 @@ export function runServer() {
       context.body = { connections: 0 }
     }
   })
-  router.post('/setup/address', async context => {
-    await createConfigFileAndAddress()
-    context.body = getStatus()
-  })
-  router.post('/setup/transaction', async context => {
-    await createInitialTransaction()
-    rebuildElectronTray()
-    context.body = getStatus()
-  })
   router.post('/config', context => {
     writeConfigYaml(context.request.body)
     context.body = readConfigYaml()
diff --git a/src/splash.ts b/src/splash.ts
index 43f82a5..f228c68 100644
--- a/src/splash.ts
+++ b/src/splash.ts
@@ -2,16 +2,24 @@ import { BrowserWindow, app } from 'electron'
 import * as path from 'path'
 import { logger } from './logger'
 
-export async function initSplash(): Promise<() => void> {
+export interface Splash {
+  hide: () => void
+  setMessage: (msg: string) => void
+}
+
+export async function initSplash(): Promise<Splash> {
   return new Promise((resolve, reject) => {
     app.on('ready', () => {
-      const splashImage = path.resolve(__dirname, '..', '..', '..', 'assets', 'splash.html')
-      logger.info(`Serving splash screen from path ${splashImage}`)
+      const splashPath = path.resolve(__dirname, '..', '..', '..', 'assets', 'splash.html')
+      logger.info(`Serving splash screen from path ${splashPath}`)
 
-      const splash = new BrowserWindow({ width: 800, height: 600, frame: false, alwaysOnTop: true })
-      splash.loadURL(`file://${splashImage}`).catch(reject)
+      const splash = new BrowserWindow({ width: 800, height: 600, frame: false })
+      splash.loadURL(`file://${splashPath}`).catch(reject)
 
-      resolve(() => splash.hide())
+      resolve({
+        hide: () => splash.hide(),
+        setMessage: async (msg: string) => splash.loadURL(`file://${splashPath}?msg=${encodeURI(msg)}`),
+      })
     })
   })
 }
diff --git a/src/status.ts b/src/status.ts
index 9bfcae2..2bd5262 100644
--- a/src/status.ts
+++ b/src/status.ts
@@ -1,21 +1,17 @@
 import { readFileSync } from 'fs'
 import { join } from 'path'
-import { readConfigYaml } from './config-yaml'
 import { isBeeAssetReady } from './downloader'
 import { checkPath, getPath } from './path'
+import { readConfigYaml } from './config'
 
 interface Status {
-  address: string | null
-  config: Record<string, any>
-  hasInitialTransaction: boolean
+  address?: string
+  config?: Record<string, any>
   assetsReady: boolean
 }
 
 export function getStatus() {
   const status: Status = {
-    address: null,
-    config: null,
-    hasInitialTransaction: false,
     assetsReady: isBeeAssetReady(),
   }
 
@@ -26,10 +22,6 @@ export function getStatus() {
   status.config = readConfigYaml()
   status.address = readEthereumAddress()
 
-  if (status.config['block-hash'] && status.config.transaction) {
-    status.hasInitialTransaction = true
-  }
-
   return status
 }
 
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 24ced81..c37bb93 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -17,7 +17,6 @@
         "@types/react-dom": "^17.0.17",
         "react": "~17.0.2",
         "react-dom": "~17.0.2",
-        "react-router-dom": "^6.3.0",
         "remixicon-react": "~1.0.0"
       },
       "devDependencies": {
@@ -16129,30 +16128,6 @@
         "react": ">=16.8"
       }
     },
-    "node_modules/react-router-dom": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
-      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
-      "dependencies": {
-        "history": "^5.2.0",
-        "react-router": "6.3.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom/node_modules/react-router": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
-      "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
-      "dependencies": {
-        "history": "^5.2.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
     "node_modules/react-scripts": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
@@ -31068,25 +31043,6 @@
         "history": "^5.2.0"
       }
     },
-    "react-router-dom": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
-      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
-      "requires": {
-        "history": "^5.2.0",
-        "react-router": "6.3.0"
-      },
-      "dependencies": {
-        "react-router": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
-          "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
-          "requires": {
-            "history": "^5.2.0"
-          }
-        }
-      }
-    },
     "react-scripts": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
diff --git a/ui/package.json b/ui/package.json
index a088ba6..859317e 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -13,7 +13,6 @@
     "@types/react-dom": "^17.0.17",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "react-router-dom": "^6.3.0",
     "remixicon-react": "~1.0.0"
   },
   "scripts": {
diff --git a/ui/src/dashboard.tsx b/ui/src/dashboard.tsx
deleted file mode 100644
index 5d76063..0000000
--- a/ui/src/dashboard.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import BeeDashboard from '@ethersphere/bee-dashboard'
-
-export default function Dashboard() {
-  return <BeeDashboard isBeeDesktop={true} />
-}
diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index d70d76c..c17e4af 100644
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -1,9 +1,6 @@
 import React from 'react'
-import { BrowserRouter, Route, Routes } from 'react-router-dom'
 import ReactDOM from 'react-dom'
-
-import Installer from './installer'
-import Dashboard from './dashboard'
+import BeeDashboard from '@ethersphere/bee-dashboard'
 import { initSentry } from './utils/sentry'
 
 if (process.env.REACT_APP_SENTRY_KEY) {
@@ -13,12 +10,7 @@ if (process.env.REACT_APP_SENTRY_KEY) {
 const container = document.getElementById('root')
 ReactDOM.render(
   <React.StrictMode>
-    <BrowserRouter>
-      <Routes>
-        <Route path="/dashboard" element={<Dashboard />} />
-        <Route path="/installer" element={<Installer />} />
-      </Routes>
-    </BrowserRouter>
+    <BeeDashboard isBeeDesktop={true} />
   </React.StrictMode>,
   container,
 )
diff --git a/ui/src/installer/Box.tsx b/ui/src/installer/Box.tsx
deleted file mode 100644
index 6211a66..0000000
--- a/ui/src/installer/Box.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ReactElement } from 'react'
-
-interface BoxProps {
-  children: ReactElement
-  mb: number | undefined
-}
-
-export function Box({ children, mb }: BoxProps) {
-  const style = {
-    marginBottom: mb ? mb * 8 : undefined,
-  }
-
-  return <div style={style}>{children}</div>
-}
diff --git a/ui/src/installer/Center.tsx b/ui/src/installer/Center.tsx
deleted file mode 100644
index f15f849..0000000
--- a/ui/src/installer/Center.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactElement } from 'react'
-
-export function Center({ children }: { children: ReactElement[] }) {
-  return <div className="center">{children}</div>
-}
diff --git a/ui/src/installer/Circle.tsx b/ui/src/installer/Circle.tsx
deleted file mode 100644
index 6c47619..0000000
--- a/ui/src/installer/Circle.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-interface CircleProps {
-  color: string
-  size: string
-  borderSize: string
-  borderColor: string
-  quarter: boolean
-  spinner: boolean
-}
-
-export function Circle({ color, size, borderSize, borderColor, quarter = false, spinner = false }: CircleProps) {
-  const style = {
-    background: color,
-    width: size,
-    height: size,
-    border: `${borderSize} solid ${borderColor}`,
-    borderRadius: '9999px',
-    borderRightColor: quarter ? 'transparent' : borderColor,
-  }
-
-  return <div className={spinner ? 'spinner' : ''} style={style}></div>
-}
diff --git a/ui/src/installer/Container.tsx b/ui/src/installer/Container.tsx
deleted file mode 100644
index 976c698..0000000
--- a/ui/src/installer/Container.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ReactElement } from 'react'
-
-export function Container({ children }: { children: ReactElement[] }) {
-  return (
-    <div className="container">
-      {children.map((x, i) => (
-        <div key={i} className="container-item">
-          {x}
-        </div>
-      ))}
-    </div>
-  )
-}
diff --git a/ui/src/installer/SwarmLogo.tsx b/ui/src/installer/SwarmLogo.tsx
deleted file mode 100644
index d2317de..0000000
--- a/ui/src/installer/SwarmLogo.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import logo from '../assets/swarm-desktop-logo.svg'
-
-export function SwarmLogo() {
-  return (
-    <div>
-      <img className="logo" alt="Swarm Desktop Logo" src={logo} />
-    </div>
-  )
-}
diff --git a/ui/src/installer/index.css b/ui/src/installer/index.css
deleted file mode 100644
index 7e252f7..0000000
--- a/ui/src/installer/index.css
+++ /dev/null
@@ -1,138 +0,0 @@
-@font-face {
-    font-family: 'iA-Writer';
-    src: url('/public/iAWriterQuattroS-Regular.woff');
-}
-
-body {
-    margin: 0;
-}
-
-.installer,
-.installer button {
-    font-family: 'iA-Writer', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell',
-        'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-.installer p {
-    margin: 0;
-    padding: 0;
-}
-
-.installer {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    min-height: 100vh;
-    color: #303030;
-    background: #ededed;
-    font-size: 14px;
-    text-align: center;
-}
-
-.installer .todo-item {
-    background: #fff;
-    padding: 1rem;
-    margin-bottom: 16px;
-    color: #888;
-    box-shadow: 0 0 4px #ddd;
-    width: 500px;
-}
-
-.installer .todo-body {
-    display: flex;
-    align-items: center;
-}
-
-.installer .todo-item p {
-    margin-left: 8px;
-}
-
-.installer .todo-item code {
-    display: block;
-    margin-top: 8px;
-    font-size: 90%;
-}
-
-@keyframes spinner {
-    0% {
-        transform: rotate(0deg);
-    }
-
-    100% {
-        transform: rotate(360deg);
-    }
-}
-
-.installer .spinner {
-    animation: spinner 1s infinite linear;
-}
-
-.installer button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border: 0;
-    border-radius: 0;
-    outline: none;
-    font-size: 14px;
-    color: #303030;
-    background: #f9f9f9;
-    width: 160px;
-    height: 42px;
-}
-
-.installer button>svg {
-    margin-right: 8px;
-}
-
-.installer button:hover {
-    cursor: pointer;
-}
-
-.installer .container {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: center;
-    max-width: 640px;
-}
-
-.installer .container-item {
-    flex: 1;
-}
-
-.installer .center {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-.installer .logo {
-    max-width: 100%;
-    width: 172px;
-    margin-top: 64px;
-    margin-bottom: 64px;
-}
-
-.installer .logo svg {
-    max-width: 100%;
-    width: 172px;
-    margin-top: 64px;
-    margin-bottom: 64px;
-    fill: 'black';
-}
-
-.installer .strong {
-    font-size: 16px;
-}
-
-.installer .light {
-    font-style: italic;
-    color: #6c6c6c;
-}
\ No newline at end of file
diff --git a/ui/src/installer/index.tsx b/ui/src/installer/index.tsx
deleted file mode 100644
index b91171f..0000000
--- a/ui/src/installer/index.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import { useEffect, useState } from 'react'
-import InstallIcon from 'remixicon-react/InstallLineIcon'
-import RestartIcon from 'remixicon-react/RestartLineIcon'
-import { Box } from './Box'
-import { Center } from './Center'
-import { Circle } from './Circle'
-import { Container } from './Container'
-import { getHost, getJson, postJson } from '../utils/net'
-import { SwarmLogo } from './SwarmLogo'
-import './index.css'
-
-const MAX_RETRIES = 100
-
-async function wait<T>(x?: T): Promise<T | undefined> {
-  return new Promise(resolve => setTimeout(() => resolve(x), 1000))
-}
-
-interface Status {
-  address: string | null
-  config: Record<string, unknown>
-  hasInitialTransaction: boolean
-  assetsReady: boolean
-}
-
-async function getStatus(): Promise<Status> {
-  return await getJson<Status>(`${getHost()}/status`)
-}
-
-export default function Installer() {
-  const [isLoading, setIsLoading] = useState(false)
-  const [message, setMessage] = useState('')
-  const [error, setError] = useState(false)
-
-  const urlSearchParams = new URLSearchParams(window.location.search)
-  const newApiKey = urlSearchParams.get('v')
-
-  if (newApiKey) {
-    localStorage.setItem('apiKey', newApiKey)
-    window.location.search = ''
-  }
-
-  useEffect(() => {
-    if (!isLoading) {
-      return
-    }
-
-    async function waitForBeeAsset(): Promise<void> {
-      setMessage('Downloading Bee binary...')
-      for (let i = 0; i < 600; i++) {
-        const status = await getStatus()
-
-        if (status.assetsReady) {
-          return
-        }
-        await wait()
-      }
-    }
-
-    async function connectToDesktopApi() {
-      setMessage('Connecting to Desktop API...')
-      const status = await getStatus()
-
-      if (!status.assetsReady) {
-        await waitForBeeAsset()
-      }
-    }
-
-    async function generateAddress() {
-      setMessage('Generating Bee Ethereum address...')
-
-      return postJson(`${getHost()}/setup/address`)
-    }
-
-    async function createInitialTransaction() {
-      setMessage('Creating initial transaction...')
-      for (let i = 0; i < 5; i++) {
-        try {
-          await postJson(`${getHost()}/setup/transaction`)
-
-          return
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.error(error)
-        }
-      }
-      throw Error('All attempts failed to create initial transaction')
-    }
-
-    async function restartBee() {
-      setMessage('Starting Bee...')
-
-      return postJson(`${getHost()}/restart`)
-    }
-
-    async function waitForUltraLightNode() {
-      setMessage('Waiting for ultra light mode...')
-      for (let i = 0; i < MAX_RETRIES; i++) {
-        const { connections } = await getJson<{ connections: number }>(`${getHost()}/peers`)
-
-        if (connections > 0) {
-          return
-        }
-        await wait(1000)
-      }
-      throw Error('Could not start in ultra light mode')
-    }
-
-    connectToDesktopApi()
-      .then(wait)
-      .then(generateAddress)
-      .then(wait)
-      .then(createInitialTransaction)
-      .then(wait)
-      .then(restartBee)
-      .then(wait)
-      .then(waitForUltraLightNode)
-      .then(wait)
-      .then(() => window.location.replace(`${getHost()}/dashboard/`))
-      .catch(error => {
-        // eslint-disable-next-line no-console
-        console.error(error)
-        setError(error)
-      })
-  }, [isLoading])
-
-  function onClick() {
-    setIsLoading(true)
-  }
-
-  function onRetry() {
-    window.location.reload()
-  }
-
-  let content
-
-  if (error) {
-    content = (
-      <Center>
-        <Box mb={1}>
-          <p className="strong">Installation failed!</p>
-        </Box>
-        <Box mb={4}>
-          <p className="light">Sorry… if this happens again you may try to install Swarm manually.</p>
-        </Box>
-        <button onClick={onRetry}>
-          <RestartIcon size={18} color="#dd7200" /> Retry now
-        </button>
-      </Center>
-    )
-  } else if (isLoading) {
-    content = (
-      <Center>
-        <Box mb={7}>
-          <Circle color="#ededed" size="216px" borderSize="24px" borderColor="#f8f8f8" spinner quarter />
-        </Box>
-        <Box mb={1}>
-          <p className="strong">Installation in progress</p>
-        </Box>
-        <p className="light">{message}</p>
-      </Center>
-    )
-  } else {
-    content = (
-      <Center>
-        <Box mb={1}>
-          <p className="strong">Welcome to Swarm!</p>
-        </Box>
-        <Box mb={4}>
-          <p className="light">
-            Thanks for downloading Swarm Desktop. Click the button below to install Swarm and set up your node. This
-            shouldn't take more than a minute.
-          </p>
-        </Box>
-        <button onClick={onClick}>
-          <InstallIcon size={18} color="#dd7200" /> Install Swarm
-        </button>
-      </Center>
-    )
-  }
-
-  return (
-    <div className="installer">
-      <Container>
-        <SwarmLogo />
-        {content}
-        <div />
-      </Container>
-    </div>
-  )
-}

From d792ef996726f27809f97cce9ea757c8a8f38ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Uhl=C3=AD=C5=99?= <adam@uhlir.dev>
Date: Mon, 12 Sep 2022 17:31:36 +0200
Subject: [PATCH 2/4] fix: tweaks

---
 assets/splash.html |  8 ++++++++
 src/downloader.ts  |  2 +-
 src/launcher.ts    | 13 ++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/assets/splash.html b/assets/splash.html
index fada32d..b873263 100644
--- a/assets/splash.html
+++ b/assets/splash.html
@@ -9,6 +9,14 @@
       src: url("iAWriterQuattroS-Regular.woff");
     }
 
+    * {
+      -webkit-touch-callout:none;
+      -webkit-user-select:none;
+      -moz-user-select:none;
+      -ms-user-select:none;
+      user-select:none;
+    }
+
     body {
       margin: 0;
       overflow: hidden;
diff --git a/src/downloader.ts b/src/downloader.ts
index 4c47d48..5a383db 100644
--- a/src/downloader.ts
+++ b/src/downloader.ts
@@ -42,7 +42,7 @@ export async function runDownloader(force = false): Promise<void> {
   await ensureDir(paths.data)
   await ensureAsset(
     // TODO: Add final release before merge
-    `https://github.com/ethersphere/bee/releases/download/v1.8.0-rc1/bee-${platformString}-${archString}${suffixString}`,
+    `https://github.com/ethersphere/bee/releases/download/v1.8.0-rc4/bee-${platformString}-${archString}${suffixString}`,
     `bee${suffixString}`,
     { chmod: process.platform !== 'win32', force },
   )
diff --git a/src/launcher.ts b/src/launcher.ts
index cc06b87..c9e7c97 100644
--- a/src/launcher.ts
+++ b/src/launcher.ts
@@ -25,20 +25,15 @@ function getBeeExecutable() {
 }
 
 function createConfiguration() {
-  // TODO: Revert before merging
-  return `
-allow-private-cidrs: true
-bootnode: /dns4/bootnode-bee-0-headless.incentives-test.svc.cluster.local/tcp/1634/p2p/16Uiu2HAm6i4dFaJt584m2jubyvnieEECgqM2YMpQ9nusXfy8XFzL
-network-id: 12345
-postage-stamp-address: 0x2c3de8a0407a8a3e33bc130194ac8bcd532c8e95
-price-oracle-address: 0x4f600964c166786245d7521760d652a543021887
-
-api-addr: 127.0.0.1:1633
+  // TODO: Revert `full-node: false`
+  return `api-addr: 127.0.0.1:1633
 debug-api-addr: 127.0.0.1:1635
 debug-api-enable: true
 swap-enable: false
 swap-initial-deposit: 1000000000000000
 mainnet: false
+bootnode: /dnsaddr/testnet.ethswarm.org
+network-id: 10
 full-node: false
 chain-enable: false
 cors-allowed-origins: '*'

From f3c2d2d0f7dad3e504191a30f2feac30ed32b0db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Uhl=C3=AD=C5=99?= <adam@uhlir.dev>
Date: Tue, 13 Sep 2022 13:56:52 +0200
Subject: [PATCH 3/4] fix(ui): unused dependency

---
 ui/package-lock.json | 3 +--
 ui/package.json      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index c37bb93..e558483 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -16,8 +16,7 @@
         "@types/react": "^18.0.14",
         "@types/react-dom": "^17.0.17",
         "react": "~17.0.2",
-        "react-dom": "~17.0.2",
-        "remixicon-react": "~1.0.0"
+        "react-dom": "~17.0.2"
       },
       "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^5.17.0",
diff --git a/ui/package.json b/ui/package.json
index 859317e..7e50bc9 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -12,8 +12,7 @@
     "@types/react": "^18.0.14",
     "@types/react-dom": "^17.0.17",
     "react": "~17.0.2",
-    "react-dom": "~17.0.2",
-    "remixicon-react": "~1.0.0"
+    "react-dom": "~17.0.2"
   },
   "scripts": {
     "start": "react-scripts start",

From 153c43736735e18e366adf927509382b1150634e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Uhl=C3=AD=C5=99?= <adam@uhlir.dev>
Date: Tue, 13 Sep 2022 14:04:45 +0200
Subject: [PATCH 4/4] test: use correct import

---
 test/{config-yaml.spec.ts => config.spec.ts} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename test/{config-yaml.spec.ts => config.spec.ts} (96%)

diff --git a/test/config-yaml.spec.ts b/test/config.spec.ts
similarity index 96%
rename from test/config-yaml.spec.ts
rename to test/config.spec.ts
index 3936bfe..7ab130b 100644
--- a/test/config-yaml.spec.ts
+++ b/test/config.spec.ts
@@ -1,5 +1,5 @@
 import { existsSync, unlinkSync, writeFileSync } from 'fs-extra'
-import { configYamlExists, readConfigYaml, readWalletPasswordOrThrow, writeConfigYaml } from '../src/config-yaml'
+import { configYamlExists, readConfigYaml, readWalletPasswordOrThrow, writeConfigYaml } from '../src/config'
 
 jest.mock('env-paths', () =>
   jest.fn().mockImplementation(() => ({