From 69c844f4c5ed97987181cd0e212cff56b1b1edfb Mon Sep 17 00:00:00 2001 From: Katty Barroso <51223655+kattylucy@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:02:31 +0100 Subject: [PATCH 1/2] Revert development env (#2555) --- centrifuge-app/.env-config/.env.development | 31 ++++++++++----------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/centrifuge-app/.env-config/.env.development b/centrifuge-app/.env-config/.env.development index 01b83d2086..5114861124 100644 --- a/centrifuge-app/.env-config/.env.development +++ b/centrifuge-app/.env-config/.env.development @@ -1,24 +1,21 @@ -REACT_APP_COLLATOR_WSS_URL=wss://fullnode-apps.demo.k-f.dev -REACT_APP_DEFAULT_UNLIST_POOLS=true -REACT_APP_FAUCET_URL=https://europe-central2-peak-vista-185616.cloudfunctions.net/faucet-api-demo +REACT_APP_COLLATOR_WSS_URL=wss://fullnode.development.cntrfg.com +REACT_APP_DEFAULT_UNLIST_POOLS=false +REACT_APP_FAUCET_URL=https://europe-central2-peak-vista-185616.cloudfunctions.net/faucet-api-dev REACT_APP_IPFS_GATEWAY=https://centrifuge.mypinata.cloud/ -REACT_APP_IS_DEMO=true -REACT_APP_ONBOARDING_API_URL=https://europe-central2-peak-vista-185616.cloudfunctions.net/onboarding-api-demo -REACT_APP_PINNING_API_URL=https://europe-central2-peak-vista-185616.cloudfunctions.net/pinning-api-demo +REACT_APP_IS_DEMO=false +REACT_APP_NETWORK=centrifuge +REACT_APP_ONBOARDING_API_URL=https://europe-central2-peak-vista-185616.cloudfunctions.net/onboarding-api-dev +REACT_APP_PINNING_API_URL=https://europe-central2-peak-vista-185616.cloudfunctions.net/pinning-api-dev REACT_APP_POOL_CREATION_TYPE=immediate -REACT_APP_RELAY_WSS_URL=wss://frag-moonbase-relay-rpc-ws.g.moonbase.moonbeam.network -REACT_APP_SUBQUERY_URL=https://api.subquery.network/sq/centrifuge/pools-demo-multichain -REACT_APP_SUBSCAN_URL= +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=https://centrifuge.subscan.io REACT_APP_TINLAKE_NETWORK=goerli REACT_APP_INFURA_KEY=8cd8e043ee8d4001b97a1c37e08fd9dd -REACT_APP_ALCHEMY_KEY=KNR-1LZhNqWOxZS2AN8AFeaiESBV10qZ +REACT_APP_ONFINALITY_KEY=0e1c049f-d876-4e77-a45f-b5afdf5739b2 REACT_APP_WHITELISTED_ACCOUNTS= -REACT_APP_NETWORK=centrifuge +REACT_APP_TINLAKE_SUBGRAPH_URL=https://api.goldsky.com/api/public/project_clhi43ef5g4rw49zwftsvd2ks/subgraphs/main/prod/gn REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-kovan-staging/latest.json -REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kALwmJutBq95s41U9fWnoApCUgvPqPGTh1GSmFnQh5f9fWo93 REACT_APP_WALLETCONNECT_ID=c32fa79350803519804a67fcab0b742a -REACT_APP_TINLAKE_SUBGRAPH_URL=https://api.goldsky.com/api/public/project_clhi43ef5g4rw49zwftsvd2ks/subgraphs/main/prod/gn -REACT_APP_TREASURY=kAJkmGxAd6iqX9JjWTdhXgCf2PL1TAphTRYrmEqzBrYhwbXAn -REACT_APP_PRIME_IPFS_HASH=QmQfcuHM3EGrtpjhitDwJsgie5THLPtRNzvk7N3uymgHGc -REACT_APP_ONFINALITY_KEY=0e1c049f-d876-4e77-a45f-b5afdf5739b2 -REACT_APP_TENDERLY_KEY=18aMTJlpNb1lElcYNkkunC \ No newline at end of file +REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kAJ27w29x7gHM75xajP2yXVLjVBaKmmUTxHwgRuCoAcWaoEiz +REACT_APP_TREASURY=kAJkmGxAd6iqX9JjWTdhXgCf2PL1TAphTRYrmEqzBrYhwbXAn \ No newline at end of file From 6f9b38b9c455268d6a515410bc34a11b5186d9e6 Mon Sep 17 00:00:00 2001 From: Onno Visser Date: Mon, 16 Dec 2024 13:36:40 +0100 Subject: [PATCH 2/2] Fix allowance check for Tinlake invest/redeem (#2556) --- .../components/InvestRedeem/InvestRedeemTinlakeProvider.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx index efb14be269..90d5a193b1 100644 --- a/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx +++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx @@ -131,8 +131,8 @@ export function InvestRedeemTinlakeProvider({ poolId, trancheId, children }: Pro ? 'invest' : null, needsToCollectBeforeOrder: !collectAmount.isZero(), - needsPoolCurrencyApproval: () => !!trancheInvestment?.poolCurrencyAllowance.isZero(), - needsTrancheTokenApproval: () => !!trancheInvestment?.tokenAllowance.isZero(), + needsPoolCurrencyApproval: (amount) => Dec(amount).gt(trancheInvestment?.poolCurrencyAllowance ?? 0), + needsTrancheTokenApproval: (amount) => Dec(amount).gt(trancheInvestment?.tokenAllowance ?? 0), canChangeOrder: true, canCancelOrder: true, pendingAction,