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

Add Maya Protocol #5268

Merged
merged 2 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

## Unreleased

- added: Add Maya Protocol
- added: Re-enable Piratechain on iOS
- added: Battery Saver warning message for Android
- added: Buy conversion tracking for Moonpay
- added: Error tracking for failure to report conversions to referral server
- changed: Remove whitespaces from custom token contract address input
- changed: Use unique ENV configs for thorchain and thorchainda swap plugins
- fixed: Correctly tag `tokenApproval` `actionType` in `getTxActionDisplayInfo`
- fixed: AddressTile2 touchable area states
- fixed: Cases where it was possible to create duplicate custom tokens
Expand Down
1 change: 1 addition & 0 deletions src/actions/CategoriesActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ export const pluginIdIcons: Record<string, string> = {
godex: EDGE_CONTENT_SERVER_URI + '/godex.png',
letsexchange: EDGE_CONTENT_SERVER_URI + '/letsexchange-logo.png',
lifi: EDGE_CONTENT_SERVER_URI + '/lifi.png',
mayaprotocol: EDGE_CONTENT_SERVER_URI + '/mayaprotocol.png',
rango: EDGE_CONTENT_SERVER_URI + '/rango.png',
sideshift: EDGE_CONTENT_SERVER_URI + '/sideshift-logo.png',
simplex: EDGE_CONTENT_SERVER_URI + '/simplex.png',
Expand Down
12 changes: 12 additions & 0 deletions src/components/services/ContactsLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,18 @@ const merchantPartners = [
familyName: '',
recordID: ''
},
{
givenName: 'Maya Protocol',
hasThumbnail: true,
thumbnailPath: 'mayaprotocol.png',
emailAddresses: [],
postalAddresses: [],
middleName: '',
company: '',
jobTitle: '',
familyName: '',
recordID: ''
},
{
givenName: 'Thorchain',
hasThumbnail: true,
Expand Down
15 changes: 15 additions & 0 deletions src/envConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,22 @@ export const asEnvConfig = asObject({
apiKey: asOptional(asString, '')
}).withRest
),
MAYA_PROTOCOL_INIT: asCorePluginInit(
asObject({
affiliateFeeBasis: asOptional(asString, '50'),
appId: asOptional(asString, 'edge'),
thorname: asOptional(asString, 'ej')
}).withRest
),
THORCHAIN_INIT: asCorePluginInit(
asObject({
affiliateFeeBasis: asOptional(asString, '50'),
appId: asOptional(asString, 'edge'),
ninerealmsClientId: asOptional(asString, ''),
thorname: asOptional(asString, 'ej')
}).withRest
),
THORCHAIN_DA_INIT: asCorePluginInit(
asObject({
affiliateFeeBasis: asOptional(asString, '50'),
appId: asOptional(asString, 'edge'),
Expand Down
3 changes: 2 additions & 1 deletion src/util/corePlugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ export const swapPlugins = {
// Defi Swaps
rango: ENV.RANGO_INIT,
spookySwap: false,
mayaprotocol: ENV.MAYA_PROTOCOL_INIT,
thorchain: ENV.THORCHAIN_INIT,
thorchainda: ENV.THORCHAIN_INIT,
thorchainda: ENV.THORCHAIN_DA_INIT,
tombSwap: ENV.TOMB_SWAP_INIT,
velodrome: true,
xrpdex: ENV.XRPDEX_INIT,
Expand Down
Loading