-
Notifications
You must be signed in to change notification settings - Fork 86
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(SelectProvider): add info text on amount spent #3919
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f69a073
feat(SelectProvider): add info text on amount spent
satish-ravi 2b76ee0
rename gate
satish-ravi 1cd410f
reuse Fiat and Crypto Amount components from review screen
satish-ravi 257bd97
fix color
satish-ravi 0c5914b
Merge branch 'main' into satish/act-842-1
satish-ravi 8448aaf
Merge branch 'main' into satish/act-842-1
satish-ravi f48beb7
Merge branch 'main' into satish/act-842-1
satish-ravi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
import { render } from '@testing-library/react-native' | ||
import React from 'react' | ||
import { Provider } from 'react-redux' | ||
import CurrencyDisplay from 'src/components/CurrencyDisplay' | ||
import TokenDisplay from 'src/components/TokenDisplay' | ||
import { CryptoAmount, FiatAmount } from 'src/fiatExchanges/amount' | ||
import { CiCoCurrency } from 'src/utils/currencies' | ||
import { createMockStore } from 'test/utils' | ||
import { mockCusdAddress } from 'test/values' | ||
|
||
jest.mock('src/components/TokenDisplay') | ||
jest.mock('src/components/CurrencyDisplay') | ||
|
||
describe('CryptoAmount', () => { | ||
it('passes amount and token address to TokenDisplay', () => { | ||
render( | ||
<Provider store={createMockStore()}> | ||
<CryptoAmount amount={10} currency={CiCoCurrency.cUSD} testID="cryptoAmt" /> | ||
</Provider> | ||
) | ||
expect(TokenDisplay).toHaveBeenCalledWith( | ||
{ | ||
amount: 10, | ||
showLocalAmount: false, | ||
testID: 'cryptoAmt', | ||
tokenAddress: mockCusdAddress, | ||
}, | ||
{} | ||
) | ||
}) | ||
}) | ||
|
||
describe('FiatAmount', () => { | ||
it('passes amount and currency to CurrencyDisplay', () => { | ||
render(<FiatAmount amount={20} currency="USD" testID="fiatAmt" />) | ||
|
||
expect(CurrencyDisplay).toHaveBeenCalledWith( | ||
expect.objectContaining({ | ||
amount: { | ||
value: 0, | ||
currencyCode: '', | ||
localAmount: { value: 20, currencyCode: 'USD', exchangeRate: 1 }, | ||
}, | ||
testID: 'fiatAmt', | ||
}), | ||
{} | ||
) | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import BigNumber from 'bignumber.js' | ||
import React from 'react' | ||
import CurrencyDisplay, { FormatType } from 'src/components/CurrencyDisplay' | ||
import TokenDisplay from 'src/components/TokenDisplay' | ||
import { useTokenInfoBySymbol } from 'src/tokens/hooks' | ||
import { CiCoCurrency } from 'src/utils/currencies' | ||
|
||
export function CryptoAmount({ | ||
amount, | ||
currency, | ||
testID, | ||
}: { | ||
amount: BigNumber.Value | ||
currency: CiCoCurrency | ||
testID?: string | ||
}) { | ||
const { address } = useTokenInfoBySymbol(currency)! | ||
return ( | ||
<TokenDisplay amount={amount} tokenAddress={address} showLocalAmount={false} testID={testID} /> | ||
) | ||
} | ||
|
||
export function FiatAmount({ | ||
amount, | ||
currency, | ||
testID, | ||
formatType, | ||
}: { | ||
amount: BigNumber.Value | ||
currency: string | ||
testID?: string | ||
formatType?: FormatType | ||
}) { | ||
return ( | ||
<CurrencyDisplay | ||
amount={{ | ||
// The value and currencyCode here doesn't matter since the component will use `localAmount` | ||
value: 0, | ||
currencyCode: '', | ||
localAmount: { | ||
value: amount, | ||
currencyCode: currency, | ||
exchangeRate: 1, | ||
}, | ||
}} | ||
formatType={formatType} | ||
testID={testID} | ||
/> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just moved from src/fiatconnect/ReviewScreen.tsx