Merge pull request #127 from Beldex-Coin/transaction-history-alignmen…

…t-fixed
Beldex-Coin · Nov 28, 2024 · ab360c7 · ab360c7
2 parents 2110430 + 872e2bd
commit ab360c7
Show file tree

Hide file tree

Showing 10 changed files with 300 additions and 257 deletions.
diff --git a/images/bchat/no_mediaDarkTheme.svg b/images/bchat/no_mediaDarkTheme.svg
diff --git a/images/bchat/no_mediaWhiteTheme.svg b/images/bchat/no_mediaWhiteTheme.svg
diff --git a/ts/components/basic/PillContainer.tsx b/ts/components/basic/PillContainer.tsx
@@ -28,7 +28,7 @@ const StyledPillInner = styled.div<PillContainerProps>`
   flex-grow: 1;
   flex-shrink: 0;
   font-family: 'OpenSans';
-  font-weight: 600;
+  font-weight: 400;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;

diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -209,7 +209,8 @@ export const MessageContextMenu = (props: Props) => {
           <BchatIcon iconType={'infoCircle'} iconSize={18} />
           <span style={{ marginLeft: '10px' }}>{window.i18n('moreInformation')} </span></Item>
       )}
-      {showRetry ? <Item onClick={onRetry}>{window.i18n('resend')}</Item> : null}
+      {showRetry ? <Item onClick={onRetry}> <BchatIcon iconType={'resend'} iconSize={18}  />
+      <span style={{ marginLeft: '10px' }}>{window.i18n('resend')} </span></Item> : null}
       {isDeletable ? (
         <>
           <Item onClick={onSelect}> <BchatIcon iconType={'tickBoxCurve'} iconSize={18} />

diff --git a/ts/components/icon/Icons.tsx b/ts/components/icon/Icons.tsx
@@ -113,6 +113,7 @@ export type BchatIconType =
   | 'reply'
   | 'reload'
   | 'receipt'
+  | 'resend'
   | 'rotatedArrow'
   | 'paySend'
   | 'payRecieved'
@@ -294,11 +295,11 @@ export const icons = {
     viewBox: '0 0 18 18',
     ratio: 1,
   },
-  beta:{
+  beta: {
     path:
-    "M0 6.8C0 3.6 0 2 1 1C2 0 3.6 0 6.8 0H27.2C30.4 0 32 0 33 1C34 2 34 3.6 34 6.8C34 10 34 11.6 33 12.6C32 13.6 30.4 13.6 27.2 13.6H6.8C3.6 13.6 2 13.6 1 12.6C0 11.6 0 10 0 6.8ZM9.1002 9.9002H6.7002V3.7002H9.1002C10.4002 3.7002 11.1002 4.4002 11.1002 5.3002C11.1002 6.2002 10.6002 6.5002 10.0002 6.7002C10.7002 6.80019 11.2002 7.5002 11.2002 8.2002C11.2002 8.9002 10.4002 9.9002 9.1002 9.9002ZM9.0002 4.5002H7.7002V6.3002H9.0002C9.7002 6.3002 10.1002 6.0002 10.1002 5.4002C10.1002 4.8002 9.7002 4.5002 9.0002 4.5002ZM9.0002 7.10019H7.7002V9.1002H9.1002C9.8002 9.1002 10.2002 8.7002 10.2002 8.1002C10.2002 7.5002 9.7002 7.10019 9.0002 7.10019ZM15.7998 4.5002H13.3998V6.3002H15.5998V7.10019H13.3998V9.0002H15.7998V9.8002H12.2998V3.7002H15.7998V4.5002ZM16.6006 3.7002H21.0006V4.5002H19.3006V9.9002H18.3006V4.5002H16.6006V3.7002ZM25.6006 8.7002H23.2006L22.7006 10.0002H21.6006L23.8006 3.7002H25.0006L27.2006 10.0002H26.1006L25.6006 8.7002ZM24.5006 4.9002L23.5006 7.8002H25.5006L24.5006 4.9002Z",
-  viewBox: '0 0 34 14',
-  ratio: 1,
+      'M0 6.8C0 3.6 0 2 1 1C2 0 3.6 0 6.8 0H27.2C30.4 0 32 0 33 1C34 2 34 3.6 34 6.8C34 10 34 11.6 33 12.6C32 13.6 30.4 13.6 27.2 13.6H6.8C3.6 13.6 2 13.6 1 12.6C0 11.6 0 10 0 6.8ZM9.1002 9.9002H6.7002V3.7002H9.1002C10.4002 3.7002 11.1002 4.4002 11.1002 5.3002C11.1002 6.2002 10.6002 6.5002 10.0002 6.7002C10.7002 6.80019 11.2002 7.5002 11.2002 8.2002C11.2002 8.9002 10.4002 9.9002 9.1002 9.9002ZM9.0002 4.5002H7.7002V6.3002H9.0002C9.7002 6.3002 10.1002 6.0002 10.1002 5.4002C10.1002 4.8002 9.7002 4.5002 9.0002 4.5002ZM9.0002 7.10019H7.7002V9.1002H9.1002C9.8002 9.1002 10.2002 8.7002 10.2002 8.1002C10.2002 7.5002 9.7002 7.10019 9.0002 7.10019ZM15.7998 4.5002H13.3998V6.3002H15.5998V7.10019H13.3998V9.0002H15.7998V9.8002H12.2998V3.7002H15.7998V4.5002ZM16.6006 3.7002H21.0006V4.5002H19.3006V9.9002H18.3006V4.5002H16.6006V3.7002ZM25.6006 8.7002H23.2006L22.7006 10.0002H21.6006L23.8006 3.7002H25.0006L27.2006 10.0002H26.1006L25.6006 8.7002ZM24.5006 4.9002L23.5006 7.8002H25.5006L24.5006 4.9002Z',
+    viewBox: '0 0 34 14',
+    ratio: 1,
   },
   brand: {
     path:
@@ -946,6 +947,12 @@ export const icons = {
     viewBox: '0 0 24 24',
     ratio: 1,
   },
+  resend: {
+    path:
+"M21.1002 15.5C20.8002 17.6 19.1002 19.1 17.0002 19.1C15.8002 19.1 14.9002 18.6999 14.1002 17.9L13.5002 18.5C13.4002 18.6 13.1002 18.6 13.0002 18.5C13.0002 18.5 12.9002 18.3 12.9002 18.2V16.2C12.9002 15.9 13.2002 15.6 13.5002 15.6H15.5002C15.5002 15.6 15.7002 15.6 15.8002 15.7C15.9002 15.8 15.9002 16.1 15.8002 16.2L15.0002 17C15.6002 17.5 16.3002 17.7999 17.0002 17.7999C18.5002 17.7999 19.8002 16.7 19.9002 15.2C19.9002 14.9 20.2002 14.7 20.5002 14.7C20.84 14.7 21.1794 14.9452 21.1002 15.5ZM21.0002 11.4C20.9002 11.3 20.6002 11.3 20.5002 11.4L19.9002 12C19.1002 11.2 18.1002 10.8 17.0002 10.8C14.9002 10.8 13.1002 12.4 12.9002 14.4C12.9002 14.6 12.9002 14.8 13.1002 15C13.2002 15 13.3002 15.1 13.5002 15.1C13.7002 15.1 13.7002 15.1 13.7002 15.1C13.9002 15.1 14.0002 14.8 14.1002 14.6C14.3002 13.1 15.5002 12 17.0002 12C18.5002 12 18.5002 12.3 19.1002 12.8L18.3002 13.6C18.2002 13.7 18.2002 14 18.3002 14.1C18.3002 14.1 18.5002 14.2 18.6002 14.2H20.6002C20.9002 14.2 21.2002 13.9 21.2002 13.6C21.2002 13.6 21.2002 11.7885 21.2002 11.7189C21.2002 11.6493 21.1002 11.5 21.0002 11.4ZM1.0002 5.79995C0.800195 5.69995 0.700195 5.39995 0.700195 5.19995V4.29995C0.700195 2.89995 1.9002 1.69995 3.3002 1.69995H16.9002C18.3002 1.69995 19.5002 2.89995 19.5002 4.29995V5.09995C19.5002 5.09995 19.5002 5.19995 19.5002 5.29995V10.1C19.5002 10.3 19.5002 10.5 19.3002 10.6H19.2002C19.2002 10.7 19.0002 10.6 19.0002 10.6C18.8002 10.5 18.5002 10.4 18.3002 10.3H18.1002V9.89995V6.49995L11.9002 11.2C11.4002 11.6 10.8002 11.7 10.2002 11.7C9.60019 11.7 9.0002 11.5 8.5002 11.2L1.0002 5.79995ZM9.2002 10.2C9.7002 10.5 10.4002 10.5 10.9002 10.2L17.9002 4.89995V4.39995C17.9002 3.79995 17.4002 3.29995 16.8002 3.29995H3.3002C2.7002 3.29995 2.2002 3.79995 2.2002 4.39995V4.89995L9.2002 10.2ZM11.5002 15H3.3002C2.7002 15 2.2002 14.5 2.2002 13.9V7.89995C2.2002 7.69995 2.2002 7.49995 2.0002 7.39995C1.9002 7.29995 1.6002 7.19995 1.5002 7.19995C1.1002 7.19995 0.700195 7.59995 0.800195 7.99995V14C0.800195 15.4 2.0002 16.6 3.4002 16.6H11.6002C11.9002 16.6 12.1002 16.5 12.3002 16.2C12.4002 16 12.4002 15.7 12.3002 15.4C12.2002 15.2 11.9002 15 11.6002 15H11.5002Z",
+    viewBox: '0 0 22 20',
+    ratio: 1,
+  },
   rotatedArrow: {
     path:
       'M12 2.81934C6.85617 2.81934 2.75 6.96159 2.75 12.0693C2.75 12.4835 2.41421 12.8193 2 12.8193C1.58579 12.8193 1.25 12.4835 1.25 12.0693C1.25 6.13708 6.02383 1.31934 12 1.31934C15.5577 1.31934 18.2218 2.80534 19.9817 4.27342C20.4731 4.68335 20.8957 5.09318 21.25 5.47135V2.62934C21.25 2.21512 21.5858 1.87934 22 1.87934C22.4142 1.87934 22.75 2.21512 22.75 2.62934V7.62934C22.75 8.04355 22.4142 8.37934 22 8.37934H17.56C17.1458 8.37934 16.81 8.04355 16.81 7.62934C16.81 7.21512 17.1458 6.87934 17.56 6.87934H20.4993C20.126 6.44673 19.6329 5.9359 19.0208 5.42525C17.4482 4.11333 15.1123 2.81934 12 2.81934ZM22 11.3193C22.4142 11.3193 22.75 11.6551 22.75 12.0693C22.75 18.0035 17.9342 22.8193 12 22.8193C8.97954 22.8193 6.58449 21.2991 4.98113 19.8449C4.55554 19.4588 4.18095 19.0733 3.86 18.7148V21.5093C3.86 21.9235 3.52421 22.2593 3.11 22.2593C2.69579 22.2593 2.36 21.9235 2.36 21.5093V16.5093C2.36 16.0951 2.69579 15.7593 3.11 15.7593H7.63C8.04421 15.7593 8.38 16.0951 8.38 16.5093C8.38 16.9235 8.04421 17.2593 7.63 17.2593H4.5871C4.94789 17.698 5.41842 18.2164 5.98887 18.7338C7.45051 20.0595 9.50046 21.3193 12 21.3193C17.1058 21.3193 21.25 17.1751 21.25 12.0693C21.25 11.6551 21.5858 11.3193 22 11.3193Z',

diff --git a/ts/components/registration/SignInTab.tsx b/ts/components/registration/SignInTab.tsx
@@ -169,7 +169,7 @@ export const SignInTab = (props: any) => {
     }
     if (password !== repassword) {
       window?.log?.warn('invalid password');
-      return ToastUtils.pushToastError('invalidPassword', 'Passwords do not match');
+      return ToastUtils.pushToastError('invalidPassword', 'Please Enter Same Password !');
     }
     if (
       (password.length < 4 && repassword.length < 4) ||

diff --git a/ts/components/settings/ChangeChatFontSetting.tsx b/ts/components/settings/ChangeChatFontSetting.tsx
@@ -49,7 +49,7 @@ export const ChangeChatFontSetting = (props: { onSliderChange?: (value: number)
     }
 
     return (
-        <BchatSettingsItemWrapper title={window.i18n('chatFontSize')} inline={true} iconType='coverWithA'>
+        <BchatSettingsItemWrapper title={window.i18n('chatFontSize')} inline={true} iconType='coverWithA' description='Customize text size on the chat screen'>
             <div className="bchat-settings-item-font-Change"  onClick={() => displayPopUp()}>
                 <div>
                     {value}

diff --git a/ts/components/wallet/BchatWalletBalanceSection.tsx b/ts/components/wallet/BchatWalletBalanceSection.tsx
@@ -75,6 +75,7 @@ export const WalletBalanceSection = () => {
               flexDirection="row"
               alignItems="center"
               className="wallet-left-balance-Sec"
+              margin='5px 0 0 0'
             >
               <div className="currencyExt">{currency}</div>
               <div className="currencyVal">

diff --git a/ts/components/wallet/BchatWalletTransactionSection.tsx b/ts/components/wallet/BchatWalletTransactionSection.tsx
@@ -363,7 +363,7 @@ export const TransactionSection = (props: any) => {
                     </div>
                   </Flex>
 
-                  <section className="wallet-Transaction-contentBox-dateandheight" style={{marginLeft:zoomLevel>125 && innerWidth<1920?'38px':'',marginTop:zoomLevel>125 && innerWidth<1920?'15px':''}}>
+                  <section className="wallet-Transaction-contentBox-dateandheight" style={{marginLeft:zoomLevel>125 && innerWidth<1920?'38px':'',marginTop:'15px'}}>
                     <div
                       className="wallet-Transaction-contentBox-dateandheight-month"
                       style={{ marginBottom: '7px',textAlign:zoomLevel>125 && innerWidth<1920?'unset':'right' }}

diff --git a/ts/state/ducks/BchatTheme.tsx b/ts/state/ducks/BchatTheme.tsx
@@ -529,8 +529,8 @@ const lightInputBackground = '#EBEBEB';
 const lightFilterBchatText = 'brightness(0) saturate(100%)';
 const lightUnreadBorder = `4px solid ${accentLightTheme}`;
 
-const lightScrollbarThumb = '#F8F8F8';
-const lightScrollbarTrack = '#EBEBEB';
+const lightScrollbarThumb = '#ACACAC';
+const lightScrollbarTrack = '#F8F8F8';
 const lightFakeChatBubbleBg = '#f5f5f5';
 
 const lightInboxBackground = '#F0F0F0';