Merge pull request #1323 from Bilb/fix-light-mode

_locales/en/messages.json

@@ -2175,5 +2175,9 @@
   "closedGroupMaxSize": {
     "message": "A closed group cannot have more than 10 members",
     "androidKey": "activity_create_closed_group_too_many_group_members_error"
+  },
+  "noBlockedContacts": {
+    "message": "No blocked contacts",
+    "androidKey": "blocked_contacts_fragment__no_blocked_contacts"
   }
 }

stylesheets/_conversation.scss

@@ -429,7 +429,7 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    margin-bottom: 8px;
+    margin-bottom: 7px;
     padding: 0px 15px;
 
     .send-message {

stylesheets/_modal.scss

@@ -206,7 +206,9 @@
     position: relative;
 
     .module-avatar {
-      box-shadow: 0 0 23px 0 rgba($session-color-black, 0.78);
+      @include themify($themes) {
+        box-shadow: 0px 0px 13px 0.5px themed('sessionShadowColor');
+      }
     }
 
     .qr-view-button {

stylesheets/_session.scss

@@ -922,7 +922,6 @@ label {
   height: 80px;
   border-radius: 100%;
   background-color: rgba($session-color-black, 0.72);
-  box-shadow: 0px 0px 3px 0.5px rgba(0, 0, 0, 0.75);
   opacity: 0;
   transition: $session-transition-duration;
 

stylesheets/_session_left_pane.scss

@@ -348,7 +348,7 @@ $session-compose-margin: 20px;
   margin: auto;
 
   .session-brand-logo {
-    height: 215px;
+    height: 180px;
     filter: brightness(0) saturate(100%) invert(75%) sepia(84%) saturate(3272%)
       hue-rotate(103deg) brightness(106%) contrast(103%);
   }

stylesheets/_session_signin.scss

@@ -160,7 +160,7 @@
 
     &__unique-session-id {
       @include registration-label-mixin;
-      padding-top: 3em;
+      padding-top: 1em;
       text-align: center;
     }
 

stylesheets/themes.scss

@@ -34,6 +34,7 @@ $themes: (
     receivedMessageText: $black,
     sentMessageText: $black,
     sessionShadow: 0 0 4px 0 rgba($black, 0.37),
+    sessionShadowColor: rgba($black, 0.37),
     // left pane
       conversationList: $white,
     conversationItemHasUnread: #fcfcfc,
@@ -83,6 +84,7 @@ $themes: (
     receivedMessageText: $white,
     sentMessageText: $white,
     sessionShadow: 0 0 4px 0 rgba($white, 0.2),
+    sessionShadowColor: rgba($white, 0.2),
     // left pane
       conversationList: #1b1b1b,
     conversationItemHasUnread: #2c2c2c,

ts/components/session/LeftPaneMessageSection.tsx

@@ -467,6 +467,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
         id: 'connectToServer',
         type: 'success',
       });
+      this.setState({ loading: true });
       await OpenGroup.join(serverUrl, async () => {
         if (await OpenGroup.serverExists(serverUrl)) {
           ToastUtils.push({
@@ -474,9 +475,8 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
             id: 'connectToServer',
             type: 'success',
           });
-
-          this.setState({ loading: true });
         }
+        this.setState({ loading: false });
       });
       const openGroupConversation = await OpenGroup.getConversation(serverUrl);
 
@@ -498,6 +498,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
         id: 'connectToServer',
         type: 'error',
       });
+      this.setState({ loading: false });
     } finally {
       this.setState({
         loading: false,

ts/components/session/settings/SessionSettings.tsx

@@ -613,6 +613,25 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         confirmationDialogParams: undefined,
       });
     }
+
+    if (blockedNumbers.length === 0) {
+      return [
+        {
+          id: 'noBlockedContacts',
+          title: '',
+          description: window.i18n('noBlockedContacts'),
+          type: undefined,
+          category: SessionSettingCategory.Blocked,
+          content: undefined,
+          comparisonValue: undefined,
+          setFn: undefined,
+          hidden: false,
+          onClick: undefined,
+          confirmationDialogParams: undefined,
+        },
+      ];
+    }
+
     return results;
   }
 

ts/session/types/OpenGroup.ts

@@ -129,7 +129,7 @@ export class OpenGroup {
 
       conversation = await PromiseUtils.timeout(
         window.attemptConnection(prefixedServer, channel),
-        5000
+        15000
       );
       if (!conversation) {
         throw new Error(window.i18n('connectToServerFail'));