Skip to content

Use swapkit pluginId instead of thorchainda #5269

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.

Sign up for GitHub

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

Open
Jon-edge wants to merge 2 commits into
base: develop
Choose a base branch
from
+13 −8
Open

Use swapkit pluginId instead of thorchainda #5269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b769f4
Use `swapkit` pluginId instead of `thorchainda`
Jon-edge Sep 20, 2024
10dd5d8
WIP
Jon-edge Sep 20, 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: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"edge-currency-accountbased": "^4.24.6",
"edge-currency-monero": "^1.3.1",
"edge-currency-plugins": "^3.3.2",
"edge-exchange-plugins": "^2.7.5",
"edge-exchange-plugins": "https://github.com/EdgeApp/edge-exchange-plugins#31e4232",
"edge-info-server": "^2.7.0",
"edge-login-ui-rn": "^3.22.1",
"ethers": "^5.7.2",
Expand Down
2 changes: 1 addition & 1 deletion src/actions/CategoriesActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,9 @@ export const pluginIdIcons: Record<string, string> = {
rango: EDGE_CONTENT_SERVER_URI + '/rango.png',
sideshift: EDGE_CONTENT_SERVER_URI + '/sideshift-logo.png',
simplex: EDGE_CONTENT_SERVER_URI + '/simplex.png',
swapkit: EDGE_CONTENT_SERVER_URI + '/thorchain.png',
swapuz: EDGE_CONTENT_SERVER_URI + '/swapuz.png',
thorchain: EDGE_CONTENT_SERVER_URI + '/thorchain.png',
thorchainda: EDGE_CONTENT_SERVER_URI + '/thorchain.png',
tronResources: EDGE_CONTENT_SERVER_URI + '/TRON/TRON.png',
velodrome: EDGE_CONTENT_SERVER_URI + '/velodrome.png',
xrpdex: EDGE_CONTENT_SERVER_URI + '/xrpdex.png'
Expand Down
6 changes: 6 additions & 0 deletions src/components/scenes/SwapProcessingScene.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ export function SwapProcessingScene(props: Props) {
const toDenomination = useDisplayDenom(swapRequest.toWallet.currencyConfig, swapRequest.toTokenId)

const doWork = async (): Promise<EdgeSwapQuote[]> => {
console.debug('🚀 - doWork - swapRequest:', swapRequest)
console.debug('🚀 - doWork - swapRequestOptions:', swapRequestOptions)
const quotes = await account.fetchSwapQuotes(swapRequest, swapRequestOptions)

console.debug('🚀 - doWork - quotes:', quotes)

return quotes
}

Expand Down Expand Up @@ -144,6 +149,7 @@ function processSwapQuoteError({
}

const currencyError = asMaybeSwapCurrencyError(error)
console.debug(currencyError)
if (currencyError != null) {
const fromCurrencyCode = getCurrencyCode(swapRequest.fromWallet, swapRequest.fromTokenId)
const toCurrencyCode = getCurrencyCode(swapRequest.toWallet, swapRequest.toTokenId)
Expand Down
2 changes: 1 addition & 1 deletion src/components/services/ContactsLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ const merchantPartners = [
recordID: ''
},
{
givenName: 'Thorchain DEX Aggregator',
givenName: 'Swap Kit',
hasThumbnail: true,
thumbnailPath: 'thorchain.png',
emailAddresses: [],
Expand Down
2 changes: 1 addition & 1 deletion src/util/corePlugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const swapPlugins = {
rango: ENV.RANGO_INIT,
spookySwap: false,
thorchain: ENV.THORCHAIN_INIT,
thorchainda: ENV.THORCHAIN_INIT,
swapkit: ENV.THORCHAIN_INIT,
tombSwap: ENV.TOMB_SWAP_INIT,
velodrome: true,
xrpdex: ENV.XRPDEX_INIT,
Expand Down
7 changes: 3 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9213,10 +9213,9 @@ edge-currency-plugins@^3.3.2:
wifgrs "^2.0.6"
ws "^7.4.6"

edge-exchange-plugins@^2.7.5:
version "2.7.5"
resolved "https://registry.yarnpkg.com/edge-exchange-plugins/-/edge-exchange-plugins-2.7.5.tgz#adcc53233aff46bcb6dd6df54aa642e3b72b2933"
integrity sha512-nvo2rwA6KSs4dzWd3HblupxSDC2ST/tnyhoRqLO6+IKM3n7sE7b4/UW6taquW57yHqD9+yeL6UwkJwW9gUrGtQ==
"edge-exchange-plugins@https://github.com/EdgeApp/edge-exchange-plugins#31e4232":
version "2.8.0"
resolved "https://github.com/EdgeApp/edge-exchange-plugins#31e423215ff08491459ef576ac837e1b5e92882a"
dependencies:
"@cosmjs/encoding" "^0.32.2"
biggystring "^4.1.3"
Expand Down