-
Notifications
You must be signed in to change notification settings - Fork 24
feat: update csv export and zenledger #762
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
Open
ross-dash
wants to merge
5
commits into
master
Choose a base branch
from
feat/update-csv-export-and-zenledger
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
37630af
Added two new bottom sheets:
ross-dash 527ebef
Added new text for translation
ross-dash bde8925
Revert "Added new text for translation"
HashEngineering 9d031d8
fix: add missing text to english source
HashEngineering 876d800
Merge branch 'master' of https://github.com/dashpay/dashwallet-ios in…
HashEngineering 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
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/Illustration/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 | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
DashWallet/Resources/AppAssets.xcassets/Illustration/csv-export-large.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" : "export.csv.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "export.csv@2x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "export.csv@3x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+13.4 KB
...ources/AppAssets.xcassets/Illustration/csv-export-large.imageset/export.csv.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
+34.4 KB
...ces/AppAssets.xcassets/Illustration/csv-export-large.imageset/export.csv@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
+65.3 KB
...ces/AppAssets.xcassets/Illustration/csv-export-large.imageset/export.csv@3x.png
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/Illustration/zenledger-large.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" : "zenledger-large.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "zenledger-large@2x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "zenledger-large@3x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+14.7 KB
...es/AppAssets.xcassets/Illustration/zenledger-large.imageset/zenledger-large.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
+37.5 KB
...AppAssets.xcassets/Illustration/zenledger-large.imageset/zenledger-large@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
+73.7 KB
...AppAssets.xcassets/Illustration/zenledger-large.imageset/zenledger-large@3x.png
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| // | ||
| // CSVExportSheet.swift | ||
| // DashWallet | ||
| // | ||
| // Copyright © 2026 Dash Core Group. All rights reserved. | ||
| // | ||
| // Licensed under the MIT License (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://opensource.org/licenses/MIT | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct CSVExportSheet: View { | ||
| @Environment(\.presentationMode) private var presentationMode | ||
| @Environment(\.colorScheme) private var colorScheme | ||
| let onExport: () -> Void | ||
|
|
||
| var body: some View { | ||
| VStack(spacing: 0) { | ||
| // Grabber | ||
| Capsule() | ||
| .fill(colorScheme == .dark ? Color.whiteAlpha20 : Color.gray300Alpha50) | ||
| .frame(width: 36, height: 5) | ||
| .padding(.top, 6) | ||
| .padding(.bottom, 6) | ||
|
|
||
| // Close button | ||
| NavBarClose { | ||
| presentationMode.wrappedValue.dismiss() | ||
| } | ||
|
|
||
| // Content | ||
| VStack(spacing: 0) { | ||
| // Icon | ||
| Image("csv-export-large") | ||
| .resizable() | ||
| .aspectRatio(contentMode: .fit) | ||
| .frame(width: 94, height: 100) | ||
| .padding(.top, 20) | ||
| .padding(.bottom, 10) | ||
|
|
||
| // Text content | ||
| VStack(alignment: .leading, spacing: 6) { | ||
| Text(NSLocalizedString("The full transaction history will be exported as a CSV file", comment: "")) | ||
| .font(.system(size: 28, weight: .bold)) | ||
| .foregroundColor(Color.primaryText) | ||
| .multilineTextAlignment(.leading) | ||
| .fixedSize(horizontal: false, vertical: true) | ||
|
|
||
| Text(NSLocalizedString("All payments will be considered as an expense and all incoming transactions will be income.\nThe owner of this wallet is responsible for making any cost basis adjustments in their chosen tax reporting system.", comment: "")) | ||
| .font(.system(size: 15)) | ||
| .foregroundColor(Color.secondaryText) | ||
| .multilineTextAlignment(.leading) | ||
| .lineSpacing(5) | ||
| .fixedSize(horizontal: false, vertical: true) | ||
| } | ||
| .padding(.horizontal, 40) | ||
| .padding(.top, 20) | ||
| .padding(.bottom, 32) | ||
| } | ||
|
|
||
| Spacer() | ||
|
|
||
| // Button | ||
| VStack(spacing: 0) { | ||
| DashButton( | ||
| text: NSLocalizedString("Export CSV", comment: ""), | ||
| style: .filledBlue, | ||
| size: .large, | ||
| stretch: true, | ||
| isEnabled: true, | ||
| action: { | ||
| presentationMode.wrappedValue.dismiss() | ||
| onExport() | ||
| } | ||
| ) | ||
| .padding(.horizontal, 60) | ||
| } | ||
| .padding(.top, 20) | ||
| .padding(.bottom, 20) | ||
| } | ||
| .background(Color.secondaryBackground) | ||
| } | ||
| } | ||
|
|
||
| struct CSVExportSheet_Previews: PreviewProvider { | ||
| static var previews: some View { | ||
| CSVExportSheet(onExport: {}) | ||
| } | ||
| } | ||
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.