Merge pull request #132 from Beldex-Coin/dev

Beldex-Coin · Dec 13, 2024 · 8e96dd9 · 8e96dd9
2 parents 2a02f3b + 22a41ae
commit 8e96dd9
Show file tree

Hide file tree

Showing 80 changed files with 757 additions and 548 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Unlike other centralized messaging apps BChat never collect any user data like p
 The message you sent using BChat will be highly secure and anonymous. No one (even us) can have control of your data that has been shared in BChat. 
 Wtih BChat you own your data.
 <br/><br/>
-![BChatDesktop](https://bchat.beldex.io/blog/wp-content/uploads/2022/10/Your-Profile.png)
+![BChatDesktop](https://bchat.beldex.io/img/Profile.png)
 
 Contributing code
 -----------------

diff --git a/build/afterPackHook.js b/build/afterPackHook.js
@@ -24,7 +24,7 @@ module.exports = async function(context) {
     return;
   }
   // eslint-disable-next-line no-console
-  // console.log('afterPack hook triggered', context);
+
 
   const executableName = context.packager.executableName;
   const sourceExecutable = path.join(context.appOutDir, executableName);

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "bchat-desktop",
   "productName": "BChat",
   "description": "Private messaging from your desktop",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "license": "GPL-3.0",
   "author": {
     "name": "Beldex team",

diff --git a/stylesheets/_avatar.scss b/stylesheets/_avatar.scss
@@ -10,8 +10,8 @@ $borderAvatarColor: unquote(
   // border-radius: 50%;
   flex-shrink: 0;
   // border-radius: 7px;
-  overflow: hidden;
-  border-radius: 12px;
+  // overflow: hidden;
+  // border-radius: 12px;
 
   img {
     object-fit: cover;
@@ -97,11 +97,11 @@ $borderAvatarColor: unquote(
 }
 
 .module-avatar__icon-closed {
-  .module-avatar:first-child{
-    z-index: 1;
-    // box-shadow: 3px 3px 0px 0px rgba(0,0,0 ,75%);
-    box-shadow: 2px 2px 2px 0px var(--color-chatHeader);
-  }
+  // .module-avatar:first-child{
+  //   z-index: 1;
+  //   // box-shadow: 3px 3px 0px 0px rgba(0,0,0 ,75%);
+  //   box-shadow: 2px 2px 2px 0px var(--color-chatHeader);
+  // }
   .module-avatar:last-child {
     position: absolute;
     right: 0px;

diff --git a/stylesheets/_bchat.scss b/stylesheets/_bchat.scss
@@ -80,7 +80,7 @@ textarea {
   opacity: 0.3;
 }
 
-.button-group>div {
+.button-group > div {
   display: inline-flex;
   margin-inline-start: 5px;
   margin-inline-end: 5px;
@@ -397,7 +397,6 @@ textarea {
   &.brand,
   &.medium {
     &.secondary:hover:not(.disabled) {
-
       background-color: var(--color-secondary-btn-hover-bg);
     }
 
@@ -639,7 +638,6 @@ label {
 }
 
 .audio-message {
-
   // height: 40px;
   .timer {
     width: 60px;
@@ -767,21 +765,21 @@ label {
     padding: 25px;
     padding-bottom: 0px;
 
-    font-family: $bchat-font-poppins-bold;
+    // font-family: $bchat-font-poppins-bold;
     // text-align: center;
     line-height: 18px;
-    font-size: $bchat-font-h3;
-    font-weight: 500;
+    font-size: $bchat-font-h2;
+    font-weight: 700;
     margin-top: 10px;
 
     &.reverse {
       flex-direction: row-reverse;
 
-      .bchat-modal__header__close>div {
+      .bchat-modal__header__close > div {
         float: right;
       }
 
-      .bchat-modal__header__icons>div {
+      .bchat-modal__header__icons > div {
         float: left;
         padding-inline-start: 0px;
         padding-inline-end: 10px;
@@ -816,13 +814,13 @@ label {
       float: right;
     }
 
-    &__close>div {
+    &__close > div {
       float: left;
       padding: $bchat-margin-xs;
       margin: 0px;
     }
 
-    &__icons>div {
+    &__icons > div {
       float: right;
       padding-inline-start: 10px;
     }
@@ -841,7 +839,6 @@ label {
     // }
     .message {
       text-align: center;
-
     }
 
     .bchat-id-editable {
@@ -1167,15 +1164,32 @@ label {
     font-size: 16px;
     text-align: left;
   }
+  .currency-search {
+    height: 60px;
+    /* margin-inline-end: 1px; */
+    /* margin-bottom: 10px; */
+    display: inline-flex;
+    flex-shrink: 0;
+    padding: 0 21px;
+    border-radius: 16px;
+    border: 2px solid var(--color-search-border);
+    display: flex;
+    align-items: center;
 
+    width: 450px;
+    background-color: var(--color-confirm-modal-inner-bg);
+    input{
+      background-color: unset;
+    }
+  }
   &__walletModel {
-    width: 390px;
-    margin: 10px 10px 25px;
+    width: 450px;
+    margin: 10px 4px 25px;
     // font-family: 'Poppins';
     background-color: var(--color-confirm-modal-inner-bg);
     border-radius: 16px;
     padding: 20px 20px 0px;
-    max-height: 300px;
+    max-height: 241px;
     overflow-x: hidden;
   }
 
@@ -1583,7 +1597,15 @@ label {
     font-weight: 300;
   }
 
-  .react-contexify__item:not(.react-contexify__item--disabled):hover>.react-contexify__item__content {
+  .react-contexify__item:not(.react-contexify__item--disabled):focus
+    > .react-contexify__item__content,
+  .react-contexify__item:not(.react-contexify__item--disabled):hover
+    > .react-contexify__item__content {
+    background-color: var(--color-context-menu-hover-bg) !important;
+    border-radius: 14px;
+  }
+  .react-contexify__item:not(.react-contexify__item--disabled):hover
+    > .react-contexify__item__content {
     border-radius: 14px;
     // background: #333842;
     // color: var(--color-text-menu-highlighted);
@@ -1598,7 +1620,7 @@ label {
 
   &.react-contexify__submenu {
     top: 0px !important; // height of an item element
-
+    // right: 300px !important;
     .react-contexify__item__content {
       justify-content: start;
     }
@@ -1801,7 +1823,7 @@ label {
   left: 50%;
   margin: -40px 0 0 -40px;
 
-  &>div {
+  & > div {
     display: block;
   }
 }
@@ -2021,7 +2043,6 @@ label {
     border-bottom: 0.5px solid var(--color-search-border);
     border-radius: unset;
   }
-
 }
 
 .bchat-settings {
@@ -3373,7 +3394,6 @@ label {
     // }
 
     &-syncStatus {
-
       // position: relative;
       // height: 30px;
       // // width: 66.5%;
@@ -3449,7 +3469,8 @@ label {
 
       &-filterInput {
         // width: 315px;
-        width: 150px;
+        // width: 150px;
+        width: 220px;
         border: none;
         outline: none;
         height: 40px;
@@ -3594,7 +3615,6 @@ label {
           // width: 605px;
           // width: 75%;
           margin-left: 15px;
-
 
           &-amount {
             cursor: pointer;
@@ -3752,11 +3772,11 @@ label {
     transition: $bchat-transition-duration;
   }
 
-  input:hover+label:before {
+  input:hover + label:before {
     background: var(--color-accent);
   }
 
-  input:checked+label:before {
+  input:checked + label:before {
     background: var(--color-accent);
   }
 }
@@ -3954,7 +3974,7 @@ input {
     width: 100%;
     // max-height: 400px;
     overflow-y: auto;
-    height: 53%;
+    height: 100%;
     // margin: auto 0 auto 0;
     // border: var(--border-bchat);
     // border-bottom: var(--border-bchat);
@@ -4023,7 +4043,7 @@ input {
     }
   }
 
-  .floated-downArrow-btn-wrapper+.downArrow-unreadCountBox {
+  .floated-downArrow-btn-wrapper + .downArrow-unreadCountBox {
     background-color: #ffffff;
     color: #000;
   }
@@ -4155,7 +4175,7 @@ input {
     opacity: 0.8;
   }
 
-  &__avatar>div {
+  &__avatar > div {
     margin-bottom: 0px !important;
   }
 
@@ -4253,4 +4273,4 @@ input {
   &:hover {
     color: var(--color-context-menu-hover-bg);
   }
-}
+}
diff --git a/stylesheets/_bchat_constants.scss b/stylesheets/_bchat_constants.scss
@@ -228,7 +228,8 @@ $bchat-subtle-factor: 0.6;
 // Default Components
 $bchat-search-input-height: 34px;
 // $main-view-header-height: 63px;
-$main-view-header-height: 70px;
+// $main-view-header-height: 70px;
+$main-view-header-height: 90px;
 
 $bchat-left-pane-width: 300px;