-
Notifications
You must be signed in to change notification settings - Fork 478
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'delivan/keplr-274' into delivan/keplr-309
- Loading branch information
Showing
67 changed files
with
800 additions
and
365 deletions.
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
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
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,148 @@ | ||
| import {IMessageRenderer} from './types.ts'; | ||
| import {MsgTransfer} from '@keplr-wallet/proto-types/ibc/applications/transfer/v1/tx'; | ||
| import * as ExpoImage from 'expo-image'; | ||
| import {FormattedMessage, useIntl} from 'react-intl'; | ||
| import React, {FunctionComponent, useState} from 'react'; | ||
| import {observer} from 'mobx-react-lite'; | ||
| import {useStore} from '../../stores'; | ||
| import {Coin, CoinPretty} from '@keplr-wallet/unit'; | ||
| import {Bech32Address} from '@keplr-wallet/cosmos'; | ||
| import {StyleSheet, Text} from 'react-native'; | ||
| import {useStyle} from '../../styles'; | ||
| import {XAxis} from '../../components/axis'; | ||
| import {Button} from '../../components/button'; | ||
| import {Box} from '../../components/box'; | ||
| import {Gutter} from '../../components/gutter'; | ||
|
|
||
| export const TransferMessage: IMessageRenderer = { | ||
| process(chainId: string, msg) { | ||
| const d = (() => { | ||
| if ('type' in msg && msg.type === 'cosmos-sdk/MsgTransfer') { | ||
| return { | ||
| token: msg.value.token, | ||
| receiver: msg.value.receiver, | ||
| channelId: msg.value.source_channel, | ||
| ibcMemo: msg.value.memo, | ||
| }; | ||
| } | ||
|
|
||
| if ( | ||
| 'unpacked' in msg && | ||
| msg.typeUrl === '/ibc.applications.transfer.v1.MsgTransfer' | ||
| ) { | ||
| return { | ||
| token: (msg.unpacked as MsgTransfer).token, | ||
| receiver: (msg.unpacked as MsgTransfer).receiver, | ||
| channelId: (msg.unpacked as MsgTransfer).sourceChannel, | ||
| ibcMemo: (msg.unpacked as MsgTransfer).memo, | ||
| }; | ||
| } | ||
| })(); | ||
|
|
||
| if (d) { | ||
| return { | ||
| icon: ( | ||
| <ExpoImage.Image | ||
| style={{width: 48, height: 48}} | ||
| source={require('../../public/assets/img/sign/sign-ibc-transfer.png')} | ||
| /> | ||
| ), | ||
| title: ( | ||
| <FormattedMessage id="page.sign.components.messages.transfer.title" /> | ||
| ), | ||
| content: ( | ||
| <TransferMessagePretty | ||
| chainId={chainId} | ||
| amount={d.token} | ||
| receiver={d.receiver} | ||
| channelId={d.channelId} | ||
| ibcMemo={d.ibcMemo} | ||
| /> | ||
| ), | ||
| }; | ||
| } | ||
| }, | ||
| }; | ||
|
|
||
| const TransferMessagePretty: FunctionComponent<{ | ||
| chainId: string; | ||
| amount: Coin; | ||
| receiver: string; | ||
| channelId: string; | ||
| ibcMemo?: string; | ||
| }> = observer(({chainId, amount, receiver, channelId, ibcMemo}) => { | ||
| const {chainStore} = useStore(); | ||
|
|
||
| const intl = useIntl(); | ||
| const style = useStyle(); | ||
|
|
||
| const [isOpen, setIsOpen] = useState(false); | ||
|
|
||
| const currency = chainStore.getChain(chainId).forceFindCurrency(amount.denom); | ||
| const coinPretty = new CoinPretty(currency, amount.amount); | ||
|
|
||
| return ( | ||
| <React.Fragment> | ||
| <Text style={style.flatten(['body3', 'color-text-middle'])}> | ||
| <FormattedMessage | ||
| id="page.sign.components.messages.transfer.paragraph" | ||
| values={{ | ||
| coin: coinPretty.trim(true).toString(), | ||
| address: Bech32Address.shortenAddress(receiver, 20), | ||
| channelId, | ||
| b: (...chunks: any) => ( | ||
| <Text style={{fontWeight: 'bold'}}>{chunks}</Text> | ||
| ), | ||
| }} | ||
| /> | ||
| </Text> | ||
|
|
||
| {ibcMemo ? ( | ||
| <Box> | ||
| <Gutter size={6} /> | ||
|
|
||
| {isOpen ? ( | ||
| <React.Fragment> | ||
| <Text | ||
| style={StyleSheet.flatten([ | ||
| style.flatten(['body3', 'color-text-middle']), | ||
| {width: 240, margin: 0, marginBottom: 8}, | ||
| ])}> | ||
| {isOpen | ||
| ? (() => { | ||
| try { | ||
| return JSON.stringify(JSON.parse(ibcMemo), null, 2); | ||
| } catch { | ||
| return ibcMemo; | ||
| } | ||
| })() | ||
| : ''} | ||
| </Text> | ||
| </React.Fragment> | ||
| ) : null} | ||
| <XAxis> | ||
| <Button | ||
| size="extra-small" | ||
| color="secondary" | ||
| containerStyle={{ | ||
| backgroundColor: style.get('color-gray-400').color, | ||
| }} | ||
| text={ | ||
| isOpen | ||
| ? intl.formatMessage({ | ||
| id: 'page.sign.components.messages.wasm-message-view.close-button', | ||
| }) | ||
| : intl.formatMessage({ | ||
| id: 'page.sign.components.messages.wasm-message-view.details-button', | ||
| }) | ||
| } | ||
| onPress={() => { | ||
| setIsOpen(!isOpen); | ||
| }} | ||
| /> | ||
| </XAxis> | ||
| </Box> | ||
| ) : null} | ||
| </React.Fragment> | ||
| ); | ||
| }); |
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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "version": "0.12.94", | ||
| "version": "0.12.96-rc.0", | ||
| "useWorkspaces": true, | ||
| "npmClient": "yarn", | ||
| "command": { | ||
|
|
||
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.