Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging #259

Merged
merged 48 commits into from
Feb 1, 2024
Merged
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
0e20eae
move all wallet logic to a context
maxaleks Sep 28, 2023
07209d6
integrate tron
maxaleks Oct 9, 2023
4099562
set pool via params in the url
maxaleks Oct 10, 2023
a7589ce
Merge branch 'tron' into staging
maxaleks Oct 11, 2023
8affb07
remove duplicate data with address prefixes
maxaleks Oct 12, 2023
097296d
load translations in another way
maxaleks Oct 16, 2023
30988af
show all wallets (tron + evm) when restoring account
maxaleks Oct 17, 2023
caa365f
hot fix for token list
maxaleks Oct 17, 2023
391f466
fix message signing
maxaleks Oct 23, 2023
7a54288
adds license files
r0wdy1 Oct 23, 2023
56e6591
optional proxy and different params
maxaleks Oct 23, 2023
324f754
Update README.md
maxaleks Oct 23, 2023
3a7b284
add Chinese and Russian languages
maxaleks Oct 23, 2023
d873c02
upgrade version
maxaleks Oct 23, 2023
2689f46
Update README.md
maxaleks Oct 23, 2023
6b55a52
Added CONTRIBUTING.md file; Updated README.md file
Oct 25, 2023
d7aeaf8
delete unnecessary code from netlify config
maxaleks Oct 26, 2023
bf94537
fix country restrictions
maxaleks Oct 26, 2023
fc4441b
remove country from restriction message
maxaleks Oct 30, 2023
ebb7e28
show restriction message in Chinese
maxaleks Nov 1, 2023
c27f091
rename USDC to USDC.e
maxaleks Nov 2, 2023
da735bf
split the multicall into several
maxaleks Nov 2, 2023
9a189b4
add pool on nile
maxaleks Nov 2, 2023
ac8c726
fix the interaction with Tron
maxaleks Nov 2, 2023
d42b22d
upgrade lib
maxaleks Nov 3, 2023
059082b
fix tron wallet connection
maxaleks Nov 13, 2023
c022445
Update manifest.json
maxaleks Nov 14, 2023
bced457
add links for tronlink download
maxaleks Nov 16, 2023
18d3355
remove steps with secret phrase
maxaleks Nov 17, 2023
db99b1a
change text
maxaleks Nov 17, 2023
222b5a5
upgrade lib
maxaleks Nov 17, 2023
cf2e74f
remove pool on shasta
maxaleks Nov 19, 2023
d14fe40
remove network shasta
maxaleks Nov 19, 2023
59fe628
fix ru locale
maxaleks Nov 21, 2023
586ddfa
strict approval amount
maxaleks Nov 29, 2023
eb7d955
upgrade lib (fix address format in history)
maxaleks Nov 29, 2023
7a6b182
disable 2 pools on staging
maxaleks Dec 11, 2023
984c1bb
add new tron pool
maxaleks Dec 20, 2023
faf80a9
fix lib init
maxaleks Dec 20, 2023
7b4ed7d
change pool address
maxaleks Dec 27, 2023
4ff85d2
fix error check
maxaleks Dec 27, 2023
7a213c1
change pool address
maxaleks Dec 28, 2023
2f7b029
change pool address
maxaleks Dec 28, 2023
9e3baf7
Feature/external links (#257)
r0wdy1 Jan 29, 2024
2911b31
Merge branch 'main' into staging
r0wdy1 Feb 1, 2024
917d203
bump client lib, update version
r0wdy1 Feb 1, 2024
b7efe59
hot fix
r0wdy1 Feb 1, 2024
50b659e
Merge branch 'main' into staging
r0wdy1 Feb 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/pages/Payment/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ const Payment = ({ pool }) => {
const { supportId } = useContext(SupportIdContext);
const history = useHistory();
const params = useParams();
const addressPrefix = params.address.split(':')[0];
const pool = Object.values(pools).find(pool => pool.addressPrefix === addressPrefix);
if (!pool.paymentContractAddress) {
history.push('/');
}
const currency = ['USDC.e', 'USDC', 'BOB'].includes(pool.tokenSymbol) ? 'USD' : pool.tokenSymbol;

const { address: account } = useContext(WalletContext);
const [displayedAmount, setDisplayedAmount] = useState('');
Expand Down