From 95189397e826fcb068e625d93e42093924dabe10 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 29 Sep 2022 14:11:33 +1000
Subject: [PATCH] fix: UI for app start password prompt

---
 stylesheets/_session_password.scss      | 2 +-
 ts/components/SessionPasswordPrompt.tsx | 2 ++
 ts/mains/password_start.tsx             | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/stylesheets/_session_password.scss b/stylesheets/_session_password.scss
index 8e4d14c30..9d14c4513 100644
--- a/stylesheets/_session_password.scss
+++ b/stylesheets/_session_password.scss
@@ -33,7 +33,7 @@
     &-error-section {
       width: 100%;
       color: $session-color-white;
-      margin: -var(--margins-sm) 0px 2 * $session-margin-lg 0px;
+      margin: var(--margins-sm);
 
       .session-label {
         &.primary {
diff --git a/ts/components/SessionPasswordPrompt.tsx b/ts/components/SessionPasswordPrompt.tsx
index 564e50e5e..b20d519f7 100644
--- a/ts/components/SessionPasswordPrompt.tsx
+++ b/ts/components/SessionPasswordPrompt.tsx
@@ -6,6 +6,7 @@ import { withTheme } from 'styled-components';
 import autoBind from 'auto-bind';
 import { SessionButton, SessionButtonColor, SessionButtonType } from './basic/SessionButton';
 import { SessionSpinner } from './basic/SessionSpinner';
+import { switchHtmlToDarkTheme } from '../state/ducks/SessionTheme';
 
 interface State {
   error: string;
@@ -40,6 +41,7 @@ class SessionPasswordPromptInner extends React.PureComponent<{}, State> {
   }
 
   public componentDidMount() {
+    switchHtmlToDarkTheme();
     setTimeout(() => {
       this.inputRef?.focus();
     }, 100);
diff --git a/ts/mains/password_start.tsx b/ts/mains/password_start.tsx
index fc12c504b..418cdb2c4 100644
--- a/ts/mains/password_start.tsx
+++ b/ts/mains/password_start.tsx
@@ -3,5 +3,11 @@
 
 import React from 'react';
 import { SessionPasswordPrompt } from '../components/SessionPasswordPrompt';
+import { SessionTheme } from '../state/ducks/SessionTheme';
 
-window.ReactDOM.render(<SessionPasswordPrompt />, document.getElementById('root'));
+window.ReactDOM.render(
+  <SessionTheme>
+    <SessionPasswordPrompt />
+  </SessionTheme>,
+  document.getElementById('root')
+);