[PR #25] [MERGED] merge: develop #33

New issue

Closed

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

kerem commented

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

Owner

📋 Pull Request Information

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

Base: main ← Head: develop

📝 Commits (6)

e29c2fa Bump semver from 6.3.0 to 6.3.1 in /ui-dashboard
29df6cf Merge pull request #20 from oxygenpay/dependabot/npm_and_yarn/ui-dashboard/semver-6.3.1
4fb0a87 Bump semver from 6.3.0 to 6.3.1 in /ui-payment (#21)
eb553ac Bump word-wrap from 1.2.3 to 1.2.5 in /ui-dashboard (#22)
2745fbe Bump word-wrap from 1.2.3 to 1.2.5 in /ui-payment (#23)
79b56a5 feat: improve security (#24)

📊 Changes

13 files changed (+1460 additions, -641 deletions)

View changed files

📝 go.mod (+9 -9)
📝 go.sum (+21 -0)
📝 internal/auth/google.go (+6 -3)
📝 internal/server/http/internalapi/wallet.go (+6 -4)
📝 internal/server/http/merchantapi/auth/email.go (+2 -1)
📝 internal/server/http/merchantapi/auth/google.go (+22 -5)
📝 internal/server/http/merchantapi/auth/handler.go (+6 -3)
📝 internal/server/http/middleware/auth.go (+18 -0)
📝 internal/service/wallet/service.go (+2 -2)
📝 ui-dashboard/package-lock.json (+1321 -572)
📝 ui-dashboard/package.json (+6 -5)
📝 ui-dashboard/src/components/withdraw-desc-card/withdraw-desc-card.tsx (+5 -1)
📝 ui-payment/package-lock.json (+36 -36)

📄 Description

No description provided

_{🔄 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/25 **Author:** [@swift1337](https://github.com/swift1337) **Created:** 7/27/2023 **Status:** ✅ Merged **Merged:** 7/27/2023 **Merged by:** [@swift1337](https://github.com/swift1337) **Base:** `main` ← **Head:** `develop` --- ### 📝 Commits (6) - [`e29c2fa`](https://github.com/oxygenpay/oxygen/commit/e29c2fabd3944513fe5ea1cc92e371720d1c6a54) Bump semver from 6.3.0 to 6.3.1 in /ui-dashboard - [`29df6cf`](https://github.com/oxygenpay/oxygen/commit/29df6cf88b8fcb426dd8a3e8dc23c8d5ba678940) Merge pull request #20 from oxygenpay/dependabot/npm_and_yarn/ui-dashboard/semver-6.3.1 - [`4fb0a87`](https://github.com/oxygenpay/oxygen/commit/4fb0a87e6f6ba50a4e08548069ecbb1f5faa8b8f) Bump semver from 6.3.0 to 6.3.1 in /ui-payment (#21) - [`eb553ac`](https://github.com/oxygenpay/oxygen/commit/eb553acff34271821b71aa19beedfcea7461ba8f) Bump word-wrap from 1.2.3 to 1.2.5 in /ui-dashboard (#22) - [`2745fbe`](https://github.com/oxygenpay/oxygen/commit/2745fbe0586e626de9c96130f49967b7f338209a) Bump word-wrap from 1.2.3 to 1.2.5 in /ui-payment (#23) - [`79b56a5`](https://github.com/oxygenpay/oxygen/commit/79b56a5793e6f723cfd54d575a3ded4785285f77) feat: improve security (#24) ### 📊 Changes **13 files changed** (+1460 additions, -641 deletions) <details> <summary>View changed files</summary> 📝 `go.mod` (+9 -9) 📝 `go.sum` (+21 -0) 📝 `internal/auth/google.go` (+6 -3) 📝 `internal/server/http/internalapi/wallet.go` (+6 -4) 📝 `internal/server/http/merchantapi/auth/email.go` (+2 -1) 📝 `internal/server/http/merchantapi/auth/google.go` (+22 -5) 📝 `internal/server/http/merchantapi/auth/handler.go` (+6 -3) 📝 `internal/server/http/middleware/auth.go` (+18 -0) 📝 `internal/service/wallet/service.go` (+2 -2) 📝 `ui-dashboard/package-lock.json` (+1321 -572) 📝 `ui-dashboard/package.json` (+6 -5) 📝 `ui-dashboard/src/components/withdraw-desc-card/withdraw-desc-card.tsx` (+5 -1) 📝 `ui-payment/package-lock.json` (+36 -36) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>