Skip to content

chore: Merge develop into master #529

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
Merged
merged 272 commits into from
Mar 4, 2023
Merged

chore: Merge develop into master #529

merged 272 commits into from
Mar 4, 2023

Conversation

tikhop
Copy link
Contributor

@tikhop tikhop commented Mar 4, 2023

Issue being fixed or feature implemented

Release 6.3.0

What was done?

N/A

How Has This Been Tested?

N/A

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

Andrei Ashikhmin and others added 30 commits November 12, 2022 15:59
feat: new account UI and notifications
40b4e02
feat: reset CrowdNode when network is changed
d8ad3e8
@tikhop
Merge pull request #433 from Syn-McJ/feature/crowdnode-new-account-ui
a095d07 
[NMI-828] (CrowdNode) New account / in progress UI
feat: info screen
1480aef
feat: getting started screen UI
46c3b98
feat: getting started UI
5751476
feat: passphrase backup
ad51eae
feat: buy dash option
010004e
fix: separating didVerify and didFinish events
cb59de3
feat: saving Info screen shown state
7fc2f41
fix: address cast crash
dcf3ddd
Merge branch 'develop' into feature/crowdnode
7131318
Merge branch 'feature/crowdnode' into feature/crowdnode-getting-start…
e344473 
…ed-ui
chore: applying swiftformat
0a8c221
@tikhop
Merge pull request #435 from Syn-McJ/feature/crowdnode-getting-starte…
ff5b6e6 
…d-ui

feat(crowdnode): Getting started UI
Merge branch 'develop' into feature/crowdnode-deposit-withdraw
01c7c6a
feat: deposit/withdraw logic
3f1f2ad
chore: apply swiftformat to CrowdNode code
abaa8a4
chore: merge develop
97d8592
Merge branch 'feature/crowdnode' into feature/crowdnode-deposit-withdraw
a559b15
chore: add crowdnode to semantic PR scopes
03789d4
@tikhop
Merge pull request #450 from Syn-McJ/feature/crowdnode
0828fb3 
chore(crowdnode): merge develop into feature/crowdnode
chore: run controller dismis in MainActor.run
a444c97
@tikhop
Merge pull request #454 from Syn-McJ/feature/crowdnode-deposit-withdraw
a19bdf0
Merge branch 'feature/coinbase' into feature/crowdnode
e1b6776
chore: refactor VerifiedSuccessfullyViewController to Swift to fix bu…
166a3ab 
…ild errors
@tikhop
Merge pull request #455 from Syn-McJ/feature/crowdnode
a941132 
chore(crowdnode): Merge Coinbase branch
feat: basic CrowdNode portal layout
405a416
feat: finishing portal UI
6bf778f
feat: retries of balance update
f9d2c56
tikhop and others added 25 commits February 22, 2023 16:23
@tikhop
chore: Merge pull request #518 from dashpay/feature/tx-list-optimizat…
1545a76 
…ions

feat: Tx list optimizations
Merge branch 'feature/crowdnode' into feature/crowdnode-no-auth
705da48
chore: removing authentication for withdrawal, signup continue and co…
286a94a 
…nfirmation redirect
fix: initializing CrowdNode to subscribe to reset events
e2a8e08
@Syn-McJ
Merge pull request #520 from Syn-McJ/feature/crowdnode-no-auth
c2109ee 
feat(crowdnode): remove authentication for some functions
@tikhop
chore: Merge pull request #521 from dashpay/feature/crowdnode
0c19fc0 
feat(crowdnode): CrowdNode integration
@Syn-McJ
fix: portal gradient width
9440b6c
@tikhop
chore: Merge pull request #522 from Syn-McJ/fix/crowdnode-minor-bugs
2025e11 
fix(crowdnode): portal gradient width
@tikhop
feat: Properly layout elements when user has custom fonts size in set…
f8590cd 
…tings
@Syn-McJ
fix: copy Primary address instead of API
69751f5
@Syn-McJ
fix: use Primary address for FundsOpen
22d35d2
@Syn-McJ
fix: arithmetic overflow
da0ef19
@tikhop
chore: Merge pull request #523 from dashpay/feature/custom-font-sizes…
75841c3 
…-and-expore-dash-portal

feat: Properly layout elements when user has custom fonts size in settings
@Syn-McJ
fix: new Online account redirect flow
3ede179
@tikhop
chore: Merge pull request #524 from Syn-McJ/fix/crowdnode-minor-bugs
7e3340d 
fix(crowdnode): Online account issues
@tikhop
fix: Show 'Syncing...' message instead of crashing when we can't calc…
fc8f28c 
…ulate tx amount correctly
@tikhop
chore: Merge pull request #525 from dashpay/fix/calculating-tx-amount…
26742ce 
…-during-sync

fix: Display 'Syncing...' message instead of crashing
@tikhop
feat: Switch from insight.dashevo.org to insight.dash.org
b223707
@tikhop
feat: Update github repository url
03f19ac
@tikhop
chore: Merge pull request #526 from dashpay/feature/update-insight-url
613d178 
feat: Update infrastructure urls (insight, github)
@tikhop
feat: Check whether 'website' column is null before trying to deseria…
6d73783 
…lize it
@tikhop
chore: Merge pull request #527 from dashpay/fix/merchants-retrieving
9ae4d4a 
feat: Check whether sqlite column is null before trying to deserialize it
@tikhop
chore: Update explore dash database
90bdfa1
@tikhop
chore: Update localization files
21466ae
@tikhop
chore: Merge pull request #528 from dashpay/release/6.3.0
460791b 
chore: Release 6.3.0 preparation
@tikhop tikhop requested a review from Syn-McJ March 4, 2023 15:02
@tikhop tikhop marked this pull request as ready for review March 4, 2023 15:02
@tikhop tikhop changed the title chore: Release 6.3.0 chore: Merge develop into master Mar 4, 2023
Syn-McJ
Syn-McJ approved these changes Mar 4, 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.

Looks about right

@tikhop tikhop merged commit be3f407 into master Mar 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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.
2 participants
@tikhop @Syn-McJ