diff --git a/package.json b/package.json index 0b16203..953a8dc 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@cosmjs/tendermint-rpc": "^0.31.0", "@dydxprotocol/v4-abacus": "^1.0.19", "@dydxprotocol/v4-client-js": "^1.0.0", - "@dydxprotocol/v4-localization": "^1.0.3", + "@dydxprotocol/v4-localization": "^1.0.5", "@ethersproject/providers": "^5.7.2", "@js-joda/core": "^5.5.3", "@radix-ui/react-collapsible": "^1.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index df6f063..4a751cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,8 +29,8 @@ dependencies: specifier: ^1.0.0 version: 1.0.0 '@dydxprotocol/v4-localization': - specifier: ^1.0.3 - version: 1.0.3 + specifier: ^1.0.5 + version: 1.0.5 '@ethersproject/providers': specifier: ^5.7.2 version: 5.7.2 @@ -1007,8 +1007,13 @@ packages: - utf-8-validate dev: false +<<<<<<< HEAD /@dydxprotocol/v4-localization@1.0.3: resolution: {integrity: sha512-DSTVabwVI6TjR0Z6Nlcl+ryrmayCoki0eBbBcSO/bsNYAffsPAy1e4ctajH49hQC6CKaCyK4urZPEXsdCmLlzQ==} +======= + /@dydxprotocol/v4-localization@1.0.5: + resolution: {integrity: sha512-zZm3GFp/ORz9YjigQFVBlcWmaxYY+XEdIw8AWN5nEbsuiA2Jay+/OA7lO9+nV1J1p1T+TgLo9iczIHJsAo3IsA==} +>>>>>>> 90c3fd1 (address comments) dev: false /@dydxprotocol/v4-proto@0.4.1: diff --git a/src/hooks/useWalletConnection.ts b/src/hooks/useWalletConnection.ts index 9268d82..c6e9fff 100644 --- a/src/hooks/useWalletConnection.ts +++ b/src/hooks/useWalletConnection.ts @@ -104,10 +104,7 @@ export const useWalletConnection = () => { [walletConnectConfig, walletType, walletConnectionType] ); - const { connectAsync: connectWagmi } = - walletType && walletConnectionType - ? useConnectWagmi({ connector: wagmiConnector }) - : useConnectWagmi(); + const { connectAsync: connectWagmi } = useConnectWagmi({ connector: wagmiConnector }) const { suggestAndConnect: connectGraz } = useConnectGraz(); const connectWallet = useCallback( diff --git a/src/views/TransferStatus.tsx b/src/views/TransferStatus.tsx index 9c09945..0b0c9ad 100644 --- a/src/views/TransferStatus.tsx +++ b/src/views/TransferStatus.tsx @@ -55,7 +55,7 @@ export const TransferStatusToast = ({ ? STRING_KEYS.DEPOSIT_STATUS : STRING_KEYS.DEPOSIT_STATUS_SHORTLY : secondsLeft > 0 - ? STRING_KEYS.WITHDRAW_COMPLETE + ? STRING_KEYS.WITHDRAW_STATUS : STRING_KEYS.WITHDRAW_STATUS_SHORTLY; const statusString =