From 251c34fa29bb24327112503c28580ae812c426d4 Mon Sep 17 00:00:00 2001 From: JP Angelle Date: Mon, 11 Sep 2023 15:13:05 -0500 Subject: [PATCH 1/2] fix --- centrifuge-app/.env-config/.env.development | 2 +- .../src/components/InvestRedeem/InvestRedeem.tsx | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/centrifuge-app/.env-config/.env.development b/centrifuge-app/.env-config/.env.development index 504841d09b..0841b4029d 100644 --- a/centrifuge-app/.env-config/.env.development +++ b/centrifuge-app/.env-config/.env.development @@ -11,7 +11,7 @@ REACT_APP_POOL_CREATION_TYPE=immediate REACT_APP_RELAY_WSS_URL=wss://fullnode-relay.development.cntrfg.com REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-development REACT_APP_SUBSCAN_URL= -REACT_APP_TINLAKE_NETWORK=goerli +REACT_APP_TINLAKE_NETWORK=mainnet REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550 REACT_APP_WHITELISTED_ACCOUNTS= REACT_APP_TINLAKE_SUBGRAPH_URL=https://graph.centrifuge.io/tinlake diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx index caf1a0e0ac..162f0f923c 100644 --- a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx +++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx @@ -532,9 +532,14 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest' )} + `` ) : changeOrderFormShown ? ( - renderInput(() => setChangeOrderFormShown(false)) + state.needsPoolCurrencyApproval ? ( + renderInput(onCancel, { onClick: actions.approvePoolCurrency, loading: isApproving }) + ) : ( + renderInput(onCancel) + ) ) : hasPendingOrder ? ( ) : changeOrderFormShown ? ( - renderInput(() => setChangeOrderFormShown(false)) + state.needsTrancheTokenApproval ? ( + renderInput(onCancel, { onClick: actions.approveTrancheToken, loading: isApproving }) + ) : ( + renderInput(onCancel) + ) ) : hasPendingOrder ? ( Date: Mon, 18 Sep 2023 10:57:30 -0500 Subject: [PATCH 2/2] typo and revert env --- centrifuge-app/.env-config/.env.development | 2 +- centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/centrifuge-app/.env-config/.env.development b/centrifuge-app/.env-config/.env.development index 0841b4029d..504841d09b 100644 --- a/centrifuge-app/.env-config/.env.development +++ b/centrifuge-app/.env-config/.env.development @@ -11,7 +11,7 @@ REACT_APP_POOL_CREATION_TYPE=immediate REACT_APP_RELAY_WSS_URL=wss://fullnode-relay.development.cntrfg.com REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-development REACT_APP_SUBSCAN_URL= -REACT_APP_TINLAKE_NETWORK=mainnet +REACT_APP_TINLAKE_NETWORK=goerli REACT_APP_INFURA_KEY=bf808e7d3d924fbeb74672d9341d0550 REACT_APP_WHITELISTED_ACCOUNTS= REACT_APP_TINLAKE_SUBGRAPH_URL=https://graph.centrifuge.io/tinlake diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx index 162f0f923c..c69c072b6d 100644 --- a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx +++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx @@ -532,7 +532,6 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest' )} - `` ) : changeOrderFormShown ? ( state.needsPoolCurrencyApproval ? (