-
Notifications
You must be signed in to change notification settings - Fork 25
feat(dashpay): wire the DashConnect connections flow to Dash Platform #909
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.
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
Merged
Merged
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
42c60d0
feat(dashconnect): port connections UI onto the SDK branch
jeanpierreroma b95abb1
refactor: reference DashUIKit icons through DashIcon and apply dashFont
jeanpierreroma 96a46f1
feat(dashconnect): wire the connections flow to Dash Platform
jeanpierreroma 4b0bdfc
Merge swift-sdk-integration into feat/dash-connect-sdk
jeanpierreroma e184b85
fix(dashpay): make the DashConnect switch work and match Android
jeanpierreroma 08530f7
fix(wallet): stop NetworkReachability from parking the main thread
jeanpierreroma 28cf310
Merge develop into feat/dash-connect-sdk
jeanpierreroma 6e671e5
fix(wallet): guard the preview check in refreshEvonodeEpochBlocks
jeanpierreroma a9bcdf5
Merge develop into feat/dash-connect-sdk
jeanpierreroma a4af298
fix(dashpay): address the DashConnect review findings
jeanpierreroma ba01781
fix(dashpay): carry the throwing hash160 through its test call sites
jeanpierreroma f868003
Merge remote-tracking branch 'origin/develop' into feat/dash-connect-sdk
jeanpierreroma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
DashWallet/Resources/AppAssets.xcassets/DashConnect/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
DashWallet/Resources/AppAssets.xcassets/DashConnect/dashconnect-empty.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "dashconnect-empty.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "dashconnect-empty@2x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "dashconnect-empty@3x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| }, | ||
| "properties" : { | ||
| "preserves-vector-representation" : true, | ||
| "template-rendering-intent" : "original" | ||
| } | ||
| } |
Binary file added
BIN
+990 Bytes
...AppAssets.xcassets/DashConnect/dashconnect-empty.imageset/dashconnect-empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.71 KB
...Assets.xcassets/DashConnect/dashconnect-empty.imageset/dashconnect-empty@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.46 KB
...Assets.xcassets/DashConnect/dashconnect-empty.imageset/dashconnect-empty@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions
10
.../Resources/AppAssets.xcassets/DashConnect/dashconnect.check.circle.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "images" : [ | ||
| { "filename" : "icon.svg", "idiom" : "universal" } | ||
| ], | ||
| "info" : { "author" : "xcode", "version" : 1 }, | ||
| "properties" : { | ||
| "preserves-vector-representation" : true, | ||
| "template-rendering-intent" : "original" | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
...urces/AppAssets.xcassets/DashConnect/dashconnect.check.circle.imageset/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions
10
DashWallet/Resources/AppAssets.xcassets/DashConnect/dashconnect.qr.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "images" : [ | ||
| { "filename" : "icon.svg", "idiom" : "universal" } | ||
| ], | ||
| "info" : { "author" : "xcode", "version" : 1 }, | ||
| "properties" : { | ||
| "preserves-vector-representation" : true, | ||
| "template-rendering-intent" : "original" | ||
| } | ||
| } |
10 changes: 10 additions & 0 deletions
10
...allet/Resources/AppAssets.xcassets/DashConnect/dashconnect.qr.imageset/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions
10
.../Resources/AppAssets.xcassets/DashConnect/dashconnect.xmark.circle.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "images" : [ | ||
| { "filename" : "icon.svg", "idiom" : "universal" } | ||
| ], | ||
| "info" : { "author" : "xcode", "version" : 1 }, | ||
| "properties" : { | ||
| "preserves-vector-representation" : true, | ||
| "template-rendering-intent" : "original" | ||
| } | ||
| } | ||
5 changes: 5 additions & 0 deletions
5
...urces/AppAssets.xcassets/DashConnect/dashconnect.xmark.circle.imageset/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
DashWallet/Resources/AppAssets.xcassets/DashConnect/menu-connections.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "menu-connections.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "menu-connections@2x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "menu-connections@3x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
Binary file added
BIN
+616 Bytes
...s/AppAssets.xcassets/DashConnect/menu-connections.imageset/menu-connections.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+992 Bytes
...ppAssets.xcassets/DashConnect/menu-connections.imageset/menu-connections@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.44 KB
...ppAssets.xcassets/DashConnect/menu-connections.imageset/menu-connections@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions
10
DashWallet/Resources/AppAssets.xcassets/DashConnect/menu.connections.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "images" : [ | ||
| { "filename" : "icon.svg", "idiom" : "universal" } | ||
| ], | ||
| "info" : { "author" : "xcode", "version" : 1 }, | ||
| "properties" : { | ||
| "preserves-vector-representation" : true, | ||
| "template-rendering-intent" : "original" | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
...let/Resources/AppAssets.xcassets/DashConnect/menu.connections.imageset/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.