Merge pull request #897 from bitholla/develop

Develop
hollaex · Jul 28, 2021 · 6d28ac6 · 6d28ac6
2 parents 96f8c7f + 795ec24
commit 6d28ac6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/web/src/containers/Deposit/utils.js b/web/src/containers/Deposit/utils.js
@@ -100,7 +100,7 @@ const RenderContentForm = ({
 	selectedNetwork,
 }) => {
 	const coinObject = coins[currency];
-	if (coinObject && !coinObject.meta.is_fiat) {
+	if (coinObject && coinObject.type !== 'fiat') {
 		return (
 			<Fragment>
 				<div className="withdraw-form-wrapper">
@@ -164,7 +164,7 @@ const RenderContentForm = ({
 				</div>
 			</Fragment>
 		);
-	} else if (coinObject && coinObject.meta.is_fiat) {
+	} else if (coinObject && coinObject.type === 'fiat') {
 		return (
 			<Fiat
 				id="REMOTE_COMPONENT__FIAT_WALLET_DEPOSIT"

diff --git a/web/src/containers/Withdraw/form.js b/web/src/containers/Withdraw/form.js
@@ -202,7 +202,7 @@ class Form extends Component {
 			currency === 'xrp' || currency === 'xlm' || selectedNetwork === 'xlm';
 
 		const coinObject = coins[currency];
-		if (coinObject && !coinObject.meta.is_fiat) {
+		if (coinObject && coinObject.type !== 'fiat') {
 			return (
 				<form autoComplete="off" className="withdraw-form-wrapper">
 					<div className="withdraw-form">
@@ -252,7 +252,7 @@ class Form extends Component {
 					</Dialog>
 				</form>
 			);
-		} else if (coinObject && coinObject.meta.is_fiat) {
+		} else if (coinObject && coinObject.type === 'fiat') {
 			return (
 				<Fiat
 					id="REMOTE_COMPONENT__FIAT_WALLET_WITHDRAW"

diff --git a/web/src/reducers/userReducer.js b/web/src/reducers/userReducer.js
@@ -123,6 +123,7 @@ const INITIAL_STATE = {
 	tradeVolumes: INITIAL_TRADE_VOLUME_OBJECT,
 	affiliation: {},
 	is_hap: false,
+	meta: {},
 };
 
 export default function reducer(state = INITIAL_STATE, action) {
@@ -148,6 +149,7 @@ export default function reducer(state = INITIAL_STATE, action) {
 				full_name,
 				gender,
 				dob,
+				meta,
 			} = action.payload;
 			const userData = extractuserData(action.payload);
 			const fees = action.payload.fees || state.fees;
@@ -185,6 +187,7 @@ export default function reducer(state = INITIAL_STATE, action) {
 				full_name,
 				dob,
 				gender,
+				meta,
 			};
 		}
 		case 'SET_USER_DATA': {