[PR #10] [MERGED] merge: develop #18

New issue

Closed

opened 2026-03-03 18:51:37 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 18:51:37 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/oxygenpay/oxygen/pull/10
Author: @swift1337
Created: 7/9/2023
Status: ✅ Merged
Merged: 7/9/2023
Merged by: @swift1337

Base: main ← Head: develop

📝 Commits (3)

ae8e5f0 feat: add support for USDC token (#9)
635a42b fix: UpdateSupportedPaymentMethodsRequest spec
9dd0662 Merge branch 'main' into develop

📊 Changes

22 files changed (+126 additions, -71 deletions)

View changed files

📝 README.md (+29 -2)
📝 api/proto/merchant/v1/merchant.yml (+1 -1)
📝 internal/service/blockchain/currencies.json (+26 -0)
📝 internal/service/blockchain/service_convertor.go (+8 -3)
📝 internal/service/blockchain/service_convertor_test.go (+13 -0)
📝 internal/test/mocks_tatum.go (+7 -15)
📝 pkg/api-dashboard/v1/model/update_supported_payment_methods_request.go (+0 -30)
📝 ui-dashboard/src/assets/icons/crypto/eth.svg (+0 -0)
📝 ui-dashboard/src/assets/icons/crypto/matic.svg (+0 -0)
📝 ui-dashboard/src/assets/icons/crypto/tron.svg (+0 -0)
➕ ui-dashboard/src/assets/icons/crypto/usdc.svg (+5 -0)
📝 ui-dashboard/src/assets/icons/crypto/usdt.svg (+0 -0)
📝 ui-dashboard/src/components/payment-methods-select/payment-methods-select.tsx (+1 -1)
📝 ui-dashboard/src/pages/balance-page/balance-page.tsx (+1 -1)
📝 ui-payment/src/assets/icons/crypto/eth.svg (+0 -0)
📝 ui-payment/src/assets/icons/crypto/matic.svg (+0 -0)
📝 ui-payment/src/assets/icons/crypto/tron.svg (+0 -0)
➕ ui-payment/src/assets/icons/crypto/usdc.svg (+5 -0)
📝 ui-payment/src/assets/icons/crypto/usdt.svg (+0 -0)
📝 ui-payment/src/components/DropDown.tsx (+7 -1)

...and 2 more files

📄 Description

Refactor FE icons. Add USDC icon
Add support for USDC on Ethereum & Polygon
Update readme

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/oxygenpay/oxygen/pull/10 **Author:** [@swift1337](https://github.com/swift1337) **Created:** 7/9/2023 **Status:** ✅ Merged **Merged:** 7/9/2023 **Merged by:** [@swift1337](https://github.com/swift1337) **Base:** `main` ← **Head:** `develop` --- ### 📝 Commits (3) - [`ae8e5f0`](https://github.com/oxygenpay/oxygen/commit/ae8e5f091e5f5a2ce3294354f221ce4c91ab978f) feat: add support for USDC token (#9) - [`635a42b`](https://github.com/oxygenpay/oxygen/commit/635a42b42ce276286cb7a79c17f9dc09bbed1c0b) fix: UpdateSupportedPaymentMethodsRequest spec - [`9dd0662`](https://github.com/oxygenpay/oxygen/commit/9dd06627f52f47a2b9baff9a509ee4e4b17a2c2d) Merge branch 'main' into develop ### 📊 Changes **22 files changed** (+126 additions, -71 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+29 -2) 📝 `api/proto/merchant/v1/merchant.yml` (+1 -1) 📝 `internal/service/blockchain/currencies.json` (+26 -0) 📝 `internal/service/blockchain/service_convertor.go` (+8 -3) 📝 `internal/service/blockchain/service_convertor_test.go` (+13 -0) 📝 `internal/test/mocks_tatum.go` (+7 -15) 📝 `pkg/api-dashboard/v1/model/update_supported_payment_methods_request.go` (+0 -30) 📝 `ui-dashboard/src/assets/icons/crypto/eth.svg` (+0 -0) 📝 `ui-dashboard/src/assets/icons/crypto/matic.svg` (+0 -0) 📝 `ui-dashboard/src/assets/icons/crypto/tron.svg` (+0 -0) ➕ `ui-dashboard/src/assets/icons/crypto/usdc.svg` (+5 -0) 📝 `ui-dashboard/src/assets/icons/crypto/usdt.svg` (+0 -0) 📝 `ui-dashboard/src/components/payment-methods-select/payment-methods-select.tsx` (+1 -1) 📝 `ui-dashboard/src/pages/balance-page/balance-page.tsx` (+1 -1) 📝 `ui-payment/src/assets/icons/crypto/eth.svg` (+0 -0) 📝 `ui-payment/src/assets/icons/crypto/matic.svg` (+0 -0) 📝 `ui-payment/src/assets/icons/crypto/tron.svg` (+0 -0) ➕ `ui-payment/src/assets/icons/crypto/usdc.svg` (+5 -0) 📝 `ui-payment/src/assets/icons/crypto/usdt.svg` (+0 -0) 📝 `ui-payment/src/components/DropDown.tsx` (+7 -1) _...and 2 more files_ </details> ### 📄 Description * Refactor FE icons. Add USDC icon * Add support for USDC on Ethereum & Polygon * Update readme --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>