Merge pull request #3409 from hollaex/beta

Beta

Author: abeikverdi

server/api/swagger/swagger.js

@@ -4,7 +4,7 @@ const definition = {
 	swagger: '2.0',
 	info: {
 		title: 'HollaEx Kit',
-		version: '2.15.1'
+		version: '2.15.2'
 	},
 	host: 'api.hollaex.com',
 	basePath: '/v2',

server/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.15.1",
+	"version": "2.15.2",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [

version

@@ -1 +1 @@
-2.15.1
+2.15.2

web/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-kit",
-	"version": "2.15.1",
+	"version": "2.15.2",
 	"private": true,
 	"dependencies": {
 		"@ant-design/compatible": "1.0.5",

web/package.json

@@ -742,7 +742,7 @@ const Otcdeskpopup = ({
 									name="max"
 									min={0}
 									onChange={(e) =>
-										handlePreviewChange(e.target.value, 'min_size')
+										handlePreviewChange(Number(e.target.value), 'min_size')
 									}
 									value={previewData && previewData.min_size}
 									suffix={
@@ -763,7 +763,7 @@ const Otcdeskpopup = ({
 									name="max"
 									min={0}
 									onChange={(e) =>
-										handlePreviewChange(e.target.value, 'max_size')
+										handlePreviewChange(Number(e.target.value), 'max_size')
 									}
 									value={previewData && previewData.max_size}
 									suffix={

web/src/containers/Admin/Trades/Otcdeskpopup.js

@@ -345,6 +345,9 @@ $operator-controls__panel-border-color: #a7a7a7;
 		margin-left: 0.4rem;
 		font-size: 1rem;
 	}
+	.operator-control-error-text {
+		color: #ff0000;
+	}
 }
 
 .operator-controls__modal-open #root {
@@ -450,3 +453,9 @@ $operator-controls__panel-border-color: #a7a7a7;
 		background-color: $operator-controls__panel-main-color !important;
 	}
 }
+
+.confirmation-icon-popup {
+	.ant-modal-body {
+		background-color: $operator-controls__panel-main-color;
+	}
+}

web/src/containers/OperatorControls/_OperatorControls.scss

@@ -98,6 +98,7 @@ class AllIconsModal extends Component {
 			onOk: this.handleSave,
 			onCancel: () => this.setState({ selectedFiles: {} }),
 			zIndex: 10003,
+			className: 'confirmation-icon-popup',
 		});
 	};
 
@@ -160,14 +161,27 @@ class AllIconsModal extends Component {
 
 	onHandleConfirm = () => {
 		const { onCloseDialog, removedKeys, onSave } = this.props;
+		const getIcons = JSON.parse(localStorage.getItem('icons')) || {};
 		const icons = {};
-		localStorage.setItem('removedBackgroundItems', JSON.stringify(removedKeys));
-		onSave(icons, true);
+		if (!this.state?.error) {
+			removedKeys &&
+				(removedKeys || []).forEach((key) => {
+					const [iconKey = '', theme = ''] = key?.split('__');
+					if (getIcons[theme] && getIcons[theme][iconKey]) {
+						localStorage.setItem(
+							'removedBackgroundItems',
+							JSON.stringify(removedKeys)
+						);
+						onSave(icons);
+					}
+				});
+		}
 		onCloseDialog();
 	};
 
 	render() {
 		const { isOpen, icons, onCloseDialog, searchValue, onSearch } = this.props;
+		const { error } = this.state;
 
 		const modalContent = document.getElementById('all-icons-content');
 		const modalContentHeight = modalContent ? modalContent.clientHeight : 0;
@@ -220,7 +234,18 @@ class AllIconsModal extends Component {
 							scroll={{ y: tableContentHeight }}
 							style={{ width: '820px' }}
 						/>
-						<div className="d-flex justify-content-end pt-4 mt-4">
+						<div
+							className={
+								error
+									? 'd-flex flex-column align-items-end'
+									: 'pt-4 d-flex flex-column align-items-end'
+							}
+						>
+							{error && (
+								<span className="operator-control-error-text font-weight-bold mb-2">
+									{error}
+								</span>
+							)}
 							<Button
 								type="primary"
 								onClick={this.onHandleConfirm}

web/src/containers/OperatorControls/components/AllIconsModal.js

@@ -796,7 +796,12 @@ class OperatorControls extends Component {
 
 	removeIcon = (themeKey, iconKey) => {
 		const icons = this.state.iconsOverwrites;
-		const selectedTheme = themeKey && icons?.[themeKey];
+		let selectedTheme = themeKey && icons?.[themeKey];
+
+		if (!selectedTheme) {
+			selectedTheme = {};
+		}
+
 		let data = {};
 		Object.keys(selectedTheme).forEach((item) => {
 			if (item !== iconKey) {
@@ -1003,11 +1008,11 @@ class OperatorControls extends Component {
 	};
 
 	onReset = (themeKey, iconKey) => {
-		const { allIconsArray, removedKeys: currentRemovedKeys } = this.state;
+		const { iconSearchResults, removedKeys: currentRemovedKeys } = this.state;
 		const currentTheme = themeKey === 'white' ? 'white' : 'dark';
 		const removedKey = `${iconKey}__${currentTheme}`;
 
-		const updatedIcons = allIconsArray.map((iconObject = {}) => {
+		const updatedIcons = iconSearchResults?.map((iconObject = {}) => {
 			if (iconObject?.key === iconKey) {
 				return { ...iconObject, [themeKey]: '' };
 			}
@@ -1027,6 +1032,7 @@ class OperatorControls extends Component {
 
 		this.handleRemoveOrUpload('removedKeys', updatedRemovedKeys);
 		this.handleRemoveOrUpload('remove', true);
+		this.removeIcon(themeKey, iconKey);
 	};
 
 	render() {

web/src/containers/OperatorControls/index.js

@@ -533,7 +533,8 @@ $trade-tab--arrow-size: 0.4rem;
 	}
 
 	.deposit-icon {
-		svg {
+		svg,
+		img {
 			width: 1rem;
 		}
 	}