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

feat: update transaction description field #1404

Closed
wants to merge 2 commits into from
Closed

feat: update transaction description field #1404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91358ef
updates transaction description field
SimiHunjan Dec 20, 2024
3df2c4e
update column width for decription and wrapping
SimiHunjan Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion front-end/src/renderer/components/Transaction/TransactionInfoControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ onMounted(async () => {
</script>
<template>
<div class="row">
<div class="form-group" :class="['col-8 col-xxxl-6']">
<div class="form-group" :class="['col-12 col-xxxl-6']">
<label class="form-label">Transaction Description</label>
<AppTextArea
:model-value="description"
Expand Down
11 changes: 7 additions & 4 deletions front-end/src/renderer/pages/TransactionDetails/TransactionDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ const handleSign = async () => {
}

const personalPassword = getPassword(handleSign, {
subHeading: 'Enter your application password to decrypt your private key',
subHeading: 'Enter your application password to access your private key',
});
if (passwordModalOpened(personalPassword)) return;

Expand Down Expand Up @@ -312,7 +312,7 @@ const handleApprove = async (approved: boolean, showModal?: boolean) => {
}

const personalPassword = getPassword(callback, {
subHeading: 'Enter your application password to decrypt your private key',
subHeading: 'Enter your application password to access your private key',
});
if (passwordModalOpened(personalPassword)) return;

Expand Down Expand Up @@ -528,6 +528,7 @@ const sectionHeadingClass = 'd-flex justify-content-between align-items-center';
const detailItemLabelClass = 'text-micro text-semi-bold text-dark-blue';
const detailItemValueClass = 'text-small mt-1';
const commonColClass = 'col-6 col-lg-5 col-xl-4 col-xxl-3 overflow-hidden py-3';
const descriptionColClass = 'col-12 col-lg-12 col-xl-12 col-xxl-12\'';
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no need for multiple col-12's
Bootstrap uses the min-width media queries so that you can leave only col-12 and it will apply to any larger screens

Copy link
Contributor

Choose a reason for hiding this comment

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

Then since it is only a single class, you don't need a variable for that

const reject = 'Reject';
const approve = 'Approve';
const sign = 'Sign';
Expand Down Expand Up @@ -618,7 +619,7 @@ const cancel = 'Cancel';
<div class="fill-remaining mt-5 pe-4">
<div class="row flex-wrap">
<!-- Description -->
<div :class="commonColClass">
<div :class="descriptionColClass">
<div
v-if="
(
Expand All @@ -629,7 +630,9 @@ const cancel = 'Cancel';
"
>
<h4 :class="detailItemLabelClass">Description</h4>
<p :class="detailItemValueClass" data-testid="p-description-field">
<p :class="detailItemValueClass" data-testid="p-description-field"
style="white-space: normal; word-break: break-word; overflow-wrap: break-word;"
Copy link
Contributor

Choose a reason for hiding this comment

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

Inline styles are bad practice, consider adding the text-break to the detailItemValueClass and remove the inline styles

>
{{ orgTransaction?.description || localTransaction?.description }}
</p>
</div>
Expand Down
Loading