Skip to content

Commit fe02b33

Browse files
authored
Merge branch 'rtl' into data-testid
2 parents ae53a7c + 257770d commit fe02b33

31 files changed

+2188
-1147
lines changed

package-lock.json

Lines changed: 1553 additions & 1129 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@
4242
"react-query": "^3.39.3",
4343
"react-redux": "^8.1.3",
4444
"react-router": "^6.12.1",
45-
"react-router-dom": "^6.18.0",
45+
"react-router-dom": "^6.24.0",
4646
"react18-json-view": "^0.2.7",
4747
"recharts": "^2.12.6",
4848
"redux": "^5.0.1",
4949
"redux-logger": "^3.0.6",
5050
"redux-thunk": "^2.2.0",
51-
"ripple-address-codec": "^5.0.0-beta.1",
51+
"ripple-address-codec": "^5.0.0",
5252
"topojson-client": "^3.0.0",
53-
"usehooks-ts": "^2.9.1",
53+
"usehooks-ts": "^3.1.0",
5454
"vite": "^4.2.3",
5555
"vite-plugin-environment": "^1.1.3",
5656
"vite-plugin-html": "^3.2.0",
5757
"vite-plugin-svgr": "^4.2.0",
5858
"vite-tsconfig-paths": "^4.2.0",
59-
"xrpl-client": "^2.1.0"
59+
"xrpl-client": "^2.4.0"
6060
},
6161
"devDependencies": {
6262
"@babel/eslint-parser": "^7.22.6",
6363
"@babel/preset-env": "^7.24.5",
64-
"@babel/preset-react": "^7.22.15",
64+
"@babel/preset-react": "^7.24.7",
6565
"@types/create-hash": "^1.2.2",
6666
"@types/enzyme": "^3.10.12",
6767
"@types/jest": "^26.0.24",
68-
"@types/lodash": "^4.14.194",
69-
"@types/node": "^18.19.31",
68+
"@types/lodash": "^4.17.6",
69+
"@types/node": "^18.19.33",
7070
"@types/react": "^17.0.39",
7171
"@types/react-dom": "^17.0.9",
7272
"@types/react-redux": "^7.1.22",
@@ -86,11 +86,11 @@
8686
"eslint-plugin-import": "^2.29.1",
8787
"eslint-plugin-jsx-a11y": "^6.7.1",
8888
"eslint-plugin-prettier": "^5.1.3",
89-
"eslint-plugin-react": "^7.33.2",
89+
"eslint-plugin-react": "^7.34.2",
9090
"eslint-plugin-react-hooks": "^4.6.0",
9191
"jest-enzyme": "^7.1.0",
9292
"jest-websocket-mock": "^2.5.0",
93-
"lint-staged": "^15.1.0",
93+
"lint-staged": "^15.2.5",
9494
"mock-socket": "^9.1.5",
9595
"moxios": "^0.4.0",
9696
"nodemon": "^3.0.1",

public/locales/ca-CA/translations.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@
172172
"transaction_type_name_NFTokenMint": "Encunyar NFT",
173173
"transaction_type_name_OfferCancel": "Cancel·lar Oferta",
174174
"transaction_type_name_OfferCreate": "Crear Ofertae",
175+
"transaction_type_name_OracleDelete": null,
176+
"transaction_type_name_OracleSet": null,
175177
"transaction_type_name_Payment": "Pagament",
176178
"transaction_type_name_PaymentChannelClaim": "Reclamar al Canal de Pagament",
177179
"transaction_type_name_PaymentChannelCreate": "Crear Canal de Pagament",
@@ -522,5 +524,11 @@
522524
"note": "Nota",
523525
"indicate_unl": "indica un validador en una UNL",
524526
"transaction_tokens_involved": "<Currency/> i <Currency2/>",
525-
"transaction_tokens_swapped": "<Currency/> per <Currency2/>"
527+
"transaction_tokens_swapped": "<Currency/> per <Currency2/>",
528+
"oracle_document_id": null,
529+
"provider": null,
530+
"last_update_time": null,
531+
"asset_class": null,
532+
"trading_pairs": null,
533+
"deleted": null
526534
}

public/locales/en-US/translations.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@
173173
"transaction_type_name_NFTokenMint": "NFT Mint",
174174
"transaction_type_name_OfferCancel": "Offer Cancel",
175175
"transaction_type_name_OfferCreate": "Offer Create",
176+
"transaction_type_name_OracleDelete": "Oracle Delete",
177+
"transaction_type_name_OracleSet": "Oracle Set",
176178
"transaction_type_name_Payment": "Payment",
177179
"transaction_type_name_PaymentChannelClaim": "Payment Channel Claim",
178180
"transaction_type_name_PaymentChannelCreate": "Payment Channel Create",
@@ -522,5 +524,11 @@
522524
"note": "Note",
523525
"indicate_unl": "indicates a validator on an UNL",
524526
"transaction_tokens_involved": "<Currency/> and <Currency2/>",
525-
"transaction_tokens_swapped": "<Currency/> for <Currency2/>"
527+
"transaction_tokens_swapped": "<Currency/> for <Currency2/>",
528+
"oracle_document_id": "Oracle Document ID",
529+
"provider": "Provider",
530+
"last_update_time": "Last Update Time",
531+
"asset_class": "Asset Class",
532+
"trading_pairs": "Trading Pairs",
533+
"deleted": "Deleted"
526534
}

public/locales/es-ES/translations.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@
169169
"transaction_type_name_NFTokenMint": "Acuñar NFT",
170170
"transaction_type_name_OfferCancel": "Cancelar Oferta",
171171
"transaction_type_name_OfferCreate": "Crear Oferta",
172+
"transaction_type_name_OracleDelete": null,
173+
"transaction_type_name_OracleSet": null,
172174
"transaction_type_name_Payment": "Pago",
173175
"transaction_type_name_PaymentChannelClaim": "Reclamar Canal de Pago",
174176
"transaction_type_name_PaymentChannelCreate": "Crear Canal de Pago",
@@ -518,5 +520,11 @@
518520
"note": "Nota",
519521
"indicate_unl": "indica a un validador en una UNL",
520522
"transaction_tokens_involved": "<Currency/> y <Currency2/>",
521-
"transaction_tokens_swapped": "<Currency/> por <Currency2/>"
523+
"transaction_tokens_swapped": "<Currency/> por <Currency2/>",
524+
"oracle_document_id": null,
525+
"provider": null,
526+
"last_update_time": null,
527+
"asset_class": null,
528+
"trading_pairs": null,
529+
"deleted": null
522530
}

public/locales/fr-FR/translations.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@
171171
"transaction_type_name_NFTokenMint": "NFT forgé",
172172
"transaction_type_name_OfferCancel": "Offre annulée",
173173
"transaction_type_name_OfferCreate": "Offre créée",
174+
"transaction_type_name_OracleDelete": null,
175+
"transaction_type_name_OracleSet": null,
174176
"transaction_type_name_Payment": "Paiement effectué",
175177
"transaction_type_name_PaymentChannelClaim": "Canal de paiement réclamé",
176178
"transaction_type_name_PaymentChannelCreate": "Canal de paiement créé",
@@ -519,5 +521,11 @@
519521
"note": null,
520522
"indicate_unl": null,
521523
"transaction_tokens_involved": null,
522-
"transaction_tokens_swapped": null
524+
"transaction_tokens_swapped": null,
525+
"oracle_document_id": null,
526+
"provider": null,
527+
"last_update_time": null,
528+
"asset_class": null,
529+
"trading_pairs": null,
530+
"deleted": null
523531
}

public/locales/ja-JP/translations.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@
171171
"transaction_type_name_NFTokenMint": "NFTのミント",
172172
"transaction_type_name_OfferCancel": "オファーの取消",
173173
"transaction_type_name_OfferCreate": "オファーの作成",
174+
"transaction_type_name_OracleDelete": null,
175+
"transaction_type_name_OracleSet": null,
174176
"transaction_type_name_Payment": "支払い",
175177
"transaction_type_name_PaymentChannelClaim": "ペイメントチャネル請求",
176178
"transaction_type_name_PaymentChannelCreate": "ペイメントチャネル作成",
@@ -518,5 +520,11 @@
518520
"note": null,
519521
"indicate_unl": null,
520522
"transaction_tokens_involved": null,
521-
"transaction_tokens_swapped": null
523+
"transaction_tokens_swapped": null,
524+
"oracle_document_id": null,
525+
"provider": null,
526+
"last_update_time": null,
527+
"asset_class": null,
528+
"trading_pairs": null,
529+
"deleted": null
522530
}

public/locales/ko-KR/translations.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@
173173
"transaction_type_name_NFTokenMint": "NFT 발행",
174174
"transaction_type_name_OfferCancel": "제안 취소",
175175
"transaction_type_name_OfferCreate": "제안 생성",
176+
"transaction_type_name_OracleDelete": null,
177+
"transaction_type_name_OracleSet": null,
176178
"transaction_type_name_PaymentChannelClaim": "결제 채널 청구",
177179
"transaction_type_name_PaymentChannelCreate": "결제 채널 생성",
178180
"transaction_type_name_PaymentChannelFund": "결제 채널 펀딩",
@@ -516,5 +518,11 @@
516518
"note": null,
517519
"indicate_unl": null,
518520
"transaction_tokens_involved": null,
519-
"transaction_tokens_swapped": null
521+
"transaction_tokens_swapped": null,
522+
"oracle_document_id": null,
523+
"provider": null,
524+
"last_update_time": null,
525+
"asset_class": null,
526+
"trading_pairs": null,
527+
"deleted": null
520528
}

src/containers/Token/TokenHeader/index.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ const TokenHeader = ({
124124
flags && flags.includes('lsfRequireAuth') ? 'true' : 'false'
125125
const requireDestTag =
126126
flags && flags.includes('lsfRequireDestTag') ? 'true' : 'false'
127+
const clawback =
128+
flags && flags.includes('lsfAllowTrustLineClawback') ? 'true' : 'false'
127129

128130
return (
129131
<table className="token-table">
@@ -136,6 +138,7 @@ const TokenHeader = ({
136138
<TokenTableRow label="No freeze" value={noFreeze} />
137139
<TokenTableRow label="Require Auth" value={requireAuth} />
138140
<TokenTableRow label="Require Dest Tag" value={requireDestTag} />
141+
<TokenTableRow label="Allow TrustLine Clawback" value={clawback} />
139142
</tbody>
140143
</table>
141144
)

src/containers/Transactions/simpleTab.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ $subdued-color: $black-40;
6464
vertical-align: bottom;
6565
}
6666
}
67+
68+
&.list {
69+
margin-bottom: 12px;
70+
71+
.one-line {
72+
justify-content: flex-end;
73+
margin: -1px 0px 0px;
74+
}
75+
}
6776
}
6877

6978
ul {

0 commit comments

Comments
 (0)