From a30ba9cfd1dd67765694a332412c29717f308c90 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Mon, 29 Nov 2021 14:58:49 +0100 Subject: [PATCH 1/6] add jetbrains folder --- src/live-common-set-supported-currencies.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/live-common-set-supported-currencies.js b/src/live-common-set-supported-currencies.js index 3834e8b964..ee0552f08f 100644 --- a/src/live-common-set-supported-currencies.js +++ b/src/live-common-set-supported-currencies.js @@ -41,4 +41,5 @@ setSupportedCurrencies([ "ethereum_ropsten", "ethereum_goerli", "cosmos_testnet", + "filecoin", ]); From 45e6aa59de1cf74f957c504c40ef199ded47e5a7 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Mon, 29 Nov 2021 14:59:27 +0100 Subject: [PATCH 2/6] add jetbrains to gitignore file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index db1d4a1cc7..5456fc601e 100644 --- a/.gitignore +++ b/.gitignore @@ -128,4 +128,5 @@ ui-lib/lib ui-lib/storybook-static/* # IDE -.vscode/* \ No newline at end of file +.vscode/* +.idea \ No newline at end of file From 23939fde198383a6049c9a7d9800bcbab6a5f923 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 24 Feb 2022 14:22:43 -0300 Subject: [PATCH 3/6] add check to avoid exception on objects inside extra field --- .../drawers/OperationDetails/index.js | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/renderer/drawers/OperationDetails/index.js b/src/renderer/drawers/OperationDetails/index.js index 2d5069c9d5..12af7521d6 100644 --- a/src/renderer/drawers/OperationDetails/index.js +++ b/src/renderer/drawers/OperationDetails/index.js @@ -642,15 +642,21 @@ type OperationDetailsExtraProps = { const OperationDetailsExtra = ({ extra }: OperationDetailsExtraProps) => { return Object.entries(extra).map(([key, value]) => ( - - - - - - {value} - - - )); + return Object.entries(extra).map(([key, value]) => { + if( typeof value == "object" || typeof value == "function") return null; + + return ( + + + + + + {value} + + + ); + + }); }; const More = styled(Text).attrs(p => ({ From 8b9552120b42d17d2d1202aeb16ce203ec211275 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 24 Feb 2022 15:49:19 -0300 Subject: [PATCH 4/6] add transaction confirm fields for filecoin --- .../filecoin/TransactionConfirmFields.js | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/renderer/families/filecoin/TransactionConfirmFields.js diff --git a/src/renderer/families/filecoin/TransactionConfirmFields.js b/src/renderer/families/filecoin/TransactionConfirmFields.js new file mode 100644 index 0000000000..345fee0db6 --- /dev/null +++ b/src/renderer/families/filecoin/TransactionConfirmFields.js @@ -0,0 +1,37 @@ +// @flow + +import invariant from "invariant"; +import React from "react"; +import TransactionConfirmField from "~/renderer/components/TransactionConfirm/TransactionConfirmField"; +import Text from "~/renderer/components/Text"; +import { DeviceTransactionField } from "@ledgerhq/live-common/lib/transaction"; + + +const addressStyle = { + wordBreak: "break-all", + textAlign: "right", + maxWidth: "70%", +}; + +const FilecoinField = ({ transaction, field }: { transaction: Transaction, field: DeviceTransactionField }) => { + invariant(transaction.family === "filecoin", "filecoin transaction"); + + return ( + + + {field.value} + + + ); +}; + +const fieldComponents = { + "filecoin.gasFeeCap": FilecoinField, + "filecoin.gasPremium": FilecoinField, + "filecoin.gasLimit": FilecoinField, + "filecoin.method": FilecoinField, +}; + +export default { + fieldComponents, +}; From bd74dc7f18f92344ffadbe31c726421df027c879 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 24 Feb 2022 16:20:40 -0300 Subject: [PATCH 5/6] remove duplicated line --- src/renderer/drawers/OperationDetails/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/renderer/drawers/OperationDetails/index.js b/src/renderer/drawers/OperationDetails/index.js index 12af7521d6..6c8fe5f4ae 100644 --- a/src/renderer/drawers/OperationDetails/index.js +++ b/src/renderer/drawers/OperationDetails/index.js @@ -642,7 +642,6 @@ type OperationDetailsExtraProps = { const OperationDetailsExtra = ({ extra }: OperationDetailsExtraProps) => { return Object.entries(extra).map(([key, value]) => ( - return Object.entries(extra).map(([key, value]) => { if( typeof value == "object" || typeof value == "function") return null; return ( From 6689a6db59ee89c079c02b9555b0a62607c2c571 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 24 Feb 2022 16:23:02 -0300 Subject: [PATCH 6/6] fix error on line --- src/renderer/drawers/OperationDetails/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/renderer/drawers/OperationDetails/index.js b/src/renderer/drawers/OperationDetails/index.js index 6c8fe5f4ae..dee5a82453 100644 --- a/src/renderer/drawers/OperationDetails/index.js +++ b/src/renderer/drawers/OperationDetails/index.js @@ -641,9 +641,8 @@ type OperationDetailsExtraProps = { }; const OperationDetailsExtra = ({ extra }: OperationDetailsExtraProps) => { - return Object.entries(extra).map(([key, value]) => ( + return Object.entries(extra).map(([key, value]) => { if( typeof value == "object" || typeof value == "function") return null; - return ( @@ -654,7 +653,6 @@ const OperationDetailsExtra = ({ extra }: OperationDetailsExtraProps) => { ); - }); };