Commit b44ae1a2 authored by Noah Zinsmeister's avatar Noah Zinsmeister

clean up parseCurrencyFromURLParameter

parent 418dcf0c
...@@ -25,8 +25,8 @@ describe('hooks', () => { ...@@ -25,8 +25,8 @@ describe('hooks', () => {
expect( expect(
queryParametersToSwapState(parse('?outputCurrency=invalid', { parseArrays: false, ignoreQueryPrefix: true })) queryParametersToSwapState(parse('?outputCurrency=invalid', { parseArrays: false, ignoreQueryPrefix: true }))
).toEqual({ ).toEqual({
[Field.INPUT]: { currencyId: '' }, [Field.INPUT]: { currencyId: 'ETH' },
[Field.OUTPUT]: { currencyId: 'ETH' }, [Field.OUTPUT]: { currencyId: '' },
typedValue: '', typedValue: '',
independentField: Field.INPUT, independentField: Field.INPUT,
recipient: null, recipient: null,
......
...@@ -217,9 +217,8 @@ function parseCurrencyFromURLParameter(urlParam: any): string { ...@@ -217,9 +217,8 @@ function parseCurrencyFromURLParameter(urlParam: any): string {
const valid = isAddress(urlParam) const valid = isAddress(urlParam)
if (valid) return valid if (valid) return valid
if (urlParam.toUpperCase() === 'ETH') return 'ETH' if (urlParam.toUpperCase() === 'ETH') return 'ETH'
if (valid === false) return 'ETH'
} }
return 'ETH' ?? '' return ''
} }
function parseTokenAmountURLParameter(urlParam: any): string { function parseTokenAmountURLParameter(urlParam: any): string {
...@@ -244,12 +243,12 @@ function validatedRecipient(recipient: any): string | null { ...@@ -244,12 +243,12 @@ function validatedRecipient(recipient: any): string | null {
export function queryParametersToSwapState(parsedQs: ParsedQs): SwapState { export function queryParametersToSwapState(parsedQs: ParsedQs): SwapState {
let inputCurrency = parseCurrencyFromURLParameter(parsedQs.inputCurrency) let inputCurrency = parseCurrencyFromURLParameter(parsedQs.inputCurrency)
let outputCurrency = parseCurrencyFromURLParameter(parsedQs.outputCurrency) let outputCurrency = parseCurrencyFromURLParameter(parsedQs.outputCurrency)
if (inputCurrency === outputCurrency) { if (inputCurrency === '' && outputCurrency === '') {
if (typeof parsedQs.outputCurrency === 'string') { // default to ETH input
inputCurrency = '' inputCurrency = 'ETH'
} else { } else if (inputCurrency === outputCurrency) {
outputCurrency = '' // clear output if identical
} outputCurrency = ''
} }
const recipient = validatedRecipient(parsedQs.recipient) const recipient = validatedRecipient(parsedQs.recipient)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment