LaconicNetwork/dydx-v4-web
6
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

address comments

Browse Source
This commit is contained in:
Bill He 2023-11-08 20:50:34 -08:00
parent 9eb2bec10b
commit 4bbb2ce89d
No known key found for this signature in database
GPG Key ID: 73AEEF9D79E5BBF8
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/forms/AccountManagementForms/DepositForm.tsx
View File

@ -289,12 +289,17 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
}
if (routeErrors) {
const parsedErrors = JSON.parse(routeErrors);
if (parsedErrors?.[0]?.message) {
return stringGetter({
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
params: { ERROR_MESSAGE: parsedErrors?.[0]?.message },
});
try {
const parsedErrors = JSON.parse(routeErrors);
if (parsedErrors?.[0]?.message) {
return stringGetter({
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
params: { ERROR_MESSAGE: parsedErrors?.[0]?.message },
});
}
} catch (e) {
log('WithDrawForm/errorMessage', e);
return stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
}
}
@ -311,7 +316,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
}
return undefined;
}, [error, routeErrors, balance, chainId, fromAmount, sourceToken]);
}, [error, routeErrors, balance, chainId, fromAmount, sourceToken, stringGetter]);
const isDisabled =
Boolean(errorMessage) ||

20
src/views/forms/AccountManagementForms/WithdrawForm.tsx
View File

@ -44,10 +44,10 @@ import { getTransferInputs } from '@/state/inputsSelectors';
import abacusStateManager from '@/lib/abacus';
import { MustBigNumber } from '@/lib/numbers';
import { log } from '@/lib/telemetry';
import { TokenSelectMenu } from './TokenSelectMenu';
import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';
import { join } from 'path';
export const WithdrawForm = () => {
const stringGetter = useStringGetter();
@ -283,12 +283,17 @@ export const WithdrawForm = () => {
}
if (routeErrors) {
const parsedErrors = JSON.parse(routeErrors);
if (parsedErrors?.[0]?.message) {
return stringGetter({
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
params: { ERROR_MESSAGE: parsedErrors?.[0]?.message },
});
try {
const parsedErrors = JSON.parse(routeErrors);
if (parsedErrors?.[0]?.message) {
return stringGetter({
key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
params: { ERROR_MESSAGE: parsedErrors?.[0]?.message },
});
}
} catch (e) {
log('WithDrawForm/errorMessage', e);
return stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
}
}
@ -321,6 +326,7 @@ export const WithdrawForm = () => {
toToken,
toAddress,
sanctionedAddresses,
stringGetter,
]);
const isDisabled =