Skip to content

Commit

Permalink
Merge branch 'master' into feature/0.42
Browse files Browse the repository at this point in the history
  • Loading branch information
daechoi authored Jul 13, 2021
2 parents 50671a1 + 0cd5452 commit a008c08
Show file tree
Hide file tree
Showing 7 changed files with 556 additions and 10 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## [UNRELEASED]
* [#523] Implemented readable messages for IBC messages

## [v0.41.x-14.2]
* Fixes Ledger WebUSB + Chrome 91.x issue (https://github.com/LedgerHQ/ledgerjs/issues/607)

Expand Down
49 changes: 49 additions & 0 deletions both/i18n/en-us.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,30 @@ common:
next: 'Next'
txOutOfGasMessage: 'Unable to broadcast the transaction due to insufficient balance. Ensure you have enough funds available on your account to cover the transaction fees.'
estimatedGasPrice: 'Estimated gas price is <b>{$gasPrice}</b>.'
chainID: 'Chain ID'
clientID: 'Client ID'
sourceChannel: 'Source Channel'
destinationChannel: 'Destination Channel'
proofCommitment: 'Proof Commitment'
connectionID: 'Connection ID'
proof: 'Proof'
counterpartyClientID: 'Counterparty Client ID'
counterpartyConnectionID: 'Counterparty Connection ID'
acknowledgement: 'Acknowledgement'
proofAcknowledgement: 'Proof Acknowledgement'
token: 'Token'
proofUpgradeClient: 'Proof Upgrade Client'
proofUpgradeConsensusState: 'Proof Upgrade Consensus State'
misbehaviour: 'Misbehaviour'
data: 'Data'
portID: 'Port ID'
channelID: 'Channel ID'
counterpartyChannelID: 'Counterparty Channel ID'
counterpartyVersion: 'Counterparty Version'
channel: 'Channel'
proofClient: 'Proof Client'
counterparty: 'Counterparty'

navbar:
siteName: 'BIG DIPPER'
version: '-'
Expand Down Expand Up @@ -250,3 +274,28 @@ messageTypes:
unjail: 'Unjail'
IBCTransfer: 'IBC Transfer'
IBCReceive: 'IBC Receive'
IBCCreateClient: 'IBC Create Client'
IBCUpdateClient: 'IBC Update Client'
IBCUpgradeClient: 'IBC Upgrade Client'
IBCSubmitMisbehaviour: 'IBC Submit Misbehaviour'
IBCReceivePacket: 'IBC Receive Packet'
IBCConnectionOpenConfirm: 'IBC Connection Open Confirm'
IBCConnectionOpenTry: 'IBC Connection Open Try'
IBCConnectionOpenAck: 'IBC Connection Open Acknowledgement'
IBCConnectionOpenInit: 'IBC Connection Open Init'
IBCAcknowledgement: 'IBC Acknowledgement'
IBCChannelCloseConfirm: 'IBC Channel Close Confirm'
IBCChannelCloseInit: 'IBC Channel Close Init'
IBCChannelOpenAck: 'IBC Channel Open Acknowledgement'
IBCChannelOpenConfirm: 'IBC Channel Open Confirm'
IBCChannelOpenInit: 'IBC Channel Open Init'
IBCChannelOpenTry: 'IBC Channel Open Try'
IBCConnectionEnd: 'IBC Connection End'
IBCCounterparty: 'IBC Counterparty'
IBCVersion: 'IBC Version'
IBCTimeout: 'IBC Timeout'
IBCTimeoutOnClose: 'IBC Timeout On Close'
IBCHeight: 'IBC Height'
IBCChannel: 'IBC Channel'
IBCPacket: 'IBC Packet'
IBCMsgTransfer: 'IBC Message Transfer'
4 changes: 4 additions & 0 deletions client/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,10 @@ body {
margin-top: 4em
}

.wrap-long-text{
overflow-wrap: anywhere;
}

.btn-ledger-login{
width: 13rem;
border: solid 1px #c6c6c6;
Expand Down
499 changes: 494 additions & 5 deletions imports/ui/components/Activities.jsx

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion imports/ui/components/MsgType.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ export const MsgType = (props) => {

// ibc
case "/cosmos.IBCTransferMsg":
return <Badge color="dark"><T>messageTypes.IBCTransfer</T></Badge>;
return <Badge style={{ backgroundColor: "#000080" }}><T>messageTypes.IBCTransfer</T></Badge>;
case "/cosmos.IBCReceiveMsg":

return <Badge color="dark"><T>messageTypes.IBCReceive</T></Badge>;
// clp
case "clp/Swap":
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/transactions/TransactionRow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const TransactionRow = (props) => {

return <SentryBoundary><Row className={(tx.code)?"tx-info w-40 invalid":"tx-info w-40"}>
<Col xs={12} lg={homepage ? 5 : 7} className="activity" >{(tx?.tx?.body?.messages && tx?.tx?.body?.messages.length >0)?tx?.tx?.body?.messages.map((msg,i) => {
return <Card body key={i}><Activities msg={msg} invalid={(!!tx.tx_response.code)} events={(tx.tx_response.logs&&tx.tx_response.logs[i])?tx.tx_response.logs[i].events:null} /></Card>
return <Card body key={i}><Activities msg={msg} id={props.index} invalid={(!!tx.tx_response.code)} events={(tx.tx_response.logs&&tx.tx_response.logs[i])?tx.tx_response.logs[i].events:null} /></Card>
}):''}</Col>
{!homepage ? <Col xs={(!props.blockList)?{size:6,order:"last"}:{size:12,order:"last"}} md={(!props.blockList)?{size:3, order: "last"}:{size:7, order: "last"}} lg={(!props.blockList)?{size:1,order:"last"}:{size:2,order:"last"}} className="text-truncate"><i className="fas fa-hashtag d-lg-none"></i> <Link to={"/transactions/"+tx.txhash}>{tx.txhash}</Link></Col> :
<Col xs={(!props.blockList)?{size:6,order:"last"}:{size:12,order:"last"}} md={(!props.blockList)?{size:3, order: "last"}:{size:7, order: "last"}} lg={{size:2,order:"last"}} className="text-truncate ml-n4"><i className="fas fa-hashtag d-lg-none"></i> <Link to={"/transactions/"+tx.txhash}>{tx.txhash}</Link></Col>}
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a008c08

Please sign in to comment.