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.

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

Jump to bottom

chore: Bringing DashPay into the project #578

Merged
merged 87 commits into from
Oct 31, 2023
Merged

chore: Bringing DashPay into the project #578

merged 87 commits into from
Oct 31, 2023

Conversation

tikhop
Copy link
Collaborator

@tikhop tikhop commented Jul 25, 2023

Issue being fixed or feature implemented

Bringing DashPay into the project

What was done?

  • Create a separate target for dashpay
  • Move everything from the latest DashPay app
  • Start bringing back dashpay functionality

How Has This Been Tested?

QA

Breaking Changes

N/A

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation

For repository code-owners and collaborators only

  • I have assigned this pull request to a milestone

tikhop added 16 commits June 13, 2023 13:56
@tikhop
feat: Prepare DashPay target
c5ec0ca
@tikhop
feat(ui): Show 'Join DashPay' button
fd73c30
@tikhop
feat: Update DashPay models and setup flow
aa9baf5
@tikhop
feat: Show profile view on home screen
2a282c0
@tikhop
feat: Moving DashPay features into wallet
79a749a
@tikhop
refactor: Re-org DashPay structure
8f443f6
@tikhop
fix: DashWallet compilation issues
1d159e2
@tikhop
feat(ui): Show user profile on more screen
4e234cd
@tikhop
chore: Merge branch 'develop' into feature/dashpay
314b16a
@tikhop
Merge branch 'develop' into feature/dashpay
f511cc1
@tikhop
Merge branch 'develop' into feature/dashpay
baa6f56
@tikhop
chore: Merge branch 'develop' into feature/dashpay
f3b0619
@tikhop
fix: Project structure
a672923
@tikhop
chore: Merge branch 'develop' into feature/dashpay
310482b 
# Conflicts:
#	DashWallet/Sources/UI/DashPay/Contacts/GlobalSearch/Children/DWSearchStateViewController.m
#	DashWallet/Sources/UI/Views/SharedViews/Buttons/DWButton.h
#	DashWallet/Sources/UI/Views/SharedViews/Buttons/DWButton.m
@tikhop
Merge branch 'develop' into feature/dashpay
7a99b70
@tikhop
chore: Update localizations
4922418
@tikhop tikhop requested a review from pankcuf July 25, 2023 13:07
@tikhop tikhop marked this pull request as ready for review July 25, 2023 13:07
@tikhop tikhop requested a review from Syn-McJ July 27, 2023 12:08
Syn-McJ
Syn-McJ approved these changes Jul 27, 2023
View reviewed changes
Copy link
Member

@Syn-McJ Syn-McJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went through the PR, but not in depth. Under the assumption this code was reviewed before, looks good.

@Syn-McJ
Merge pull request #597 from Syn-McJ/feature/dashpay-payments
55cfacc 
feat(dashpay): restore Payments flow
@Syn-McJ
Merge branch 'develop' into feature/dashpay
0087891
@Syn-McJ
feat: send to contact UI
fca152b
@Syn-McJ
feat: receive screen & username
200bbc7
@Syn-McJ
Merge branch 'develop' into feature/dashpay
3231365
@Syn-McJ
Merge pull request #601 from Syn-McJ/feature/dashpay
5ead83d 
chore(dashpay): merge develop into feature/dashpay
@Syn-McJ
feat: moving notification indicator and user profile to the top bar
fe7f26d
@Syn-McJ
fix: don't show right button if no identity
f7a533b
@Syn-McJ
fix: make header view smaller
7d2b554
@Syn-McJ
fix: redraw Join Dashpay on status change
29cdbd4
@Syn-McJ
Merge pull request #603 from Syn-McJ/feature/dashpay-send-ui
d2bb77e 
feat(dashpay): integrate DashPay UI into Send screen and Receive tab
@Syn-McJ
Merge pull request #604 from Syn-McJ/feature/dashpay-home-screen
2ce3f4a 
feat(dashpay): redesing Home screen
@Syn-McJ
feat: coinjoin entry point
f525dae
@Syn-McJ
chore: cleanup
c9472d9
@Syn-McJ
chore: add coinjoin to acceptable scopes
d16727a
@Syn-McJ
Merge pull request #608 from Syn-McJ/feature/coinjoin-entry-point
423f6cb 
feat(coinjoin): Entry point
@Syn-McJ
Merge branch 'develop' into feature/coinjoin-levels
ff9820c
@Syn-McJ
feat: levels UI
f290695
@Syn-McJ
feat: levels changing and dialogs
71df6df
@Syn-McJ
fix: crowdnode storyboard
d428eae
@Syn-McJ
feat: voting entrypoint
e5ffbd4
@Syn-McJ
fix: cleanup
b3391db
@Syn-McJ
fix: add voting to PR titles
78bf5e6
@Syn-McJ
Merge pull request #612 from Syn-McJ/feature/voting-entrypoint
8055af2 
feat(voting): Username voting entry point
@Syn-McJ
Merge branch 'feature/dashpay' into feature/coinjoin-levels
b3c6fb5
@Syn-McJ
Merge pull request #613 from Syn-McJ/feature/coinjoin-levels
f1875fd 
feat(coinjoin): privacy level UI
@Syn-McJ
Merge branch 'develop' into feature/dashpay
ca1221d
pankcuf
pankcuf approved these changes Oct 31, 2023
View reviewed changes
Copy link
Collaborator

@pankcuf pankcuf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Syn-McJ Syn-McJ merged commit e400af2 into develop Oct 31, 2023
1 check passed
@Syn-McJ Syn-McJ deleted the feature/dashpay branch October 31, 2023 07:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pankcuf pankcuf pankcuf approved these changes

@Syn-McJ Syn-McJ Syn-McJ approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tikhop @pankcuf @Syn-McJ