From 7da988c132381ac441e5ac05777c0422f4c310be Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 9 Dec 2020 13:01:48 +1100
Subject: [PATCH] fix up session logo on loading and max message body length

---
 background.html                                   |  7 -------
 background_test.html                              |  8 --------
 images/session/session-text.svg                   |  5 +----
 stylesheets/_global.scss                          |  3 +++
 stylesheets/_session_left_pane.scss               | 15 ++-------------
 test/index.html                                   |  7 -------
 .../conversation/SessionCompositionBox.tsx        |  2 +-
 7 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/background.html b/background.html
index 4616c5a28..2fc413092 100644
--- a/background.html
+++ b/background.html
@@ -27,13 +27,6 @@
     When making changes to these templates, be sure to update test/index.html as well
   -->
 
-  <script type='text/x-tmpl-mustache' id='app-loading-screen'>
-    <div class="content session-full-logo">
-      <img src="images/session/brand.svg" class="session-brand-logo" />
-      <img src="images/session/session-text.svg" class="session-text-logo" />
-    </div>
-  </script>
-
   <script type='text/x-tmpl-mustache' id='banner'>
     <div class='body'>
       <span class='icon warning'></span>
diff --git a/background_test.html b/background_test.html
index 0bd8f73fa..d5a54e69d 100644
--- a/background_test.html
+++ b/background_test.html
@@ -27,14 +27,6 @@
     When making changes to these templates, be sure to update test/index.html as well
   -->
 
-  <script type='text/x-tmpl-mustache' id='app-loading-screen'>
-    <div class="content session-full-logo">
-      <img src="images/session/brand.svg" class="session-brand-logo" />
-      <img src="images/session/session-text.svg" class="session-text-logo" />
-    </div>
-  </script>
-
-
   <script type='text/x-tmpl-mustache' id='banner'>
     <div class='body'>
       <span class='icon warning'></span>
diff --git a/images/session/session-text.svg b/images/session/session-text.svg
index 0d47d11c0..030d37b76 100644
--- a/images/session/session-text.svg
+++ b/images/session/session-text.svg
@@ -3,10 +3,7 @@
 <svg version="1.1"
 	 id="svg2" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
 	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 766.2 102.3"
-	 style="enable-background:new 0 0 766.2 102.3;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
+	 style="enable-background:new 0 0 766.2 102.3;" xml:space="preserve" fill="white">
 <g id="g12">
 	<g>
 		<g>
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index ef8df8b3b..c92b3d80b 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -279,6 +279,9 @@ $loading-height: 16px;
       animation: loading 1500ms ease infinite 666ms;
     }
   }
+  .session-text-logo {
+    filter: brightness(0) saturate(100%);
+  }
 }
 
 //yellow border fix
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index ff47b7153..a7b48ec92 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -366,20 +366,9 @@ $session-compose-margin: 20px;
       filter: themed('filterSessionText');
     }
     transition: 0s;
-  }
-}
-
-.app-loading-screen {
-  @include themify($themes) {
-    background: themed('inboxBackground');
-  }
-  .session-text-logo {
-    @include themify($themes) {
-      filter: themed('filterSessionText') !important;
+    .path {
+      fill: red;
     }
-    // filter: none ; // force no filter on the text of the app loading
-    // as the theme is not set right on the start.
-    // this is to avoid a text color switch on app loading.
   }
 }
 
diff --git a/test/index.html b/test/index.html
index 518f4ddf6..daa1fefb3 100644
--- a/test/index.html
+++ b/test/index.html
@@ -17,13 +17,6 @@
   </div>
   </div>
 
-  <script type="text/x-tmpl-mustache" id="app-loading-screen">
-    <div class="content session-full-logo">
-      <img src="../images/session/brand.svg" class="session-brand-logo" />
-      <img src="../images/session/session-text.svg" class="session-text-logo" />
-    </div>
-  </script>
-
   <script type="text/x-tmpl-mustache" id="banner">
     <div class="body">
       <span class="icon warning"></span>
diff --git a/ts/components/session/conversation/SessionCompositionBox.tsx b/ts/components/session/conversation/SessionCompositionBox.tsx
index 0d8068769..faf6753d5 100644
--- a/ts/components/session/conversation/SessionCompositionBox.tsx
+++ b/ts/components/session/conversation/SessionCompositionBox.tsx
@@ -808,7 +808,7 @@ export class SessionCompositionBox extends React.Component<Props, State> {
     }
     // Verify message length
     const msgLen = messagePlaintext?.length || 0;
-    if (msgLen > window.CONSTANTS.MAX_MESSAGE_BODY_LENGTH) {
+    if (msgLen > Constants.CONVERSATION.MAX_MESSAGE_BODY_LENGTH) {
       ToastUtils.pushMessageBodyTooLong();
       return;
     }