Merge pull request #1531 from session-foundation/feat/pro-badges

feat: pro badges

Author: Bilb

images/cta_hero_group_activated_admin.webp

@@ -68,17 +68,16 @@ window.sessionFeatureFlags = {
   proAvailable: !isEmpty(process.env.SESSION_PRO),
   mockCurrentUserHasPro: !isEmpty(process.env.SESSION_USER_HAS_PRO),
   mockOthersHavePro: !isEmpty(process.env.SESSION_OTHERS_HAVE_PRO),
+  mockMessageProFeatures: [],
   // Note: some stuff are init when the app starts, so fsTTL30s should only be set from the env itself (before app starts)
   fsTTL30s: !isEmpty(process.env.FILE_SERVER_TTL_30S),
-  debug: {
-    debugLogging: !isEmpty(process.env.SESSION_DEBUG),
-    debugLibsessionDumps: !isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS),
-    debugBuiltSnodeRequests: !isEmpty(process.env.SESSION_DEBUG_BUILT_SNODE_REQUEST),
-    debugSwarmPolling: !isEmpty(process.env.SESSION_DEBUG_SWARM_POLLING),
-    debugServerRequests: false,
-    debugNonSnodeRequests: false,
-    debugOnionRequests: false,
-  },
+  debugLogging: !isEmpty(process.env.SESSION_DEBUG),
+  debugLibsessionDumps: !isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS),
+  debugBuiltSnodeRequests: !isEmpty(process.env.SESSION_DEBUG_BUILT_SNODE_REQUEST),
+  debugSwarmPolling: !isEmpty(process.env.SESSION_DEBUG_SWARM_POLLING),
+  debugServerRequests: false,
+  debugNonSnodeRequests: false,
+  debugOnionRequests: false,
 };
 
 window.versionInfo = {

preload.js

@@ -4,7 +4,7 @@
 .module-contact-name {
   display: flex;
   flex-direction: column;
-  align-items: flex-start;
+  align-items: center;
   overflow-x: hidden;
   font-weight: 400;
 }
@@ -17,9 +17,6 @@
   user-select: none;
 }
 
-.module-contact-name__profile-number.italic {
-  font-style: italic;
-}
 // Module: Message
 
 .module-message__img-attachment {
@@ -200,11 +197,7 @@
   overflow-y: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-}
-
-.module-conversation__user__profile-name,
-.module-message__author__profile-name {
-  font-style: italic;
+  align-items: center;
 }
 
 // Module: Contact List Item
@@ -232,70 +225,11 @@
   font-size: 14px;
 }
 
-.module-contact-list-item__text__profile-name {
-  font-style: italic;
-}
-
 .module-contact-list-item__text__additional-data {
   margin-top: 3px;
   font-size: 14px;
 }
 
-// Module: Conversation Header
-
-.module-conversation-header {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.module-conversation-header__title-container {
-  min-width: 0;
-  display: block;
-  text-align: center;
-  flex-grow: 1;
-}
-
-.module-conversation-header__title-flex {
-  display: inline-flex;
-  flex-direction: row;
-  align-items: center;
-  max-width: 100%;
-}
-
-.module-conversation-header__avatar {
-  min-width: 28px;
-  user-select: none;
-}
-
-.module-conversation-header__title {
-  margin: 0px 20px;
-
-  min-width: 0;
-  font-size: 16px;
-  line-height: 26px;
-  font-weight: 400;
-  color: var(--text-primary-color);
-
-  // width of avatar (28px) and our 6px left margin
-  max-width: calc(100% - 34px);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-
-  display: flex;
-  align-items: center;
-
-  user-select: text;
-  cursor: pointer;
-
-  .module-contact-name__profile-name {
-    width: 100%;
-    overflow: hidden !important;
-    text-overflow: ellipsis;
-  }
-}
-
 // Module: Document List Item
 
 .module-document-list-item {
@@ -361,10 +295,6 @@
   &:hover {
     background-color: var(--conversation-tab-background-hover-color);
   }
-
-  &--is-blocked {
-    border-left: 4px solid var(--danger-color) !important;
-  }
 }
 
 .module-conversation-list-item__unread-count {
@@ -429,10 +359,6 @@
   flex-shrink: 0;
 }
 
-.module-conversation-list-item__header__name--with-unread {
-  font-weight: 300;
-}
-
 .module-conversation-list-item__header__date--has-unread {
   font-weight: 300;
   color: var(--conversation-tab-text-unread-color);
@@ -444,26 +370,6 @@
   align-items: center;
 }
 
-.module-conversation-list-item__message__text {
-  flex-grow: 1;
-  flex-shrink: 1;
-
-  font-size: var(--font-size-sm);
-  color: var(--conversation-tab-text-color);
-
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  .text-selectable {
-    user-select: none;
-  }
-}
-
-.module-conversation-list-item__message__text--has-unread {
-  font-weight: 400;
-  color: var(--conversation-tab-text-unread-color);
-}
-
 // Module: Image
 
 .module-image {
@@ -577,17 +483,6 @@
 
 // Module: Left Pane
 
-.module-left-pane {
-  display: inline-flex;
-  flex-direction: column;
-  width: var(--left-panel-width);
-  height: 100%;
-}
-
-.module-left-pane__virtual-list {
-  outline: none;
-}
-
 // Module H5AudioPlayer
 $rhap_background-color: var(--transparent-color) !default;
 $rhap_font-family: inherit !default;

stylesheets/_avatar.scss

@@ -2,7 +2,6 @@ body.rtl {
   input,
   button,
   textarea,
-  .module-left-pane,
   .module-conversation-list-item,
   .right-panel-item,
   .group-member-list__selection,

stylesheets/_mentions.scss

@@ -83,43 +83,6 @@ textarea {
 }
 
 /* CONVERSATION AND MESSAGES */
-.module-conversation-header {
-  height: var(--main-view-header-height);
-}
-
-.module-conversation-header__title-flex,
-.module-conversation-header__title {
-  font-weight: bold;
-  width: 100%;
-  display: flex;
-  font-size: var(--font-size-md);
-
-  &-text {
-    color: var(--text-primary-color);
-    font-weight: 400;
-    font-size: var(--font-size-sm);
-    line-height: var(--font-size-sm);
-  }
-
-  .module-contact-name {
-    width: 100%;
-  }
-
-  .module-contact-name__profile-number {
-    text-align: center;
-  }
-}
-
-.module-conversation-header__title {
-  flex-direction: column;
-}
-.module-conversation-header__title-flex {
-  flex-direction: row;
-}
-.module-conversation__user__profile-name,
-.module-message__author__profile-name {
-  font-style: normal;
-}
 
 .module-message--incoming {
   margin-inline-start: 0;
@@ -144,11 +107,6 @@ label {
   user-select: none;
 }
 
-.module-conversation-header {
-  position: relative;
-  padding: 0px var(--margins-lg) 0px var(--margins-sm);
-}
-
 .title-wrapper {
   position: relative;
 }