Skip to content

Commit

Permalink
fix: empty field shown of quick strategy modal (binary-com#13227)
Browse files Browse the repository at this point in the history
  • Loading branch information
farabi-deriv committed Feb 2, 2024
1 parent 00ec11a commit c4eb23d
Showing 1 changed file with 14 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import React, { useEffect, useMemo, useState } from 'react';
import { Field, FieldProps, useFormikContext } from 'formik';
import { Analytics } from '@deriv-com/analytics';
import { ApiHelpers } from '@deriv/bot-skeleton';
import { Autocomplete, Icon, Text } from '@deriv/components';
import { TItem } from '@deriv/components/src/components/dropdown-list';
import { useStore } from '@deriv/stores';
import { Analytics } from '@deriv-com/analytics';
import { useDBotStore } from 'Stores/useDBotStore';
import { TFormData } from '../types';

type TSymbol = {
component?: React.ReactNode;
text: string;
value: string;
group: string;
group?: string;
};

type TMarketOption = {
Expand All @@ -34,7 +34,7 @@ const SymbolSelect: React.FC = () => {
ui: { is_mobile, is_desktop },
} = useStore();
const { setValue } = quick_strategy;
const [active_symbols, setActiveSymbols] = React.useState([]);
const [active_symbols, setActiveSymbols] = React.useState<TSymbol[]>([]);
const [is_input_started, setIsInputStarted] = useState(false);
const [input_value, setInputValue] = useState({ text: '', value: '' });
const [last_selected_symbol, setLastSelectedSymbol] = useState({ text: '', value: '' });
Expand All @@ -50,17 +50,18 @@ const SymbolSelect: React.FC = () => {
);

useEffect(() => {
const { active_symbols } = ApiHelpers.instance;
const { active_symbols } = ApiHelpers.instance as unknown as {
active_symbols: {
getSymbolsForBot: () => TSymbol[];
};
};
const symbols = active_symbols.getSymbolsForBot();

setActiveSymbols(symbols);

if (values?.symbol) {
const has_symbol = !!symbols.find((symbol: { [key: string]: string }) => symbol.value === values.symbol);
if (!has_symbol) {
setFieldValue('symbol', symbols?.[0]?.value);
setValue('symbol', symbols?.[0]?.value);
}
const has_symbol = !!symbols?.find(symbol => symbol?.value === values?.symbol);
if (!has_symbol) {
setFieldValue('symbol', symbols?.[0]?.value);
setValue('symbol', symbols?.[0]?.value);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
Expand Down Expand Up @@ -93,8 +94,8 @@ const SymbolSelect: React.FC = () => {

const handleItemSelection = (item: TItem) => {
if (item) {
const { value } = item as TSymbol;
sendAssetValueToRudderStack(item.text);
const { value, text } = item as TSymbol;
sendAssetValueToRudderStack(text);
setFieldValue('symbol', value);
setValue('symbol', value);
setIsInputStarted(false);
Expand Down

0 comments on commit c4eb23d

Please sign in to comment.