Merge Integration #759
Merged
Merge Integration #759
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* update ui kit fetch * update ui kit
* update ui kit next * clean deps * refactor mode store * add bsc address and rename * rename to BSC * add dropdown option for evm blockchain * network validation * clean code * wip fee estimations * filter tokens by chain id * Add New Banner * Revamp claim * Add BSC Bridge Buildnet Contract * update iconsNetwork enum * filter tokens by chain id * fix deps * add new bsc bridge sc address --------- Co-authored-by: Phoebe Lartisant <phoebelartisant@proton.me>
* WIP revamp link to explorers * refactor miniLinkToExplo to be shown in claim, DAO and history * clean up * rename linkToExplorer components * improve getExplorerUrl fn * clean * remove unecessary fn * rename variable * review changes
* add onClick claim on wrong network flow * improve function call + add switchNetwork rejection + i18n * improve function syntax * move isIncompatibleChain variable * fix getEvmIconNetwork * remove comment * improve hanldeClaimSyntax Co-authored-by: Nathan Seva <thykof@protonmail.ch> --------- Co-authored-by: Nathan Seva <thykof@protonmail.ch>
* Update call sc address based on selected chain * update more contract address * Update history page * improve bridgeCOntractAddr selection syntax * fix build * improve claim page operation component sizing * small massaNetwork display refactor
* update FT icons * update bridge address * clean code * update ui kit * fix: icon of massa token bridged * fix: use correct sepolia icon * Rename BNBSvg to BSCSvg * clean label evmChainAndNetwork * change round of amount in success screen --------- Co-authored-by: Phoebe Lartisant <phoebelartisant@proton.me>
* initial QA fixes * update ui-kit and enable usdt icon * update ui-kit * revert claim reject styling improvement * change wrong network label * set selectedEvm in storage and init selectedEvm with stored value on app render * fix min confirmations * refresh balance when mint is successful * fix wrong contract selection in claim page * remove comment * add try catch * revert bdb1506 and improve solution * Revert "revert bdb1506 and improve solution" This reverts commit 3bb8b3f. * no enum for trans key * class name indentation * rename BLOCKCHAIN_TO_CHAIN_IDS to SUPPORTED_BLOCKCHAIN_TO_CHAIN_IDS * fixup no const or enum in trans key * enum MassaNetworkType for mode store * use trans key with currentMassaNetwork * clean enum Blockchain * change WrongChainProps * change ChainStatusProps: isMassaChain instead of blockchain * rollback useConnectedEvmChain and fix useClaim * useClaim: use chain of the operation * use connected chain for useClaim getMinConfirmations * update contracts * use chain id to supported... instead of selectedEvm * fix desync between claims * fix warning-no-eth symbol * replace unsupported network * fix buildnet faq * add link exports in const --------- Co-authored-by: Nathan Seva <thykof@protonmail.ch>
* Add useServiceFeeHook * (WIP) move cnd improve calculateAmountReceived to utils + create tests + revamp hook * (WIP) move and improve calculateAmountReceived to utils + create tests + revamp hook * upgrade to getAmountReceived fn * add serviceFeeTDoolTip * rename service fee hook * add inputAmount and outputAmount in operationStore * add output calculation mechanism in frontend * improve UX when chaning networks * fmt * fmt tests * rename and improve tests * clean * add service fee styling * update fe designs * clean test * clean * Revert "fix warning-no-eth symbol" This reverts commit 4a2fb50. * zsh:1: command not found: q * Revert "fix buildnet faq" This reverts commit 3179117. * rebase and clean * clean * improve warnign no eth * update ui-kit * remove whitesoace
* refactor claim page to prepare service fee integration * clean * remove hook
This reverts commit 0257727.
* add service fees on claim page * add success amount * update usehandleBurnRedeem hook * clean utils * move logic to initClaim.tsx * clean * rename amount to receive * add outputAmount check in succesClaim * refacto getAmountToReceive and edit tests * refactor getAmountToreceive * remove undefined from success claim props * add comments * refactor input and output * add outputAmount to success page * clean bridgeRedeemLayout * fix changeAmount fn * Revert "fix changeAmount fn" This reverts commit 13c2648. * clean changeAmount fn * set inputs undefined * exp => inputAmount to bigint * update ui kit with npm link, PR #459 * fix retrievePercent * fix Amount * fix tests * rename variable * rename var + fix component * fix claim page wwhen failing to parse 1,000 to bigint * remove comment * prevent crashing from parsing a string with , seperator * seperate send from received * refactor getAmountReceived() * refactor getAmountReceived() p2 * clean claim page * rename amount in BridgeRedeemLayout.tsx * compare struct equal and fix test * rename _outputAmount --------- Co-authored-by: Nathan Seva <thykof@protonmail.ch>
* add confirmation layout * fmt * jsx in return statement Co-authored-by: Nathan Seva <thykof@protonmail.ch> * Revert "jsx in return statement" This reverts commit d06a80a. * rename token balance * move stepsEnum * clean --------- Co-authored-by: Nathan Seva <thykof@protonmail.ch>
* add front skeleton * add OperationDirection component * add operation input * add WIP OperationFees * add operation output * add OperationTime * add serviceFee tooltip * add imports in confirmation layout * improve FeeEstimation syntax * move estimated amount component * rename useFeeEstimation * update imports * create MassaFeeEstimation * fix infinite burn * useCallback in useEvmFeeEstimation * fmt * update FeeEstimation component * improve validation * update useMasFeeEstimation * update FeeEstimation render logic * add fees to confirmation page * fmt * use formatAmount functions * prevent silent fail of useHandleBurnRedeem function * fix build * improve useEffect * no useState CTA * remove async function * fmt * fix build * fix test * calculate fees on account change * fmt * use minimal fees in useBurn.ts * fmt
* case InputAmount component * create InputHead component * refactor DAOHead.tsx * refactor evm and massa headers * refactor index layout * add select as props * fmt
* claim page: refetch output amount * fix refresh automatically claim page on mode change * improve amount display * add refetch check * fix build * add sugar syntax --------- Co-authored-by: Phoebe Lartisant <phoebelartisant@proton.me>
* style input * revamp fetch usdc price * fix dusa price estimate * fmt * remove unecessary warns * use params in custom hook again + return undefined * improve-styling * update imports * remove try catch --------- Co-authored-by: Pierre Seznec <petterseznec@gmail.com>
* fix service fees display on bridge mode * new logic for setting service fees on bridge
* revamp servuce fees display * use MASSA TOKEN const * fix test
* clean code * fix getServiceFeeAmount * history: preview format
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
Leo-Besancon
approved these changes
Jul 16, 2024
pivilartisant
approved these changes
Jul 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.