Skip to content

Commit

Permalink
Implement New Vortex UI (#66)
Browse files Browse the repository at this point in the history
* implement basic styles of navigation and swap

* add Connect Wallet button

* implement PoolListModals and buttons

* add wallet icon

* implement collapse chevron

* implement desktop UI

* add basic form validation

* improve modal

* fix bugs and clean code

* implement mobile responsiveness and fix bugs

* remove console log

* improve code readability

* Fix prop errors

* Amend merge

* import main .css to new index component

* Move css import to app.tsx

* add select chain option for ChainName component

* improve code readability

* fix import

* adjust useGetIcon to return current chain token icon

* fix useGetIcon hook default

* remove eurc

* use useGetIcon for PoolList tokens

* show fees in $

* add logic for disabling submit button

* fix FeeCollapse currencies

* update error handling

* Progress screen 

* add progress screen

* add beforeunload confirmation prompt

* Flow continuable (#70)

* Use of pen ephemeral account, trigger transfer when tokens received

* Phase 6b (#44)

* Execute Nabla after SEP-24

* Some fixes

* Fix `yarn test` not working
by importing a preset that enhances transpiling vite code

* Fix errors: useQuery result must not be undefined

* Update min offramp amount for nTokens

* Fix typo

---------

Co-authored-by: Marcel Ebert <mail@marcel-ebert.de>

* use pen ephemeral address in performSwap

* Refactor wagmi config

* Add contract abis

* Implement swap with squid router

* wip

* Refactor squidrouter service

* Small refactoring

* Use swap in Inputkeys

* Fix transaction status issues

* cleanup old prototype logic

* wip. testing integration of squidrouter

* Make USDC the default selection

* Delete duplicate /contracts/Erc20.ts

* format, remove abi  duplicate

* testing ephemeral funding

* Add logic to fund ephemeral account on Pendulum

* Change USDC ERC20 address

* Add funding account phrase

* Fix signing transaction to fund ephemeral acc

* trigger funding of eph. account after swap, fix deposit event listener

* wip. testing

* Fix lint errors

* Use USDC instead of USDC.e

* Increase funding account

* Add quickfix with apiplus

* Use public horizon in signing service

* Fix errors

* Remove unused wallet components

* Change slippageBasisPoints from 20 to 30

* crop input box for mobile

* cleanup pendulum ephemeral

* Fix styling for mobile

* Remove media query to avoid conflicts

* remove token dust

* fix for clean pen ephemeral

* use new integrator id and plus squid route

* use getROuteApiPlus function

* Remove message about minimum EURC amount

* Change button for anchor to a element

* attempt to transfer all tokens regardless of balance

* log ephemeral account on offramp

* log ephemeral account after sep is completed

* WIP initial refactoring

* integrating logic into new UI

* improving data flow, recover pendulum ephemeral

* mock sep6, restore pen ephemeral from seed

* recovering from squidrouter intermediate steps

* testing recovery in squidrouter process, funding account

* nabla, stellar operations and redeem modifications for recoverability

* add sep24 again

* remove example transaction request data

* recover stellar keys after sep10, save stellar ephemeral keys

* fix, store only secret for stellar keys

* remove extra logs

* start sep24 second waiting loop as soon as first is initiated

* remove unused states

* reorganize recovery params restore

* Cleanup continuation flow

* Try to fix dependencies

* Fix inconsistent versions

* Revert package.json and yarn.lock

* Implement change requests

* Fix bugs in offramping flow

* Implement change requests

* Remove metamask base code

---------

Co-authored-by: Torsten Stüber <15174476+TorstenStueber@users.noreply.github.com>
Co-authored-by: Marcel Ebert <mail@marcel-ebert.de>
Co-authored-by: bogdanS98 <bogdan.sandu13@gmail.com>
Co-authored-by: Kacper Szarkiewicz <szarkiewiczmail@gmail.com>
Co-authored-by: Kacper Szarkiewicz <43585069+Sharqiewicz@users.noreply.github.com>

---------

Co-authored-by: Marcel Ebert <mail@marcel-ebert.de>
Co-authored-by: Gianfranco <g.tasteri@gmail.com>
Co-authored-by: gianfra-t <96739519+gianfra-t@users.noreply.github.com>
Co-authored-by: Torsten Stüber <15174476+TorstenStueber@users.noreply.github.com>
Co-authored-by: bogdanS98 <bogdan.sandu13@gmail.com>
  • Loading branch information
6 people authored Jul 31, 2024
1 parent 8894235 commit f34ec0d
Show file tree
Hide file tree
Showing 86 changed files with 3,046 additions and 3,583 deletions.
387 changes: 13 additions & 374 deletions App.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>PendulumPay</title>
<title>Vortex</title>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,wght@0,400;0,600;0,700;1,400&family=Outfit:wght@400;600&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Red+Hat+Display:ital,wght@0,300..900;1,300..900&display=swap"
rel="stylesheet"
/>
</head>

<body style="background-color: #fff">
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
"postinstall": "husky install"
},
"dependencies": {
"@chainsafe/metamask-polkadot-adapter": "^0.6.0",
"@chainsafe/metamask-polkadot-types": "^0.7.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
Expand Down Expand Up @@ -53,6 +51,7 @@
"bn.js": "^5.2.1",
"buffer": "^6.0.3",
"daisyui": "^4.11.1",
"framer-motion": "^11.2.14",
"postcss": "^8.4.38",
"preact": "^10.12.1",
"react-daisyui": "^5.0.0",
Expand Down Expand Up @@ -82,11 +81,11 @@
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/preact": "^3.2.3",
"@testing-library/preact-hooks": "^1.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/big.js": "^6",
"@types/bn.js": "^5",
"@types/jest": "^29.4.0",
"@types/node": "^18.14.1",
"@types/react": "^18.0.28",
"@types/testing-library__jest-dom": "^5.14.5",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
Expand Down
8 changes: 8 additions & 0 deletions postcss.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
plugins: {
'postcss-import': {},
'tailwindcss/nesting': {},
tailwindcss: {},
autoprefixer: {},
},
};
6 changes: 0 additions & 6 deletions postcss.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion signer-service/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PORT=3000
RATE_LIMIT_WINDOW_MINUTES=15
RATE_LIMIT_MAX_REQUESTS=100
RATE_LIMIT_NUMBER_OF_PROXIES=1
FUNDING_SECRET=SCVJD7BHU5LNFXNIDC7E226HISKUOZUEPJWLA2YU2GNBFMP5PYF2TQBH
FUNDING_SECRET=SAKRXYB5EVEQFGQBYCCRYTUVX3U35AX3USQQD3J32EHUTSYQHHSB7GSF
Loading

0 comments on commit f34ec0d

Please sign in to comment.