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

TW-1579: Market page / Exolix Top-up #1233

Merged
merged 29 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4270b7d
market page / remove withdraw tab
lendihop Nov 28, 2024
665bfee
fix some minor bugs
lendihop Nov 28, 2024
8283415
update icon
lendihop Nov 29, 2024
41f13fb
first step basic layout
lendihop Dec 2, 2024
e388988
order creation step layout
lendihop Dec 3, 2024
483bbe4
fix input button overlapping value
lendihop Dec 3, 2024
36c472a
Merge branch 'refs/heads/development-2' into TW-1579-market-page-exol…
lendihop Dec 6, 2024
69fd738
resolve merge conflicts
lendihop Dec 6, 2024
b90e575
show send/get tokens
lendihop Dec 7, 2024
9c36515
layout effect
lendihop Dec 7, 2024
08726bb
fade transition
lendihop Dec 9, 2024
bc7531f
Merge branch 'refs/heads/development-2' into TW-1579-market-page-exol…
lendihop Dec 9, 2024
d192fa8
some renaming
lendihop Dec 9, 2024
2fcbe08
order creation step
lendihop Dec 11, 2024
e90a922
deposit step layout
lendihop Dec 11, 2024
91a4f35
deposit step finished
lendihop Dec 12, 2024
b6a5a23
status tracking screens
lendihop Dec 13, 2024
08f2031
some fixes
lendihop Dec 13, 2024
5ea93df
move networksMap to backend
lendihop Dec 13, 2024
6649241
applied changes according to review comments
lendihop Dec 17, 2024
8fa29b7
rm unused export
lendihop Dec 17, 2024
fa65c56
fix review comment
lendihop Dec 17, 2024
50348e3
show depositExtraId + some minor fixes
lendihop Dec 20, 2024
852efa9
fix import
lendihop Dec 20, 2024
59584c0
fix typo
lendihop Dec 20, 2024
320488f
apply review changes
lendihop Dec 20, 2024
412d5f2
Merge branch 'refs/heads/development-2' into TW-1579-market-page-exol…
lendihop Dec 30, 2024
7efe4b8
fix after-merge issues
lendihop Dec 30, 2024
9ea7e64
fix import
lendihop Dec 30, 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
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
"@types/react-dom": "18.0.6",
"@types/react-image-fallback": "^8.0.3",
"@types/react-modal": "3.13.1",
"@types/react-text-mask": "^5.4.11",
"@types/react-transition-group": "4.4.5",
"@types/resolve": "^1.20.2",
"@types/scryptsy": "^2.0.0",
Expand Down Expand Up @@ -177,7 +176,6 @@
"react-modal": "^3",
"react-qr-svg": "2.2.2",
"react-redux": "^8.0.2",
"react-text-mask": "^5.5.0",
"react-transition-group": "4.4.5",
"redux-observable": "^2.0.0",
"redux-persist": "^6.0.0",
Expand Down
32 changes: 5 additions & 27 deletions public/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1919,19 +1919,8 @@
"newTopUp": {
"message": "Neue Aufladung"
},
"exchangeDetails": {
"message": "Austauschdetails eingeben"
},
"exchangeDetailsDescription": {
"message": "Laden Sie Ihr TEZ-Guthaben oder USDT-Tezos-Guthaben sofort mit $number$ Kryptowährungen auf",
"placeholders": {
"number": {
"content": "$1"
}
}
},
"privacyAndPolicyLinks": {
"message": "Indem Sie auf Aufladen klicken, stimmen Sie den \n$termsOfUse$ und $privacyPolicy$ zu",
"message": "Indem Sie auf Aufladen klicken, stimmen Sie den $termsOfUse$ und $privacyPolicy$ zu",
"placeholders": {
"termsOfUse": {
"content": "$1"
Expand All @@ -1941,14 +1930,6 @@
}
}
},
"depositAddressText": {
"message": "Zahlen Sie auf $depositAddress$ address:",
"placeholders": {
"depositAddress": {
"content": "$1"
}
}
},
"support": {
"message": "Support"
},
Expand All @@ -1962,19 +1943,19 @@
"message": "Mit einer Transaktion senden"
},
"youGet": {
"message": "Sie erhalten:"
"message": "Sie erhalten"
},
"fixedRate": {
"message": "Festpreis:"
},
"transactionId": {
"message": "Transaktions-ID:"
"message": "Transaktions-ID"
},
"atomDepositMemo": {
"message": "Atom Deposit Memo"
},
"recipientAddress": {
"message": "Empfängeradresse:"
"message": "Empfängeradresse"
},
"recipientXtzAddress": {
"message": "Empfänger-XTZ-Adresse:"
Expand All @@ -1986,10 +1967,7 @@
"message": "Sie senden:"
},
"sendTime": {
"message": "Sendezeit:"
},
"completedDescription": {
"message": "Bitte überprüfen Sie Ihr Guthaben in Ihrer Wallet.\nDer Austauschvorgang ist abgeschlossen."
"message": "Sendezeit"
},
"completed": {
"message": "Abgeschlossen"
Expand Down
122 changes: 75 additions & 47 deletions public/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,12 @@
"cancel": {
"message": "Cancel"
},
"cancelOrder": {
"message": "Cancel Order"
},
"newOrder": {
"message": "New Order"
},
"save": {
"message": "Save"
},
Expand Down Expand Up @@ -1101,7 +1107,7 @@
"message": "Privacy Policy"
},
"termsOfUse": {
"message": "Terms of Use"
"message": "Terms of Usage"
},
"knowledgeBase": {
"message": "Knowledge Base"
Expand Down Expand Up @@ -1631,6 +1637,9 @@
"recipient": {
"message": "Recipient"
},
"transactionHash": {
"message": "Transaction hash"
},
"tokensRecepientInputDescription": {
"message": "Address to send $assetSymbol$ funds to.",
"placeholders": {
Expand Down Expand Up @@ -2997,9 +3006,6 @@
"buyButton": {
"message": "Buy"
},
"withdraw": {
"message": "Withdraw"
},
"toCard": {
"message": "To card"
},
Expand Down Expand Up @@ -3058,24 +3064,27 @@
"buyWithRampDescription": {
"message": "Buy TEZ using Visa, Mastercard, and all major debit and credit cards. Ramp is available in 160+ countries and territories."
},
"sellWithAliceBob": {
"message": "Sell TEZ with Alice-Bob"
},
"sellWithAliceBobDescription": {
"message": "Fast and cost-effective exchange of TEZ."
},
"selectPaymentProvider": {
"message": "Select payment provider"
},
"pleaseSelectPaymentProvider": {
"message": "Please select payment provider"
},
"topUpBuy": {
"message": "Buy"
},
"buyWithCard": {
"message": "Buy with Debit/Credit Card"
},
"cryptoExchange": {
"message": "Crypto Exchange"
},
"cryptoExchangeDescription": {
"message": "Top-up balance instantly with best rate and without registration"
},
"debitCreditCard": {
"message": "Debit & Credit Card"
},
"debitCreditCardDescription": {
"message": "Simple crypto purchase with fiat currencies in a few steps"
},
"sellTez": {
"message": "Sell TEZ"
},
Expand Down Expand Up @@ -3135,9 +3144,6 @@
"bestPrice": {
"message": "Best price"
},
"withdrawDescription": {
"message": "Temple integrated third-party solutions to sell TEZ. Choose a provider, follow guides, \n get fiat to your Debit/Credit card"
},
"topUpCrypto": {
"message": "Crypto"
},
Expand All @@ -3156,16 +3162,14 @@
"newTopUp": {
"message": "New Top Up"
},
"exchange": {
"message": "Exchange"
},
"exchangeDetails": {
"message": "Enter exchange details"
"message": "Exchange details"
},
"exchangeDetailsDescription": {
"message": "Top up your TEZ or USDT Tezos balance instantly with $number$ cryptocurrencies",
"placeholders": {
"number": {
"content": "$1"
}
}
"message": "Enter token amount and top up your balance instantly with best rate and without registration"
},
"sellTezDetails": {
"message": "Sell TEZ details"
Expand All @@ -3188,7 +3192,7 @@
}
},
"privacyAndPolicyLinks": {
"message": "By clicking $buttonContent$ you agree with \n$termsOfUse$ and $privacyPolicy$",
"message": "By pressing $buttonContent$ you are agree with the $termsOfUse$ and $privacyPolicy$",
"placeholders": {
"buttonContent": {
"content": "$1"
Expand All @@ -3201,40 +3205,53 @@
}
}
},
"depositAddressText": {
"message": "Deposit $depositAddress$ address:",
"placeholders": {
"depositAddress": {
"content": "$1"
}
}
"depositAddress": {
"message": "Deposit address"
},
"support": {
"message": "Support"
},
"exolixSupport": {
"message": "Exolix Support"
},
"deposit": {
"message": "Deposit"
},
"depositDescription": {
"message": "Send the funds to the address below. As soon as the deposit is received, the exchange process will begin automatically"
"message": "Send tokens to the deposit address, and the exchange will begin automatically once the deposit is confirmed"
},
"depositDisclaimer": {
"message": "Send the exact amount of crypto to the deposit address. Otherwise the transaction will be failed and you will need to contact Exolix support."
},
"convertation": {
"message": "Convertation"
},
"convertationDescription": {
"message": "Please wait, the convertation process usually takes between 15 minutes and 2 hours"
},
"sendByOneTransaction": {
"message": "Send by one transaction"
},
"youGet": {
"message": "You get:"
"message": "You get"
},
"youReceived": {
"message": "You received"
},
"youSent": {
"message": "You sent"
},
"fixedRate": {
"message": "Fixed rate:"
},
"transactionId": {
"message": "Transaction ID:"
"message": "Transaction ID"
},
"atomDepositMemo": {
"message": "Atom Deposit Memo"
},
"recipientAddress": {
"message": "Recipient address:"
"message": "Recipient address"
},
"recipientXtzAddress": {
"message": "Recipient XTZ address:"
Expand All @@ -3255,10 +3272,10 @@
"message": "You sell:"
},
"sendTime": {
"message": "Send time:"
"message": "Send time"
},
"completedDescription": {
"message": "Please, check your funds in your wallet.\nThe exchange process is completed."
"message": "Please check your balance - the exchange has been finished"
},
"completed": {
"message": "Completed"
Expand Down Expand Up @@ -3293,6 +3310,23 @@
"expiredStatusDescription": {
"message": "The order was not paid for the time allocated."
},
"expiresIn": {
"message": "Expires in"
},
"orderExpired": {
"message": "Your order has expired"
},
"orderExpiredDescription": {
"message": "Retry the top-up by creating a new exchange order. If the funds have already been sent, wait for the deposit to be confirmed."
},
"sendInOneTransaction": {
"message": "Send in one transaction to the $networkName$ deposit address",
"placeholders": {
"networkName": {
"content": "$1"
}
}
},
"canceledStatusDescription": {
"message": "The order was canceled."
},
Expand Down Expand Up @@ -3337,11 +3371,8 @@
"min": {
"message": "Min:"
},
"exolixWarningTopUpServiceMessage": {
"message": "The token exchange feature is provided by Exolix as third party provider. Temple wallet is not responsible for the work of third-party services."
},
"warningTopUpServiceMessage": {
"message": "The token exchange feature is provided by a third party. The Temple Wallet is not responsible for the work of third-party services."
"message": "Token exchange is powered by a third-party, and Temple Wallet is not responsible for work of third-party services."
},
"selectTokensToSwap": {
"message": "Please, select tokens to swap"
Expand Down Expand Up @@ -3385,12 +3416,6 @@
"serviceIsUnavailable": {
"message": "Sorry, service is temporarily unavailable. Try again later!"
},
"buyWithChainBits": {
"message": "Buy with ChainBits"
},
"buyWithChainBitsDescription": {
"message": "Buying Crypto Was Never This Easy"
},
"news": {
"message": "News"
},
Expand Down Expand Up @@ -3766,5 +3791,8 @@
},
"disabledInTestnetMode": {
"message": "Disabled in Testnet Mode"
},
"marketPageDisclaimer": {
"message": "Temple integrated third-party solutions to buy or exchange crypto."
}
}
Loading
Loading