asmo/wallet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

update payment request #2

Open
asmogo wants to merge 1 commit from feat/paymentRequest into main
pull from: feat/paymentRequest
merge into: asmo:main
Conversation 0 Commits 1 Files changed 19 +3729 -64
asmogo commented 2026-03-26 15:25:28 +00:00 (Migrated from github.com)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • CashuWallet/Core/NPCService.swift
  • CashuWallet/Core/Services/MintService.swift
  • CashuWallet/Core/SettingsManager.swift
  • CashuWallet/Core/WalletManager.swift
  • CashuWallet/Models/Models.swift
  • CashuWallet/Views/Components/AnimatedBalanceView.swift
  • CashuWallet/Views/Components/ScannerWrapperView.swift
  • CashuWallet/Views/Main/OnboardingView.swift
  • CashuWallet/Views/Mints/MintsListView.swift
  • CashuWallet/Views/Receive/ReceiveTokenDetailView.swift
  • CashuWallet/Views/Receive/ReceiveView.swift
  • CashuWallet/Views/Send/SendView.swift
  • CashuWallet/Views/Settings/SettingsView.swift
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/paymentRequest:feat/paymentRequest
git switch feat/paymentRequest

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feat/paymentRequest
git switch feat/paymentRequest
git rebase main
git switch main
git merge --ff-only feat/paymentRequest
git switch feat/paymentRequest
git rebase main
git switch main
git merge --no-ff feat/paymentRequest
git switch main
git merge --squash feat/paymentRequest
git switch main
git merge --ff-only feat/paymentRequest
git switch main
git merge feat/paymentRequest
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something isn't working

  
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
question
Further information is requested

  
wontfix
This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
asmo/wallet!2
No description provided.