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.

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

Add export statement for personal wallet #737

Merged
merged 8 commits into from
Sep 28, 2023

Conversation

mikozet
Copy link
Collaborator

@mikozet mikozet commented Sep 22, 2023

@mikozet mikozet self-assigned this Sep 22, 2023
@mikozet mikozet linked an issue Sep 22, 2023 that may be closed by this pull request
@netlify
Copy link

netlify bot commented Sep 22, 2023

Deploy Preview for preview-review-circles-garden ready!

Name Link
🔨 Latest commit ddeb0af
🔍 Latest deploy log https://app.netlify.com/sites/preview-review-circles-garden/deploys/651569425253120008ec3964
😎 Deploy Preview https://deploy-preview-737.review.circles.garden/
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

juanenrisley
juanenrisley previously approved these changes Sep 25, 2023
Copy link
Collaborator

@juanenrisley juanenrisley left a comment

Choose a reason for hiding this comment

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

👍🏿

Copy link
Collaborator

@louilinn louilinn left a comment

Choose a reason for hiding this comment

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

We need to add a description for UBI payouts. I suggest writing CirclesUBI in column To_or_from_username and UBI payout in Payment_note for those transactions. under condition safeAddress === ZERO_ADDRESS

Screenshot from 2023-09-25 15-44-48

louilinn
louilinn previously approved these changes Sep 25, 2023
Copy link
Collaborator

@louilinn louilinn left a comment

Choose a reason for hiding this comment

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

Fixed :)
Merge pending for Lucia's acceptance

@louilinn
Copy link
Collaborator

Uploading Screenshot from 2023-09-25 16-09-10.png…

data.name = 'CirclesUBI';
data.paymentNote = 'UBI payout';
data.name = translate('ExportStatement.exportDataName');
data.paymentNote = translate('ExportStatement.exportPaymentNote');
Copy link
Collaborator

Choose a reason for hiding this comment

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

now we are adding some text in translations but not all. Maybe then I should add all fields in en.json

@@ -203,7 +204,7 @@ export async function downloadCsvStatement(
) {
// Verify date order
if (startDate > endDate) {
throw new Error('Invalid date interval');
throw new Error(translate('ExportStatement.exportDataName'));
Copy link
Collaborator

Choose a reason for hiding this comment

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

this was the wrong text so I changed it in a commit

Copy link
Collaborator

@juanenrisley juanenrisley left a comment

Choose a reason for hiding this comment

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

👍🏿

@louilinn louilinn changed the base branch from main to release September 28, 2023 11:38
@louilinn louilinn force-pushed the 735-personal-wallet-statement-export branch from 47cf009 to ddeb0af Compare September 28, 2023 11:53
@louilinn louilinn merged commit 15b151f into release Sep 28, 2023
4 checks passed
@louilinn louilinn deleted the 735-personal-wallet-statement-export branch September 28, 2023 12:18
louilinn added a commit that referenced this pull request Sep 28, 2023
* Add export statement for personal wallet

* Specify UBI payouts in export for personal wallets

* Move all statement file text to en.json
---------

Co-authored-by: Louise Linné <linne.louise@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Personal wallet statement export
3 participants