From e79637afbf932e0c3cc86afc1ca210bfa157eabc Mon Sep 17 00:00:00 2001 From: fetok12 Date: Wed, 20 Nov 2024 23:13:47 +0300 Subject: [PATCH 1/8] fix-modal-css-admin-panel --- web/src/containers/Admin/Plugins/index.css | 7 ++++++ web/src/containers/Admin/Stakes/CeFi.scss | 25 +++++++++++++++++----- web/src/containers/Admin/Trades/index.css | 7 ++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/web/src/containers/Admin/Plugins/index.css b/web/src/containers/Admin/Plugins/index.css index a9ebc24ce0..6788c7f312 100644 --- a/web/src/containers/Admin/Plugins/index.css +++ b/web/src/containers/Admin/Plugins/index.css @@ -310,6 +310,7 @@ } .admin-plugin-modal-wrapper h2 { font-size: 19px; + color: #ffffff; } .admin-plugin-modal-wrapper .add-btn { background-color: #00781b; @@ -380,6 +381,12 @@ .admin-plugin-modal-wrapper .url-path { font-size: 13px; } +.ant-modal-header, +.ant-modal-content, +.ant-modal-confirm-body .ant-modal-confirm-content { + background-color: var(--admin_panel_modal_background); + color: #ffffff; +} .admin-plugin-modal-wrapper .plugins-icon, .config-wrapper .plugins-icon { width: 70px; diff --git a/web/src/containers/Admin/Stakes/CeFi.scss b/web/src/containers/Admin/Stakes/CeFi.scss index e08a3271e4..adebd4e171 100644 --- a/web/src/containers/Admin/Stakes/CeFi.scss +++ b/web/src/containers/Admin/Stakes/CeFi.scss @@ -11,10 +11,25 @@ color: #fff !important; } - -.session-table .ant-table-thead > tr > th{ - font-size: 1rem; +.session-table .ant-table-thead > tr > th { + font-size: 1rem; } -.session-table .ant-table-tbody > tr > td{ +.session-table .ant-table-tbody > tr > td { padding: 8px 8px; -} \ No newline at end of file +} + +.ant-table-thead > tr > th { + background-color: var(--admin_panel_table_thead); + color: var(--admin_panel_main_font); +} +.ant-table-tbody > tr > td { + background-color: var(--admin_panel_table_tbody); + color: var(--admin_panel_main_font); + border-bottom: 1px solid var(--admin_panel_table_tbody); +} +.ant-table-tbody > tr.ant-table-placeholder:hover > td { + background-color: var(--admin_panel_table_tbody_hover); +} +.ant-table-tbody > tr.ant-table-row:hover > td { + background-color: var(--admin_panel_table_tbody_hover); +} diff --git a/web/src/containers/Admin/Trades/index.css b/web/src/containers/Admin/Trades/index.css index 87e35983e7..680a231bb3 100644 --- a/web/src/containers/Admin/Trades/index.css +++ b/web/src/containers/Admin/Trades/index.css @@ -16,6 +16,13 @@ border: none; } +.ant-modal-header, +.ant-modal-content, +.ant-modal-confirm-body .ant-modal-confirm-content { + background-color: var(--admin_panel_modal_background); + color: #ffffff; +} + .ant-table-thead > tr > th { background-color: var(--admin_panel_table_thead); color: var(--admin_panel_main_font); From c8b544b37722379231882a1443f6fc349f40cf62 Mon Sep 17 00:00:00 2001 From: fetok12 Date: Wed, 20 Nov 2024 23:17:23 +0300 Subject: [PATCH 2/8] fix-modal-css-admin-panel --- web/src/containers/Admin/Trades/index.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/src/containers/Admin/Trades/index.css b/web/src/containers/Admin/Trades/index.css index 680a231bb3..bbae3d4313 100644 --- a/web/src/containers/Admin/Trades/index.css +++ b/web/src/containers/Admin/Trades/index.css @@ -22,6 +22,9 @@ background-color: var(--admin_panel_modal_background); color: #ffffff; } +.ant-modal-body h2 { + color: #ffffff; +} .ant-table-thead > tr > th { background-color: var(--admin_panel_table_thead); From 207120232ff59a5f0d43a0a6f7a32f80189bf44d Mon Sep 17 00:00:00 2001 From: ram Date: Thu, 21 Nov 2024 20:55:49 +0530 Subject: [PATCH 3/8] Changes for the Auto payment billing in the admin page --- web/src/components/AppBar/AccountTab.js | 16 +- web/src/components/AppBar/Utils.js | 34 ++ .../Admin/AdminFinancials/action.js | 18 + web/src/containers/Admin/Billing/Billing.scss | 204 ++++++- .../Admin/Billing/generalContent.js | 557 +++++++++++++++--- .../containers/Admin/Trades/Otcdeskpopup.js | 1 + web/src/containers/Admin/Trades/index.css | 7 +- web/src/containers/Admin/User/AboutData.js | 2 +- web/src/containers/Admin/User/UserContent.js | 4 +- web/src/containers/App/App.js | 19 +- web/src/containers/App/_App.scss | 21 + web/src/index.css | 10 + web/src/reducers/userReducer.js | 3 + 13 files changed, 816 insertions(+), 80 deletions(-) diff --git a/web/src/components/AppBar/AccountTab.js b/web/src/components/AppBar/AccountTab.js index 44c1d6ca2d..956e2d2a14 100644 --- a/web/src/components/AppBar/AccountTab.js +++ b/web/src/components/AppBar/AccountTab.js @@ -13,6 +13,7 @@ import withConfig from 'components/ConfigProvider/withConfig'; import { Image, EditWrapper } from 'components'; import { isLoggedIn, removeToken } from 'utils/token'; import { setSecurityTab, setSettingsTab } from 'actions/appActions'; +import { renderConfirmSignout } from './Utils'; const AccountTab = ({ config_level, @@ -105,6 +106,7 @@ const AccountList = ({ }) => { const [isHelpResources, setIsHelpResources] = useState(false); const [currPath, setCurrpath] = useState('/summary'); + const [isLogout, setIsLogout] = useState(false); useEffect(() => { const getCurrPage = window.location.pathname; @@ -186,7 +188,7 @@ const AccountList = ({ const onHandleRoutes = (value = '/', title = '') => { const selectedTab = { 'LOGIN.HELP': () => setIsHelpResources(true), - 'ACCOUNTS.TAB_SIGNOUT': () => removeToken(), + 'ACCOUNTS.TAB_SIGNOUT': () => setIsLogout(true), 'ACCOUNTS.TAB_SECURITY': () => setSecurityTab(0), 'MORE_OPTIONS_LABEL.ICONS.API': () => setSecurityTab(2), 'USER_SETTINGS.TITLE_LANGUAGE': () => setSettingsTab(2), @@ -217,6 +219,16 @@ const AccountList = ({ ? Icons[`LEVEL_ACCOUNT_ICON_${verification_level}`] : Icons['LEVEL_ACCOUNT_ICON_4']; + const onHandlelogout = () => { + setIsLogout(false); + removeToken(); + return browserHistory?.push('/login'); + }; + + const onHandleclose = () => { + setIsLogout(false); + }; + return (
{isHelpResources && renderHelpResource()} @@ -238,6 +250,8 @@ const AccountList = ({ ({user?.email})
+ {isLogout && + renderConfirmSignout(isLogout, onHandleclose, onHandlelogout)} {accountOptions?.map((options) => { return ( options?.isDisplay && ( diff --git a/web/src/components/AppBar/Utils.js b/web/src/components/AppBar/Utils.js index 6e2328512c..0f14b8a20d 100644 --- a/web/src/components/AppBar/Utils.js +++ b/web/src/components/AppBar/Utils.js @@ -351,3 +351,37 @@ export const ReconnectPopup = ({ isDisplayPopup, onHandleClose }) => { ); }; + +export const renderConfirmSignout = ( + isVisible, + onHandleclose, + onHandlelogout +) => { + return ( + onHandleclose()} + > +
+ + + {STRINGS['LOGOUT_CONFIRM_TEXT']} + + +
+ + +
+
+ + ); +}; diff --git a/web/src/containers/Admin/AdminFinancials/action.js b/web/src/containers/Admin/AdminFinancials/action.js index 8ecf3d9440..cefe230945 100644 --- a/web/src/containers/Admin/AdminFinancials/action.js +++ b/web/src/containers/Admin/AdminFinancials/action.js @@ -185,3 +185,21 @@ export const deleteTransactionLimit = (values) => { data: values, }); }; + +export const setAutoPaymentDetail = (values) => { + const options = { + method: 'POST', + body: JSON.stringify(values), + }; + + return requestDashAuthenticated('/dash/user/auto-payment', options); +}; + +export const removeAutoPayment = (values) => { + const options = { + method: 'DELETE', + body: JSON.stringify(values), + }; + + return requestDashAuthenticated('/dash/user/auto-payment', options); +}; diff --git a/web/src/containers/Admin/Billing/Billing.scss b/web/src/containers/Admin/Billing/Billing.scss index 39bb260e26..0ac70f6907 100644 --- a/web/src/containers/Admin/Billing/Billing.scss +++ b/web/src/containers/Admin/Billing/Billing.scss @@ -190,9 +190,34 @@ padding: 0rem 3rem 0rem 2.5rem !important; } + .billing-button-container { + justify-content: space-between !important; + align-items: center; + padding: 0 3%; + .button-wrapper { + min-width: 65%; + display: flex; + align-items: center; + justify-content: flex-start; + gap: 4%; + .custom-line { + width: 2px; + height: 20px; + background-color: #ffffff; + } + .check-icon { + svg { + path { + fill: var(--specials_checks-okay-done); + } + } + } + } + } + .button-container { display: flex; - justify-content: flex-end; + // justify-content: flex-end; background-color: #040e6d; border-bottom-left-radius: 1rem; border-bottom-right-radius: 1rem; @@ -201,7 +226,8 @@ color: #ffffff; text-decoration: underline; cursor: pointer; - margin: 1rem 16rem 0rem 0rem; + // margin: 1rem 16rem 0rem 0rem; + width: max-content; } .paid-btn { @@ -1132,3 +1158,177 @@ cursor: not-allowed; } } + +.auto-payment-billing-popup-wrapper { + .ant-modal-body { + background-color: #27339d; + color: #ffffff; + font-size: 12px; + .auto-payment-billing-popup-container { + .title { + font-size: 20px !important; + } + + .payment-description { + margin-top: 2%; + } + + .account-details { + margin-top: 3%; + display: flex; + flex-direction: column; + .payment-email-input-wrapper { + .payment-email-address { + width: 60%; + font-size: 12px; + } + .edit-btn:hover { + cursor: pointer; + } + } + } + .asset-wrapper { + display: flex; + gap: 2%; + align-items: center; + .asset-icon { + width: 32px; + height: 32px; + border-radius: 25px; + font-size: 10px; + color: #cccccc; + background-color: #178700; + display: flex; + align-items: center; + justify-content: center; + } + } + .error-field { + color: #ffff00; + padding: 2% 0; + display: flex; + gap: 1%; + align-items: center; + font-weight: bold; + margin-left: 8%; + } + .warning-description { + width: 85%; + margin-top: 2%; + background-color: var(--admin_panel_content_background); + padding: 2%; + display: flex; + align-items: center; + .message { + font-size: 10px; + } + .warning-icon { + svg { + width: 2rem; + height: 1.5rem; + path { + fill: #ffffff; + } + } + } + } + .auto-payment-popup-button-wrapper { + margin-top: 5%; + display: flex; + gap: 5%; + .green-btn { + width: 50%; + background-color: #288500 !important; + color: #ffffff !important; + border: none; + } + .inactive-btn { + opacity: 0.5; + } + } + } + } + .ant-modal-close { + color: #ffffff; + } +} + +.confirm-payment-billing-popup-wrapper { + top: 5%; + .confirm-payment-billing-popup-container { + .details-description { + color: #cccccc; + } + .cloud-card { + font-size: 14px; + padding: 2% 0 4% 0; + border-bottom: 2px solid #a8a8b1; + .card-wrapper { + margin-top: 2%; + background-size: contain; + background-position: right; + background-repeat: no-repeat; + padding: 5% 0; + background-color: var(--admin_panel_content_background); + border-radius: 5px; + .diy-background, + .cloud-background { + padding: 0 0 0 2%; + width: 18%; + } + .cloud-card-details { + align-items: center; + gap: 3%; + .cloud-type, + .white-text, + .basic-plan { + margin-bottom: unset !important; + font-size: 13px !important; + } + .white-text, + .cloud-type { + font-weight: bold; + } + .cloud-type { + margin-left: 3%; + } + .cloud-type, + .basic-plan { + color: #a8a8b1 !important; + } + } + } + } + .fund-source-details, + .payment-interval, + .next-payment-date, + .payment-amount { + padding: 1% 0; + .payment-title { + font-size: 14px !important; + } + .description-text { + font-size: 12px; + color: #cccccc; + } + } + } +} + +.edit-payment-billing-popup-wrapper { + .edit-payment-popup-container { + .input-field { + display: flex; + align-items: flex-start; + gap: 2%; + .ant-input { + width: 3%; + position: relative; + top: 2px; + } + } + .auto-payment-popup-button-wrapper { + margin-top: 20% !important; + } + } +} diff --git a/web/src/containers/Admin/Billing/generalContent.js b/web/src/containers/Admin/Billing/generalContent.js index 8b162b88a8..691caf1adc 100644 --- a/web/src/containers/Admin/Billing/generalContent.js +++ b/web/src/containers/Admin/Billing/generalContent.js @@ -1,4 +1,4 @@ -import React, { Fragment, useEffect, useState } from 'react'; +import React, { Fragment, useEffect, useRef, useState } from 'react'; import { connect } from 'react-redux'; import { Link } from 'react-router'; import { ReactSVG } from 'react-svg'; @@ -25,6 +25,7 @@ import { CopyOutlined, CheckCircleFilled, ExclamationCircleFilled, + ExclamationCircleOutlined, } from '@ant-design/icons'; import isEmpty from 'lodash.isempty'; @@ -70,6 +71,12 @@ import { pendingPayOption, } from './utils'; import './Billing.scss'; +import { getFormattedDate } from 'utils/string'; +import { + removeAutoPayment, + setAutoPaymentDetail, +} from '../AdminFinancials/action'; +import { requestUsers } from '../Trades/actions'; const { Option } = Select; const TabPane = Tabs.TabPane; @@ -105,13 +112,12 @@ const GeneralContent = ({ const balance = user?.balance; const dashToken = localStorage.getItem(DASH_TOKEN_KEY); const isPluginDataAvail = !isEmpty(pluginData); + const month = dashExchange.period !== 'year'; const [modalWidth, setModalWidth] = useState('85rem'); const [OpenPlanModal, setOpenPlanModal] = useState(isPluginDataAvail); const [isLoading, setIsLoading] = useState(false); - const [isMonthly, setIsMonthly] = useState( - dashExchange.period !== 'year' ? true : false - ); + const [isMonthly, setIsMonthly] = useState(month); const [invoiceData, setinvoiceData] = useState([]); const [currentInvoice, setCurrentInvoice] = useState({}); const [activateInvoiceData, setActivateInvoiceData] = useState({}); @@ -127,6 +133,18 @@ const GeneralContent = ({ const [selectedPendingItem, setSelectedPendingItem] = useState({}); const [cryptoPayType, setCryptoPay] = useState(''); const [activeKey, setActiveKey] = useState('1'); + const [isAutoPayment, setIsAutoPayment] = useState(false); + const [isConfirmAutoPayment, setIsConfirmAutoPayment] = useState(false); + const [isEditAutoPayment, setIsEditAutoPayment] = useState(false); + const [isEditDetail, setIsEditDetail] = useState(true); + const [isRemovePayment, setIsRemovePayment] = useState(false); + const [isConfirmRemovePayment, setIsConfirmRemovePayment] = useState(false); + const [userData, setUserData] = useState([]); + const [selectedEmailData, setSelectedEmailData] = useState( + userData[0]?.email || '' + ); + + const selectRef = useRef(null); const planPriceData = priceData[selectedType]; @@ -207,6 +225,30 @@ const GeneralContent = ({ // eslint-disable-next-line react-hooks/exhaustive-deps }, [selectedType]); + const getAllUserData = async (params = {}, emailChange = false) => { + try { + const res = await requestUsers(params); + if (res && res.data) { + const userData = res.data.map((user) => ({ + label: user.email, + value: user.id, + })); + setSelectedEmailData(userData); + setUserData(res.data); + } + } catch (error) { + console.error('error', error); + } + }; + + const searchUser = (searchText) => { + getAllUserData({ search: searchText }); + }; + + const searchUserById = (userId) => { + getAllUserData({ id: userId }); + }; + const getExplorePlugin = async () => { try { const res = await requestPlugins(); @@ -598,6 +640,81 @@ const GeneralContent = ({ setHideBreadcrumb(false); }; + const renderCardDetails = () => { + return ( +
+
+ + +
+
+
+ {exchangeCardKey !== 'diy' && ( +

Cloud:

+ )} +

+ {selectedType === 'diy' + ? 'Do-It-Yourself' + : selectedType === 'fiat' + ? 'Enterprise' + : selectedType} +

+
+
+

+ {selectedPlanData[selectedType]?.description} +

+
+
+
+ ); + }; + + const onHandleAutoPayment = () => { + if (dashExchange?.auto_payment_id) { + setIsEditAutoPayment(true); + } else { + setIsAutoPayment(true); + } + searchUserById(1); + }; + const renderCard = () => { const isPaid = dashExchange.is_paid && moment().isBefore(moment(dashExchange.expiry)); @@ -611,74 +728,34 @@ const GeneralContent = ({ ) : ( <>
+ {renderCardDetails()}
-
- - -
-
-
- {exchangeCardKey !== 'diy' && ( -

Cloud:

- )} -

- {selectedType === 'diy' - ? 'Do-It-Yourself' - : selectedType === 'fiat' - ? 'Enterprise' - : selectedType} -

+ +
+ {isPaid && ( +
+ View last bill
-
-

- {selectedPlanData[selectedType]?.description} -

+ )} +
+ {dashExchange?.auto_payment_id ? ( +
onHandleAutoPayment()}> + {' '} + Auto Payment Set +
+ ) : ( +
onHandleAutoPayment()} + > + Auto Payment Bill +
+ )}
-
-
-
- - {isPaid && ( -
- View last bill -
- )} + +
+
+ + onHandleConfirmClose()} + footer={null} + > +
+
Review & confirm auto payment
+
+ Please check the automatic billing payment details below: +
+
+
Item
+ {renderCardDetails()} +
+
+
Fund Source
+
Account
+
+ {userData[0]?.email || userEmail} +
+
+
usdt: {usdtPrice}
+
+
+
Interval
+
+ {month ? 'Monthly' : 'Yearly'} +
+
+
+
Date of next payment
+
+ {getFormattedDate(dashExchange.expiry)} +
+
+
+
Amount to pay
+
+ {planPriceData && planPriceData[month ? 'month' : 'year']?.price}{' '} + USDT +
+
+
+ + +
+
+ + onHandleEditClose()} + footer={null} + > +
+
Edit Automatic bill payment
+
+
+ { + setIsEditDetail(!isEditDetail); + setIsRemovePayment(false); + }} + /> + +
+
+ { + setIsRemovePayment(!isRemovePayment); + setIsEditDetail(false); + }} + /> + +
+
+
+ + +
+
+ + onHandleCloseRemovePayment()} + footer={null} + > +
+
Stop and remove Auto pay
+
+ You can resume auto payment later at anytime. +
+
+ Are you sure you want to stop and remove automatic payments now for + billing? +
+
+ + +
+
+ {renderModalContent()} diff --git a/web/src/containers/Admin/Trades/index.css b/web/src/containers/Admin/Trades/index.css index 1ff30ecbba..25305cc914 100644 --- a/web/src/containers/Admin/Trades/index.css +++ b/web/src/containers/Admin/Trades/index.css @@ -731,6 +731,7 @@ overflow-y: scroll; } .otc-Container .ant-input-affix-wrapper .ant-input, +.otc-Container .ant-input-affix-wrapper, .otc-Container .expiry-time-field { background-color: var(--admin_panel_input); color: #ffffff; @@ -792,7 +793,8 @@ cursor: text; } -.p2p-admin-confirm-warning-popup-wrapper .ant-modal-body { +.p2p-admin-confirm-warning-popup-wrapper .ant-modal-body, +.otc-broker-popup-wrapper .ant-modal-body { background-color: #27339d; color: white; } @@ -816,7 +818,8 @@ border: none; } -.p2p-admin-confirm-warning-popup-wrapper .ant-modal-close-x { +.p2p-admin-confirm-warning-popup-wrapper .ant-modal-close-x, +.otc-broker-popup-wrapper .ant-modal-close-x { color: white; } diff --git a/web/src/containers/Admin/User/AboutData.js b/web/src/containers/Admin/User/AboutData.js index 8c51428e1e..35c8e810c0 100644 --- a/web/src/containers/Admin/User/AboutData.js +++ b/web/src/containers/Admin/User/AboutData.js @@ -634,7 +634,7 @@ const AboutData = ({ return (
-
+
{userData.activated ? ( diff --git a/web/src/containers/Admin/User/UserContent.js b/web/src/containers/Admin/User/UserContent.js index 93b305922f..c50a779fac 100644 --- a/web/src/containers/Admin/User/UserContent.js +++ b/web/src/containers/Admin/User/UserContent.js @@ -230,13 +230,13 @@ class UserContent extends Component { deleteUser(postValues) .then((res) => { refreshData({ ...postValues, activated: false }); - this.setState({ showDeleteModal: false }); }) .catch((err) => { const _error = err.data && err.data.message ? err.data.message : err.message; message.error(_error); }); + this.setState({ showDeleteModal: false }); }; openVerifyEmailModal = () => { @@ -505,7 +505,7 @@ class UserContent extends Component { /> this.setState({ showRecoverModal: false })} + onCancel={() => this.setState({ showDeleteModal: false })} onConfirm={this.handleDeleteUser} userData={userInformation} /> diff --git a/web/src/containers/App/App.js b/web/src/containers/App/App.js index d0ee8c3f4e..b9b3905444 100644 --- a/web/src/containers/App/App.js +++ b/web/src/containers/App/App.js @@ -72,6 +72,7 @@ import GetSocketState from './GetSocketState'; import withEdit from 'components/EditProvider/withEdit'; import withConfig from 'components/ConfigProvider/withConfig'; import { ETHEREUM_EVENTS } from 'actions/stakingActions'; +import { renderConfirmSignout } from 'components/AppBar/Utils'; class App extends Component { state = { @@ -91,6 +92,7 @@ class App extends Component { isTradeTab: false, isProTrade: false, isQuickTrade: false, + isLogout: false, }; ordersQueued = []; limitTimeOut = null; @@ -319,7 +321,7 @@ class App extends Component { switch (path) { case 'logout': - this.logout(); + this.setState({ isLogout: true }); break; case 'help': this.props.openHelpfulResourcesForm(); @@ -677,6 +679,15 @@ class App extends Component { browserHistory.push(path); }; + onHandleClose = () => { + this.setState({ isLogout: false }); + }; + + onHandleLogout = () => { + this.onHandleClose(); + this.logout(); + }; + render() { const { symbol, @@ -887,6 +898,12 @@ class App extends Component {
)} */} + {this.state.isLogout && + renderConfirmSignout( + this.state.isLogout, + this.onHandleClose, + this.onHandleLogout + )} Date: Mon, 25 Nov 2024 04:08:58 +0300 Subject: [PATCH 4/8] p2p transaction duration --- server/utils/hollaex-tools-lib/tools/p2p.js | 2 +- .../containers/Admin/Trades/p2pSettings.js | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/server/utils/hollaex-tools-lib/tools/p2p.js b/server/utils/hollaex-tools-lib/tools/p2p.js index 5074cda368..8470ef6eb6 100644 --- a/server/utils/hollaex-tools-lib/tools/p2p.js +++ b/server/utils/hollaex-tools-lib/tools/p2p.js @@ -571,7 +571,7 @@ const createP2PTransaction = async (data) => { data.user_status = 'pending'; data.merchant_status = 'pending'; data.transaction_status = 'active'; - data.transaction_duration = 30; + data.transaction_duration = Number(p2pConfig?.transaction_duration || 30); data.transaction_id = uuid(); data.merchant_id = side === 'buy' ? user_id : merchant_id; data.user_id = side === 'buy' ? merchant_id : user_id; diff --git a/web/src/containers/Admin/Trades/p2pSettings.js b/web/src/containers/Admin/Trades/p2pSettings.js index 2df7aa36a5..01c2069482 100644 --- a/web/src/containers/Admin/Trades/p2pSettings.js +++ b/web/src/containers/Admin/Trades/p2pSettings.js @@ -42,6 +42,7 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => { const [tiers, setTiers] = useState(); const [merchantTier, setMerchantTier] = useState(); const [userTier, setUserTier] = useState(); + const [transactionDuration, setTransactionDuration] = useState(30); const [paymentMethod, setPaymentMethod] = useState({ system_name: null, fields: {}, @@ -91,6 +92,7 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => { useEffect(() => { setEnable(p2p_config?.enable); setSide(p2p_config?.side); + setTransactionDuration(p2p_config?.transaction_duration || 30); setDigitalCurrencies(p2p_config?.digital_currencies || []); setFiatCurrencies(p2p_config?.fiat_currencies || []); setMerchantTier(p2p_config?.starting_merchant_tier); @@ -257,6 +259,7 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => { merchant_fee: merchantFee, user_fee: userFee, source_account: sourceAccount, + transaction_duration: transactionDuration, }, }, }); @@ -271,6 +274,9 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => { setSelectedPaymentMethods(result?.bank_payment_methods); setMerchantFee(result?.merchant_fee); setUserFee(result?.user_fee); + setTransactionDuration( + result?.transaction_duration || 30 + ); setSourceAccount(result?.source_account); setP2pConfig(result); }); @@ -374,6 +380,16 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => {
+
+
+ Transaction Duration: +
+
+ Duration for transaction expiration:{' '} + {p2pConfig?.transaction_duration || 30} Minutes +
+
+
{displayP2pModel && ( @@ -494,6 +510,28 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => { ); })} + +
+ Transaction Duration +
+
+ Select the max duration for transaction expiration(in minutes) +
+
)} @@ -901,6 +939,32 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => {
+
+
+
+
Duration for transaction expiration
+
{transactionDuration} Minutes
+
+
{ + setStep(0); + }} + style={{ cursor: 'pointer' }} + > + EDIT +
+
+
+
{ merchant_fee: merchantFee, user_fee: userFee, source_account: sourceAccount, + transaction_duration: transactionDuration, }, }, }); @@ -1163,6 +1228,9 @@ const P2PSettings = ({ coins, pairs, p2p_config, features, constants }) => { setSelectedPaymentMethods(result?.bank_payment_methods); setMerchantFee(result?.merchant_fee); setUserFee(result?.user_fee); + setTransactionDuration( + result?.transaction_duration || 30 + ); setSourceAccount(result?.source_account); setP2pConfig(result); }); From 87817f4ff53e0ca116404e2668193658214fdb03 Mon Sep 17 00:00:00 2001 From: ram Date: Tue, 26 Nov 2024 23:14:54 +0530 Subject: [PATCH 5/8] Implemented the desktop ultimate search workflow --- web/src/components/AppBar/DesktopSearch.js | 23 + web/src/components/AppBar/_AppBar.scss | 179 ++++++ web/src/components/AppBar/index.js | 15 +- web/src/config/lang/en.json | 30 +- .../containers/App/MobileBarMoreOptions.js | 509 +++++++++++++++--- web/src/containers/App/_App.scss | 7 + web/src/containers/UserSecurity/index.js | 4 +- web/src/containers/UserSettings/index.js | 4 +- web/src/containers/Verification/index.js | 13 +- web/src/index.css | 127 +++++ web/src/routes.js | 6 +- 11 files changed, 826 insertions(+), 91 deletions(-) create mode 100644 web/src/components/AppBar/DesktopSearch.js diff --git a/web/src/components/AppBar/DesktopSearch.js b/web/src/components/AppBar/DesktopSearch.js new file mode 100644 index 0000000000..acc6d2c2e5 --- /dev/null +++ b/web/src/components/AppBar/DesktopSearch.js @@ -0,0 +1,23 @@ +import React from 'react'; +import STRINGS from 'config/localizedStrings'; +import EditWrapper from 'components/EditWrapper'; +import MobileBarMoreOptions from 'containers/App/MobileBarMoreOptions'; + +const DesktopSearch = () => { + return ( +
+
+
+ + {STRINGS['DESKTOP_ULTIMATE_SEARCH.SEARCH_DESCRIPTION']} + +
+
+ +
+
+
+ ); +}; + +export default DesktopSearch; diff --git a/web/src/components/AppBar/_AppBar.scss b/web/src/components/AppBar/_AppBar.scss index d92598bd2e..5305c08585 100644 --- a/web/src/components/AppBar/_AppBar.scss +++ b/web/src/components/AppBar/_AppBar.scss @@ -87,6 +87,12 @@ $app-menu-width: calc(100vw - 40rem); } } } + .active-menu { + color: $base_top-bar-navigation_text; + border-top: 4px solid $link; + height: 100%; + opacity: 1; + } } .app_bar-quicktrade-container { @@ -517,6 +523,11 @@ $app-menu-width: calc(100vw - 40rem); cursor: pointer; font-size: 11px; } + + .app-bar-search-icon { + padding: 2%; + font-size: 16px; + } } .capitalize { text-transform: capitalize; @@ -1530,3 +1541,171 @@ $app-menu-width: calc(100vw - 40rem); } } } + +.dynamic-search-description { + font-size: 12px; +} + +.desktop-search-wrapper { + .search-description-container { + margin: 3% 0; + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + .search-description { + .edit-wrapper__container { + font-size: 24px; + } + } + .dynamic-search-container { + width: 100%; + display: flex; + align-items: center; + flex-direction: column; + .desktop-search-more-option { + width: 90%; + display: flex; + flex-direction: column; + align-items: center; + .search-field { + width: 90%; + margin-top: 2%; + display: flex; + align-items: center; + justify-content: center; + .ant-input-affix-wrapper { + width: 80%; + height: 4rem; + background-color: transparent; + border: 1px solid $colors-notifications-blue; + } + .ant-input { + border: none; + color: $colors-main-black; + background-color: transparent; + padding: 3%; + } + .ant-input:hover { + border: none; + } + .ant-input-affix-wrapper:hover { + border: 2px solid $colors-notifications-blue; + box-shadow: none; + } + .ant-input-suffix { + svg { + font-size: 20px; + path { + fill: $colors-black; + } + } + } + .search-icon-container { + margin-left: 1%; + background-color: $colors-notifications-blue; + padding: 1.5%; + border-radius: 5px; + .search-icon { + font-size: 30px; + svg { + path { + fill: #ffffff; + } + } + } + } + } + } + + .options-container { + margin: 3% 0; + width: 100%; + .popular-option-container { + .options-field { + width: 60% !important; + } + } + .other-option-container { + margin-top: 5%; + } + + .hot-options-container { + display: flex; + align-items: center; + flex-direction: column; + .hot-function-title { + font-size: 16px; + } + .search-result { + font-family: 'Open Sans'; + } + .options-field { + width: 90%; + margin-top: 3%; + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: center; + gap: 2%; + .plugins-icon { + svg { + path { + fill: $colors-main-black; + } + } + } + .icon-field { + min-width: 14%; + display: flex; + flex-direction: column; + align-items: center; + padding: 2%; + .hot-icon { + position: relative; + bottom: 15px; + svg { + width: 1.2rem; + path { + fill: $colors-notification-pending !important; + } + } + } + .icon-logo { + width: 25px; + path { + fill: $colors-main-black; + } + } + } + .image-wrapper { + .icon-logo { + position: relative; + left: 10px; + } + .assets-icon { + position: relative; + bottom: 15px; + } + } + .icon-field:hover { + cursor: pointer; + background-color: $app-sidebar-background; + border-radius: 5px; + } + } + } + } + } + } + .crypto-link { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 10px; + .blue-link:hover { + cursor: pointer; + } + } +} diff --git a/web/src/components/AppBar/index.js b/web/src/components/AppBar/index.js index de71f3ea4e..7768f76659 100644 --- a/web/src/components/AppBar/index.js +++ b/web/src/components/AppBar/index.js @@ -4,6 +4,7 @@ import { bindActionCreators } from 'redux'; import classnames from 'classnames'; import { Link } from 'react-router'; import { isMobile } from 'react-device-detect'; +import { SearchOutlined } from '@ant-design/icons'; import { DEFAULT_URL } from 'config/constants'; import { MobileBarWrapper, EditWrapper, ButtonLink, Image } from 'components'; import { isLoggedIn } from 'utils/token'; @@ -238,8 +239,8 @@ class AppBar extends Component { constants: { valid_languages } = {}, constants = {}, children, - // activePath, - // onMenuChange, + activePath, + onMenuChange, // menuItems, router, isHome, @@ -365,6 +366,16 @@ class AppBar extends Component { verificationPending={verificationPending} /> +
onMenuChange('/details')} + > + +
)} diff --git a/web/src/config/lang/en.json b/web/src/config/lang/en.json index d1b992edc3..83029cc60e 100644 --- a/web/src/config/lang/en.json +++ b/web/src/config/lang/en.json @@ -2062,7 +2062,7 @@ "TRANSFER_DETAILS": "TRANSFER DETAILS", "PAYMENT_INSTRUCTIONS": "Here's the selected payment method, transfer money to seller. After you've successfully transferred the money please click confirm below to notify the seller", "PAYMENT_ACCOUNT": "Below is the payment account and method that is shared with the buyer.", - "EXPECTED_TIME": "Expected time until funds are release: 30 minutes", + "EXPECTED_TIME": "Expected time until funds are release: {0} minutes", "PAYMENT_TIME": "Please make the payment in the time provided above.", "ORDER_CANCELLED": "The order will otherwise be cancelled", "AUTO_RESPONSE_LIMIT": "Auto response text must be no longer than 240 characters", @@ -2177,6 +2177,7 @@ "TERMS_CONDITIONS": "Terms and conditions", "PAYMENT_TIME_LIMIT_LABEL": "Payment time limit: {0}", "30_MINUTES": "30 Minutes", + "MINUTES_TEXT": "{0} minutes", "AMOUNT_SEND_RELEASE": "(Amount of crypto you'll sell and release)", "MINUTES": "minutes", "EDIT_UPPERCASE": "EDIT", @@ -2543,5 +2544,32 @@ "HELP_DESC": "Get help. Support contact", "TRANSACTION_DESC": "Review all trades, deposits & withdrawals", "ONRAMPER_DESC": "Use Onramper to buy and sell crypto" + }, + "DESKTOP_ULTIMATE_SEARCH": { + "SEARCH_DESCRIPTION": "Find Functions, Coins, and More", + "SEARCH_PLACEHOILDER": "Input page name, functions, coins, features or other keyword", + "POPULAR_FUNCTION": "Popular functions", + "SEARCH_RESULT": "Search results ({0})", + "PROFIT_LOSS_INFO_TEXT": "Wallet profit and loss, Asset % breakdown", + "FEES_INFO_TEXT": "Trading fees for account level tiers", + "WITHDRAWAL_INFO_TEXT": "Withdrawal limits for account level tiers", + "WALLET_INFO_TEXT": "View all your assets and thier balances", + "P2P_INFO_TEXT": "Direct user peer-to-peer trading", + "ACCOUNT_INFO_TEXT": "Account trading volume information", + "ASSET_INFO_TEXT": "Asset price list", + "SECURITY_2FA_INFO_TEXT": "Otp two-factor authentication security", + "LOGIN_INFO_TEXT": "Historical record of all login on your account", + "SESSIONS_INFO_TEXT": "Check currently active logged in sessions", + "BANK_INFO_TEXT": "Your banking or payment information", + "AUDIO_INFO_TEXT": "Audio sound effects.Trading feedback", + "INTERFACE_INFO_TEXT": "User interface customizations, Color theme", + "NOTIFICATION_INFO_TEXT": "Alert and notification, pop ups etc.", + "CHAT_INFO_TEXT": "Chat settings", + "EMAIL_INFO_TEXT": "Email associated with your account", + "PHONE_INFO_TEXT": "Phone number associated with your account", + "CRYPTO_PRICES": "Looking for crypto prices?", + "PRICE_LINK": "Visit price link here.", + "BUY_TEXT": "BUY {0}", + "DEPOSIT_TEXT": "Deposit {0}" } } diff --git a/web/src/containers/App/MobileBarMoreOptions.js b/web/src/containers/App/MobileBarMoreOptions.js index 622a840a52..a84811a985 100644 --- a/web/src/containers/App/MobileBarMoreOptions.js +++ b/web/src/containers/App/MobileBarMoreOptions.js @@ -1,11 +1,14 @@ -import React, { useCallback, useEffect, useState } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { browserHistory } from 'react-router'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; +import { isMobile } from 'react-device-detect'; +import { Input, Tooltip } from 'antd'; +import { SearchOutlined } from '@ant-design/icons'; import icons from 'config/icons/dark'; import STRINGS from 'config/localizedStrings'; -import Dialog from 'components/Dialog/MobileDialog'; +import Dialog from 'components/Dialog'; import withConfig from 'components/ConfigProvider/withConfig'; import HelpfulResourcesForm from 'containers/HelpfulResourcesForm'; import { Coin, EditWrapper, Image, SearchBox } from 'components'; @@ -18,9 +21,14 @@ import { } from 'actions/appActions'; import { getLogins } from 'actions/userAction'; import { requestAuthenticated } from 'utils'; -import { ConnectionPopup, ReconnectPopup } from 'components/AppBar/Utils'; +import { + ConnectionPopup, + ReconnectPopup, + renderConfirmSignout, +} from 'components/AppBar/Utils'; import { removeToken } from 'utils/token'; import { MarketsSelector } from 'containers/Trade/utils'; +import { assetsSelector } from 'containers/Wallet/utils'; const INITIAL_LOGINS_STATE = { count: 0, @@ -39,6 +47,7 @@ const MobileBarMoreOptions = ({ getMarkets, quickTrade, getRemoteRoutes, + assets, }) => { const [search, setSearch] = useState(''); const [isDialogOpen, setIsDialogOpen] = useState(false); @@ -54,6 +63,7 @@ const MobileBarMoreOptions = ({ pingValue: null, isDisplayPing: false, }); + const [isLogout, setIsLogout] = useState(false); const fieldHasCoinIcon = [ 'SUMMARY.DEPOSIT', @@ -72,8 +82,18 @@ const MobileBarMoreOptions = ({ ?.filter((data) => { return ( search?.length > 1 && - (data?.fullname?.toLowerCase()?.startsWith(search?.toLowerCase()) || - data?.symbol?.toLowerCase()?.startsWith(search?.toLowerCase())) + (search + ?.toLowerCase() + ?.split(' ') + ?.some((content) => + content?.startsWith(data?.fullname?.toLowerCase()) + ) || + search + ?.toLowerCase() + ?.split(' ') + ?.some((content) => + content?.startsWith(data?.symbol?.toLowerCase()) + )) ); }) ?.sort((a, b) => { @@ -98,13 +118,23 @@ const MobileBarMoreOptions = ({ type !== 'fiat' ? [symbol, fullname] : [] ); - const getPairs = getMarkets?.filter((market) => { - return market?.key?.split('-')?.includes(getAsset); - }); + const getPairs = (symbol) => + getMarkets?.filter((market) => { + return market?.key?.split('-')?.includes(symbol); + }); - const getQuickTradePair = quickTrade?.filter((quicktrade) => { - return quicktrade?.symbol?.split('-')?.includes(getAsset); - }); + const getQuickTradePair = (symbol) => + quickTrade?.filter((quicktrade) => { + return quicktrade?.symbol?.split('-')?.includes(symbol); + }); + + const topAsset = assets + ?.filter((item, index) => { + return index <= 3; + }) + ?.map((data) => { + return data[0]; + }); useEffect(() => { setSecurityTab(null); @@ -120,7 +150,9 @@ const MobileBarMoreOptions = ({ } }; - fetchData(); + if (isMobile) { + fetchData(); + } //eslint-disable-next-line }, []); @@ -162,6 +194,7 @@ const MobileBarMoreOptions = ({ iconText: 'SUMMARY.DEPOSIT', path: isValidCoin ? `/wallet/${getAsset}/deposit` : '/wallet/deposit', isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.DEPOSIT_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.ADD_FUNDS'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.TOP_UP'], @@ -188,10 +221,11 @@ const MobileBarMoreOptions = ({ icon_id: 'TRADE_OPTION_ICON', iconText: 'TRADE_TAB_TRADE', path: - isValidCoin && getPairs?.length >= 1 - ? `/trade/${getPairs[0]?.key}` + isValidCoin && getPairs(getAsset)?.length >= 1 + ? `/trade/${getPairs(getAsset)[0]?.key}` : '/trade', isDisplay: features?.pro_trade, + toolTipText: 'DESKTOP_NAVIGATION.MARKET_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.EXCHANGE'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.SWAP'], @@ -205,7 +239,7 @@ const MobileBarMoreOptions = ({ STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.XHT'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.BTC'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.USTD'], - ...getPairs?.flatMap((item) => [ + ...getPairs(getAsset)?.flatMap((item) => [ ...item?.key?.split('-'), item?.fullname, ]), @@ -215,10 +249,11 @@ const MobileBarMoreOptions = ({ icon_id: 'CONVERT_OPTION_ICON', iconText: 'CONVERT', path: - getQuickTradePair?.length >= 1 - ? `/quick-trade/${getQuickTradePair[0]?.symbol}` + getQuickTradePair(getAsset)?.length >= 1 + ? `/quick-trade/${getQuickTradePair(getAsset)[0]?.symbol}` : '/quick-trade', isDisplay: features?.quick_trade, + toolTipText: 'DESKTOP_NAVIGATION.CONVERT_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.EXCHANGE'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.SWAP'], @@ -233,7 +268,7 @@ const MobileBarMoreOptions = ({ STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.XHT'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.BTC'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.USTD'], - ...getQuickTradePair?.flatMap((item) => { + ...getQuickTradePair(getAsset)?.flatMap((item) => { const [firstPair] = item?.symbol?.split('-'); return [firstPair, item?.fullname]; }), @@ -244,6 +279,7 @@ const MobileBarMoreOptions = ({ iconText: 'MORE_OPTIONS_LABEL.ICONS.REFERRALS', path: '/referral', isDisplay: features?.referral_history_config, + toolTipText: 'DESKTOP_NAVIGATION.REFERRAL_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.INVITE'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.REFER'], @@ -258,12 +294,28 @@ const MobileBarMoreOptions = ({ }, ]; + const pinnedOptions = () => { + return topAsset?.map((data) => { + return { + icon_id: coins[data]?.icon_id, + iconText: data?.toUpperCase(), + path: `/prices/coin/${data}`, + isDisplay: true, + toolTipText: 'COINS', + isTopAsset: true, + searchContent: [STRINGS['COINS']], + coin: data?.toUpperCase(), + }; + }); + }; + const otherFunctionOptions = [ { icon_id: 'API_OPTION_ICON', iconText: 'MORE_OPTIONS_LABEL.ICONS.API', path: '/security?apiKeys', isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.API_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.INTEGRATION'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.PROGRAMMATIC_ACCESS'], @@ -298,6 +350,7 @@ const MobileBarMoreOptions = ({ iconText: 'MORE_OPTIONS_LABEL.ICONS.DEFI_STAKE', path: '/stake', isDisplay: features?.stake_page, + toolTipText: 'DESKTOP_NAVIGATION.DEFI_STAKE_DESC', searchContent: [ STRINGS['STAKE.EARN'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.PASSIVE_INCOME'], @@ -314,6 +367,7 @@ const MobileBarMoreOptions = ({ iconText: 'MORE_OPTIONS_LABEL.ICONS.CEFI_STAKE', path: '/stake', isDisplay: features?.cefi_stake, + toolTipText: 'DESKTOP_NAVIGATION.CONVERT_DESC', searchContent: [ STRINGS['STAKE.EARN'], STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.PASSIVE_INCOME'], @@ -330,6 +384,7 @@ const MobileBarMoreOptions = ({ iconText: 'MORE_OPTIONS_LABEL.ICONS.PROFIT_LOSS', path: '/wallet/history', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.PROFIT_LOSS_INFO_TEXT', searchContent: [ STRINGS['REFERRAL_LINK.EARNING'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.PERFORMANCE'], @@ -345,6 +400,7 @@ const MobileBarMoreOptions = ({ iconText: 'FEES', path: '/fees-and-limits', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.FEES_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.CHARGES'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.COSTS'], @@ -358,6 +414,7 @@ const MobileBarMoreOptions = ({ iconText: 'MORE_OPTIONS_LABEL.ICONS.LIMITS', path: '/fees-and-limits', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.WITHDRAWAL_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.RESTRICTIONS'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.BOUNDARIES'], @@ -372,6 +429,7 @@ const MobileBarMoreOptions = ({ iconText: 'ACCOUNTS.TAB_WALLET', path: '/wallet', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.WALLET_INFO_TEXT', searchContent: [ STRINGS['ACCOUNT_TEXT'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.STORAGE'], @@ -389,6 +447,7 @@ const MobileBarMoreOptions = ({ iconText: 'USER_SETTINGS.TITLE_LANGUAGE', path: '/settings?language', isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.LANGUAGE_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.ENGLISH'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.LOCALIZATION'], @@ -406,6 +465,7 @@ const MobileBarMoreOptions = ({ iconText: 'P2P.TAB_P2P', path: '/p2p', isDisplay: features?.p2p, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.P2P_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.PEER_TO_PEER'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.DIRECT_TRADE'], @@ -421,6 +481,7 @@ const MobileBarMoreOptions = ({ iconText: 'ACCOUNTS.TAB_HISTORY', path: '/transactions', isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.TRANSACTION_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.TRANSACTIONS'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.ACTIVITY'], @@ -434,6 +495,7 @@ const MobileBarMoreOptions = ({ iconText: 'CHART_TEXTS.v', path: 'wallet/volume', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.ACCOUNT_INFO_TEXT', searchContent: [ STRINGS['SUMMARY.TRADING_VOLUME'], STRINGS['ACTIVITY'], @@ -448,6 +510,7 @@ const MobileBarMoreOptions = ({ iconText: 'ASSET_TXT', path: isValidCoin ? `/prices/coin/${getAsset}` : '/prices', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.ASSET_INFO_TEXT', searchContent: [ STRINGS['COINS'], STRINGS['WALLET_ASSETS_SEARCH_TXT'], @@ -467,6 +530,7 @@ const MobileBarMoreOptions = ({ iconText: 'ACCOUNT_SECURITY.OTP.TITLE', path: '/security?2fa', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.SECURITY_2FA_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.TWO_FACTOR_AUTHENTICATION'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.MFA'], @@ -481,6 +545,7 @@ const MobileBarMoreOptions = ({ iconText: 'ACCOUNT_SECURITY.CHANGE_PASSWORD.TITLE', path: '/security?password', isDisplay: true, + toolTipText: 'ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.BUTTON', searchContent: [ STRINGS['ACCOUNTS.TAB_SECURITY'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.CREDENTIALS'], @@ -495,6 +560,7 @@ const MobileBarMoreOptions = ({ iconText: 'MORE_OPTIONS_LABEL.ICONS.LOGINS', path: '/security', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.LOGIN_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.SECURITY'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.SIGN_INS'], @@ -509,6 +575,7 @@ const MobileBarMoreOptions = ({ iconText: 'SESSIONS.TAB', path: '/security', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.SESSIONS_INFO_TEXT', searchContent: [ STRINGS['SESSIONS.CONTENT.TITLE'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.LOGGED_IN'], @@ -523,6 +590,7 @@ const MobileBarMoreOptions = ({ iconText: 'USER_VERIFICATION.TITLE_BANK', path: '/verification', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.BANK_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.BANKING_DETAILS'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.BANK_ACCOUNT'], @@ -541,6 +609,7 @@ const MobileBarMoreOptions = ({ iconText: 'MORE_OPTIONS_LABEL.ICONS.AUDIO', path: '/settings?audioCue', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.AUDIO_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.SOUND'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.AUDIO_SETTINGS'], @@ -555,6 +624,7 @@ const MobileBarMoreOptions = ({ iconText: 'ADDRESS_BOOK.ADDRESSES', path: '/wallet/address-book', isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.ADDRESS_BOOK_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.WITHDRAWAL_ADDRESSES'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.CRYPTO_ADDRESSES'], @@ -570,6 +640,7 @@ const MobileBarMoreOptions = ({ iconText: 'USER_SETTINGS.TITLE_INTERFACE', path: '/settings?interface', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.INTERFACE_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.UI'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.USER_INTERFACE'], @@ -588,6 +659,7 @@ const MobileBarMoreOptions = ({ iconText: 'USER_SETTINGS.TITLE_NOTIFICATION', path: '/settings?signals', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.NOTIFICATION_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.ALERT'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.UPDATES'], @@ -602,6 +674,7 @@ const MobileBarMoreOptions = ({ iconText: 'USER_SETTINGS.TITLE_CHAT', path: '/settings?account', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.CHAT_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.MESSAGE'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.LIVE_CHAT'], @@ -611,8 +684,9 @@ const MobileBarMoreOptions = ({ { icon_id: 'HELP_OPTION_ICON', iconText: 'LOGIN.HELP', - path: '/more', + path: browserHistory.getCurrentLocation(), isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.HELP_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.SUPPORT'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.CONTACT_LOWER'], @@ -631,6 +705,7 @@ const MobileBarMoreOptions = ({ iconText: 'WITHDRAW_PAGE.WITHDRAW', path: isValidCoin ? `/wallet/${getAsset}/withdraw` : '/wallet/withdraw', isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.WITHDRAW_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.PAYOUT'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.CASH_OUT'], @@ -646,6 +721,7 @@ const MobileBarMoreOptions = ({ iconText: 'USER_VERIFICATION.TITLE_IDENTITY', path: '/verification?identity', isDisplay: true, + toolTipText: 'DESKTOP_NAVIGATION.VERIFICATION_DESC', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.PERSONAL_INFO'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.IDENTITY_CHECK'], @@ -661,6 +737,7 @@ const MobileBarMoreOptions = ({ 'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TITLE_PHONE', path: '/verification?phone', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.PHONE_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.CONTACT'], STRINGS['USER_VERIFICATION.TITLE_MOBILE'], @@ -679,6 +756,7 @@ const MobileBarMoreOptions = ({ iconText: 'USER_VERIFICATION.TITLE_EMAIL', path: '/verification?email', isDisplay: true, + toolTipText: 'DESKTOP_ULTIMATE_SEARCH.EMAIL_INFO_TEXT', searchContent: [ STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.CONTACT'], STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.EMAIL_ADDRESS'], @@ -693,9 +771,10 @@ const MobileBarMoreOptions = ({ { icon_id: 'REVOKE_SESSION', iconText: 'ACCOUNTS.TAB_SIGNOUT', - path: `/`, + path: browserHistory?.getCurrentLocation(), isDisplay: true, searchContent: [STRINGS['LOGOUT']], + toolTipText: 'DESKTOP_NAVIGATION.SIGNOUT_DESC', }, ]; @@ -704,7 +783,7 @@ const MobileBarMoreOptions = ({ const actions = { 'MORE_OPTIONS_LABEL.ICONS.CEFI_STAKE': () => setSelectedStake('cefi'), 'MORE_OPTIONS_LABEL.ICONS.DEFI_STAKE': () => setSelectedStake('defi'), - 'ACCOUNTS.TAB_SIGNOUT': () => removeToken(), + 'ACCOUNTS.TAB_SIGNOUT': () => setIsLogout(true), FEES: () => setLimitTab(0), 'MORE_OPTIONS_LABEL.ICONS.LIMITS': () => setLimitTab(2), 'ACCOUNT_SECURITY.CHANGE_PASSWORD.TITLE': () => setSecurityTab(1), @@ -729,31 +808,209 @@ const MobileBarMoreOptions = ({ }; const filterOptions = (options) => { - return options?.filter((option) => { - const iconTextMatch = ( - STRINGS[option?.iconText ? option?.iconText : option?.string_id] || '' - ) - ?.toLowerCase() - .includes(search?.toLowerCase()); - const searchContentMatch = option?.searchContent?.some((content) => - content?.toLowerCase()?.includes(search?.toLowerCase()) - ); - return iconTextMatch || searchContentMatch; - }); + const normalizedSearch = search + ?.replace(/\s+/g, ' ') + ?.trim() + ?.toLowerCase(); + if (!isMobile) { + const searchText = normalizedSearch?.split(' '); + const filter = options?.filter((option) => { + const iconTextMatch = + STRINGS[option?.iconText ? option?.iconText : option?.string_id] || + ''; + const isContent = option?.searchContent?.some((content) => + searchText?.some((searchValue) => + content?.toLowerCase()?.includes(searchValue) + ) + ); + const isIconText = searchText?.some((content) => + iconTextMatch?.toLowerCase()?.includes(content) + ); + const isIconId = searchText?.some((content) => + option?.icon_id?.toLowerCase()?.includes(content) + ); + + return (isIconId && isIconText) || isContent || isIconId || isIconText; + }); + return filter; + } else { + return options?.filter((option) => { + const iconTextMatch = ( + STRINGS[option?.iconText ? option?.iconText : option?.string_id] || '' + ) + ?.toLowerCase() + ?.includes(search?.toLowerCase()); + const searchContentMatch = option?.searchContent?.some((content) => + content?.toLowerCase()?.includes(search?.toLowerCase()) + ); + return iconTextMatch || searchContentMatch; + }); + } }; + const filteredHotFunctionOptions = useMemo(() => { + if (search) { + return filterOptions(hotFunctionOptions); + } + return hotFunctionOptions; + //eslint-disable-next-line + }, [search]); + + const filteredOtherFunctionOptions = useMemo(() => { + if (search) { + return filterOptions(otherFunctionOptions); + } + return otherFunctionOptions; + //eslint-disable-next-line + }, [search]); + + const filteredDefaultFunctionOptions = useMemo(() => { + if (search) { + return filterOptions(pinnedOptions()); + } + return pinnedOptions(); + //eslint-disable-next-line + }, [search]); + + const searchresult = + filteredHotFunctionOptions?.length + + filteredOtherFunctionOptions?.length + + filteredDefaultFunctionOptions?.length; + const renderOptions = (filteredOption, title) => { return ( -
- {title?.toUpperCase()} - {filteredOption.length > 0 ? ( +
+ {!isMobile ? ( + !search && ( + {title?.toUpperCase()} + ) + ) : ( + {title?.toUpperCase()} + )} + {search && + !isMobile && + ((filteredHotFunctionOptions?.length > 0 && + title === STRINGS['DESKTOP_ULTIMATE_SEARCH.POPULAR_FUNCTION']) || + (filteredHotFunctionOptions?.length === 0 && + filteredOtherFunctionOptions?.length > 0 && + title === + STRINGS[ + 'MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.OTHER_FUNCTIONS_LABEL' + ])) && ( + + + {STRINGS.formatString( + STRINGS[ + 'DESKTOP_ULTIMATE_SEARCH.SEARCH_RESULT' + ].toUpperCase(), + searchresult + )} + + + )} + {filteredOption?.length > 0 ? (
{filteredOption?.map( (data, inx) => - data.isDisplay && ( + data?.isDisplay && + (!isMobile ? ( + +
+ onHandleRoute( + data?.iconText ? data?.iconText : data?.string_id, + data?.path + ) + } + > + {fieldHasCoinIcon?.includes(data?.iconText) ? ( +
+ + + + +
+ ) : ( + + + {data?.icon_id === 'REFERRAL_OPTION_ICON' && ( + + + + )} + + )} +
+ + {data?.isTopAsset + ? data?.iconText + : STRINGS[ + data?.iconText + ? data?.iconText + : data?.string_id + ]} + +
+
+ + ) : (
onHandleRoute( data?.iconText ? data?.iconText : data?.string_id, @@ -763,7 +1020,7 @@ const MobileBarMoreOptions = ({ > {fieldHasCoinIcon?.includes(data?.iconText) ? (
-
) : ( - )} @@ -801,30 +1059,41 @@ const MobileBarMoreOptions = ({
- ) + )) )}
) : ( -
- - - {STRINGS['MORE_OPTIONS_LABEL.NO_RESULT_DESC_1']} +
+ {!isMobile && ( + + + {STRINGS.formatString( + STRINGS[ + 'DESKTOP_ULTIMATE_SEARCH.SEARCH_RESULT' + ].toUpperCase(), + searchresult + )} + - - - - {STRINGS['MORE_OPTIONS_LABEL.NO_RESULT_DESC_2']} - - + )} + + + + {STRINGS['MORE_OPTIONS_LABEL.NO_RESULT_DESC_1']} + + + + + {STRINGS['MORE_OPTIONS_LABEL.NO_RESULT_DESC_2']} + + +
)}
); }; - const filteredHotFunctionOptions = filterOptions(hotFunctionOptions); - const filteredOtherFunctionOptions = filterOptions(otherFunctionOptions); - const renderHelpDialog = () => { return ( { + removeToken(); + setIsLogout(false); + return browserHistory?.push('/login'); + }; + + const onHandleClosePopup = () => { + setIsLogout(false); + }; + return ( -
+
{isDialogOpen && renderHelpDialog()} - onHandleSearch(e)} - /> -
- {renderOptions( - filteredHotFunctionOptions, - STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.HOT_FUNCTION_LABEL'] - )} - {renderOptions( - filteredOtherFunctionOptions, - STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.OTHER_FUNCTIONS_LABEL'] - )} -
-
- - + {isLogout && + renderConfirmSignout(isLogout, onHandleClosePopup, onHandleLogout)} + {isMobile ? ( + onHandleSearch(e)} + /> + ) : ( +
+ onHandleSearch(e)} + placeholder={STRINGS['DESKTOP_ULTIMATE_SEARCH.SEARCH_PLACEHOILDER']} + allowClear + /> + + + +
+ )} + {isMobile ? ( +
+ {renderOptions( + filteredHotFunctionOptions, + STRINGS['MORE_OPTIONS_LABEL.HOT_FUNCTION.HOT_FUNCTION_LABEL'] + )} + {renderOptions( + filteredOtherFunctionOptions, + STRINGS['MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.OTHER_FUNCTIONS_LABEL'] + )} +
+ ) : ( +
+ {filteredHotFunctionOptions?.length > 0 && + renderOptions( + filteredHotFunctionOptions, + STRINGS['DESKTOP_ULTIMATE_SEARCH.POPULAR_FUNCTION'] + )} + {filteredDefaultFunctionOptions?.length > 0 && + renderOptions(filteredDefaultFunctionOptions)} + {filteredOtherFunctionOptions?.length > 0 && + renderOptions( + filteredOtherFunctionOptions, + STRINGS[ + 'MORE_OPTIONS_LABEL.OTHER_FUNCTIONS.OTHER_FUNCTIONS_LABEL' + ] + )} + {filteredOtherFunctionOptions?.length === 0 && + filteredHotFunctionOptions?.length === 0 && + renderOptions( + filteredHotFunctionOptions, + STRINGS['DESKTOP_ULTIMATE_SEARCH.POPULAR_FUNCTION'] + )} +
+ )} + {!isMobile && ( + - onHandleConnection()} - > - {`(${STRINGS['CONNECTIONS.CONNECTION_LABEL']})`} - + {STRINGS['DESKTOP_ULTIMATE_SEARCH.CRYPTO_PRICES']} + browserHistory.push('/prices')} + > + {STRINGS['DESKTOP_ULTIMATE_SEARCH.PRICE_LINK']} + -
+ )} + {isMobile && ( +
+ + + + onHandleConnection()} + > + {`(${STRINGS['CONNECTIONS.CONNECTION_LABEL']})`} + + + +
+ )} {isDisplayPopup?.isDisplayConnection && ( ({ getMarkets: MarketsSelector(store), quickTrade: store.app.quicktrade, getRemoteRoutes: store.app.remoteRoutes, + assets: assetsSelector(store), }); const mapDispatchToProps = (dispatch) => ({ diff --git a/web/src/containers/App/_App.scss b/web/src/containers/App/_App.scss index 3f9375848f..c4d965121a 100644 --- a/web/src/containers/App/_App.scss +++ b/web/src/containers/App/_App.scss @@ -501,6 +501,13 @@ $inner_container-border: 1px solid $colors-super-pale-black; .image-wrapper { margin-left: 15%; } + .plugins-icon { + svg { + path { + fill: $colors-main-black; + } + } + } .icon-field { padding: 5%; text-align: center; diff --git a/web/src/containers/UserSecurity/index.js b/web/src/containers/UserSecurity/index.js index 9dd56c08db..6a39903499 100644 --- a/web/src/containers/UserSecurity/index.js +++ b/web/src/containers/UserSecurity/index.js @@ -157,7 +157,9 @@ class UserSecurity extends Component { } componentWillUnmount() { - setSecurityTab(0); + if (this.props.getSecurityTab) { + this.props.setSecurityTab(0); + } } openCurrentTab = () => { diff --git a/web/src/containers/UserSettings/index.js b/web/src/containers/UserSettings/index.js index ef3a1c4f44..dbfb995573 100644 --- a/web/src/containers/UserSettings/index.js +++ b/web/src/containers/UserSettings/index.js @@ -140,7 +140,9 @@ class UserSettings extends Component { } componentWillUnmount() { - setSettingsTab(0); + if (this.props.getSettingsTab) { + this.props.setSettingsTab(0); + } } openCurrentTab = () => { diff --git a/web/src/containers/Verification/index.js b/web/src/containers/Verification/index.js index 0e0a96cf8c..0ed7000fae 100644 --- a/web/src/containers/Verification/index.js +++ b/web/src/containers/Verification/index.js @@ -30,7 +30,11 @@ import { } from './utils'; import { getClasesForLanguage, getFontClassForLanguage } from 'utils/string'; import { ContactForm } from 'containers'; -import { NOTIFICATIONS, openContactForm } from 'actions/appActions'; +import { + NOTIFICATIONS, + openContactForm, + setVerificationTab, +} from 'actions/appActions'; import { setMe, updateDocuments, updateUser } from 'actions/userAction'; import MobileVerificationHome from './MobileVerificationHome'; // import MobileTabs from './MobileTabs'; @@ -129,6 +133,12 @@ class Verification extends Component { } } + componentWillUnmount() { + if (this.props.getVerificationTab) { + this.props.setVerificationTab(0); + } + } + getTabBySearch = (search) => { if (search) { if (search.includes('email')) { @@ -788,6 +798,7 @@ const mapDispatchToProps = (dispatch) => ({ setMe: bindActionCreators(setMe, dispatch), logout: bindActionCreators(logout, dispatch), openContactForm: bindActionCreators(openContactForm, dispatch), + setVerificationTab: bindActionCreators(setVerificationTab, dispatch), }); export default connect( diff --git a/web/src/index.css b/web/src/index.css index cf99e792c2..ab9f6f333c 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -708,6 +708,8 @@ table th { fill: var(--labels_important-active-labels-text-graphics); } .layout-mobile .footer-bar-more-options-container .options-container .hot-options-container .options-field .image-wrapper { margin-left: 15%; } + .layout-mobile .footer-bar-more-options-container .options-container .hot-options-container .options-field .plugins-icon svg path { + fill: var(--labels_important-active-labels-text-graphics); } .layout-mobile .footer-bar-more-options-container .options-container .hot-options-container .options-field .icon-field { padding: 5%; text-align: center; } @@ -14110,6 +14112,11 @@ table th { gap: 2%; } .app_bar .trade-navbar-wrapper .custom-select-input-style.appbar.ant-select { margin: 0 !important; } + .app_bar .trade-navbar-wrapper .active-menu { + color: var(--calculated_base_top-bar-navigation_text); + border-top: 4px solid var(--specials_buttons-links-and-highlights); + height: 100%; + opacity: 1; } .app_bar .app_bar-quicktrade-container .toggle_button-wrapper .toggle-content .toggle-action_button.left { opacity: 1 !important; } .app_bar .app_bar-quicktrade { @@ -14409,6 +14416,9 @@ table th { border-radius: 3px; cursor: pointer; font-size: 11px; } + .app_bar .app-bar-search-icon { + padding: 2%; + font-size: 16px; } .capitalize { text-transform: capitalize; } @@ -15110,6 +15120,123 @@ table th { min-width: 10rem !important; max-width: 10rem !important; } +.dynamic-search-description { + font-size: 12px; } + +.desktop-search-wrapper .search-description-container { + margin: 3% 0; + width: 100%; + display: flex; + flex-direction: column; + align-items: center; } + .desktop-search-wrapper .search-description-container .search-description .edit-wrapper__container { + font-size: 24px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container { + width: 100%; + display: flex; + align-items: center; + flex-direction: column; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option { + width: 90%; + display: flex; + flex-direction: column; + align-items: center; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field { + width: 90%; + margin-top: 2%; + display: flex; + align-items: center; + justify-content: center; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .ant-input-affix-wrapper { + width: 80%; + height: 4rem; + background-color: transparent; + border: 1px solid var(--specials_buttons-links-and-highlights); } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .ant-input { + border: none; + color: var(--labels_important-active-labels-text-graphics); + background-color: transparent; + padding: 3%; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .ant-input:hover { + border: none; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .ant-input-affix-wrapper:hover { + border: 2px solid var(--specials_buttons-links-and-highlights); + box-shadow: none; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .ant-input-suffix svg { + font-size: 20px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .ant-input-suffix svg path { + fill: var(--labels_secondary-inactive-label-text-graphics); } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .search-icon-container { + margin-left: 1%; + background-color: var(--specials_buttons-links-and-highlights); + padding: 1.5%; + border-radius: 5px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .search-icon-container .search-icon { + font-size: 30px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .desktop-search-more-option .search-field .search-icon-container .search-icon svg path { + fill: #ffffff; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container { + margin: 3% 0; + width: 100%; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .popular-option-container .options-field { + width: 60% !important; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .other-option-container { + margin-top: 5%; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container { + display: flex; + align-items: center; + flex-direction: column; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .hot-function-title { + font-size: 16px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .search-result { + font-family: 'Open Sans'; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field { + width: 90%; + margin-top: 3%; + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: center; + gap: 2%; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .plugins-icon svg path { + fill: var(--labels_important-active-labels-text-graphics); } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .icon-field { + min-width: 14%; + display: flex; + flex-direction: column; + align-items: center; + padding: 2%; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .icon-field .hot-icon { + position: relative; + bottom: 15px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .icon-field .hot-icon svg { + width: 1.2rem; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .icon-field .hot-icon svg path { + fill: var(--specials_pending-waiting-caution) !important; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .icon-field .icon-logo { + width: 25px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .icon-field .icon-logo path { + fill: var(--labels_important-active-labels-text-graphics); } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .image-wrapper .icon-logo { + position: relative; + left: 10px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .image-wrapper .assets-icon { + position: relative; + bottom: 15px; } + .desktop-search-wrapper .search-description-container .dynamic-search-container .options-container .hot-options-container .options-field .icon-field:hover { + cursor: pointer; + background-color: var(--base_wallet-sidebar-and-popup); + border-radius: 5px; } + +.desktop-search-wrapper .crypto-link { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 10px; } + .desktop-search-wrapper .crypto-link .blue-link:hover { + cursor: pointer; } + .check_title-container { transition: 0.3s; display: flex; diff --git a/web/src/routes.js b/web/src/routes.js index f4de35981c..52a626e495 100644 --- a/web/src/routes.js +++ b/web/src/routes.js @@ -21,12 +21,13 @@ import { } from './utils/string'; import { getExchangeInitialized, getSetupCompleted } from './utils/initialize'; import { STAKING_INDEX_COIN, isStakingAvailable } from 'config/contracts'; +import { Loader } from 'components'; import chat from './containers/Admin/Chat'; import store from './store'; import PluginConfig from 'containers/Admin/PluginConfig'; import Loadable from 'react-loadable'; -import { Loader } from 'components'; +import DesktopSearch from 'components/AppBar/DesktopSearch'; const LoadingComponent = ({ isLoading, error }) => { return ; @@ -611,6 +612,9 @@ export const generateRoutes = (routes = []) => { {isMobile && ( )} + {!isMobile && ( + + )} Date: Wed, 27 Nov 2024 04:34:57 +0300 Subject: [PATCH 6/8] fix-order-book-429 --- server/utils/hollaex-tools-lib/tools/order.js | 10 ---------- server/utils/orderbook.js | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/utils/hollaex-tools-lib/tools/order.js b/server/utils/hollaex-tools-lib/tools/order.js index d1b481d22a..9ecf11167f 100644 --- a/server/utils/hollaex-tools-lib/tools/order.js +++ b/server/utils/hollaex-tools-lib/tools/order.js @@ -259,16 +259,6 @@ const getUserQuickTrade = async (spending_currency, spending_amount, receiving_a if (spending_amount != null) responseObj.receiving_amount = priceValues.targetAmount; else if (receiving_amount != null) responseObj.spending_amount = priceValues.sourceAmount; - //Check if the estimated price is 50% greater than the last trade - const lastTrades = await getPublicTrades(symbol); - if (Array.isArray(lastTrades[symbol]) && lastTrades[symbol].length > 0) { - const lastPrice = new BigNumber(lastTrades[symbol][0].price).multipliedBy(1.50).toNumber(); - - if (priceValues.estimatedPrice > lastPrice) { - throw new Error(QUICK_TRADE_ORDER_CURRENT_PRICE_ERROR); - } - } - let user_id = null; if (bearerToken) { const auth = await verifyBearerTokenPromise(bearerToken, ip); diff --git a/server/utils/orderbook.js b/server/utils/orderbook.js index 20c480787f..8aeb367b7d 100644 --- a/server/utils/orderbook.js +++ b/server/utils/orderbook.js @@ -1,7 +1,10 @@ 'use strict'; -const { getOrderbook, getKitPairsConfig } = require('./hollaex-tools-lib/tools/common'); +const { getOrderbook, getOrderbooks, getKitPairsConfig } = require('./hollaex-tools-lib/tools/common'); const math = require('mathjs'); const BigNumber = require('bignumber.js'); +const { client } = require('./hollaex-tools-lib/tools/database/redis') + + const sumQuantities = (orders) => orders.reduce((total, [, size]) => math.add(total, size), 0); @@ -52,8 +55,15 @@ const estimatedQuickTradePriceSelector = ({ pairsOrders, pair, side, size, isFir } const setPriceEssentials = async (priceEssentials, opts) => { - const pairsOrders = await getOrderbook(priceEssentials.pair, opts); + let pairsOrders = await client.getAsync(`orderbooks`); + + if (!pairsOrders) { + pairsOrders = await getOrderbooks(opts); + await client.setexAsync(`orderbooks`, 60 * 5, JSON.stringify(pairsOrders)); + } else { + pairsOrders = JSON.parse(pairsOrders); + }; const pair = priceEssentials.pair; const side = priceEssentials.side; const isSourceChanged = priceEssentials.isSourceChanged; From c16d14a00d6cf8908c6cf21b3c4e7caa3af9e1ab Mon Sep 17 00:00:00 2001 From: fetok12 Date: Wed, 27 Nov 2024 05:12:58 +0300 Subject: [PATCH 7/8] fix-order-book-429 --- server/utils/orderbook.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/utils/orderbook.js b/server/utils/orderbook.js index 8aeb367b7d..a6cae9f46b 100644 --- a/server/utils/orderbook.js +++ b/server/utils/orderbook.js @@ -59,7 +59,7 @@ const setPriceEssentials = async (priceEssentials, opts) => { if (!pairsOrders) { pairsOrders = await getOrderbooks(opts); - await client.setexAsync(`orderbooks`, 60 * 5, JSON.stringify(pairsOrders)); + await client.setexAsync(`orderbooks`, 30, JSON.stringify(pairsOrders)); } else { pairsOrders = JSON.parse(pairsOrders); From 02b6996b2504ab86fe3f2d5c3a442adc3031d317 Mon Sep 17 00:00:00 2001 From: Ali Beikverdi Date: Wed, 27 Nov 2024 11:46:06 +0900 Subject: [PATCH 8/8] version update --- server/api/swagger/swagger.js | 2 +- server/package.json | 2 +- version | 2 +- web/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/api/swagger/swagger.js b/server/api/swagger/swagger.js index 7aa39ffc94..56e2d80bad 100644 --- a/server/api/swagger/swagger.js +++ b/server/api/swagger/swagger.js @@ -4,7 +4,7 @@ const definition = { swagger: '2.0', info: { title: 'HollaEx Kit', - version: '2.13.1' + version: '2.13.2' }, host: 'api.hollaex.com', basePath: '/v2', diff --git a/server/package.json b/server/package.json index c5280c0e23..838942ba4e 100644 --- a/server/package.json +++ b/server/package.json @@ -1,5 +1,5 @@ { - "version": "2.13.1", + "version": "2.13.2", "private": false, "description": "HollaEx Kit", "keywords": [ diff --git a/version b/version index 94f15e9cc3..0e83a9a9c4 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.13.1 +2.13.2 diff --git a/web/package.json b/web/package.json index e8d2546003..d01bb80bc1 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "hollaex-kit", - "version": "2.13.1", + "version": "2.13.2", "private": true, "dependencies": { "@ant-design/compatible": "1.0.5",