From aa91a8d5ca0444b09bff6ff00cb4a13aff1cb789 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Tue, 24 Sep 2024 00:12:27 -0700
Subject: [PATCH] fix send form defects (#11212)

---
 .../options/send-options.component.html       | 13 +++++++----
 .../send-details/send-details.component.html  |  6 ++---
 .../send-file-details.component.html          | 22 ++++++++++---------
 .../send-file-details.component.ts            |  8 ++++++-
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html
index 9c5183aabd2..53483065b73 100644
--- a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html
+++ b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html
@@ -1,6 +1,6 @@
 <bit-section [formGroup]="sendOptionsForm">
   <bit-section-header>
-    <h2 class="tw-mt-4" bitTypography="h5">{{ "additionalOptions" | i18n }}</h2>
+    <h2 class="tw-mt-4" bitTypography="h6">{{ "additionalOptions" | i18n }}</h2>
   </bit-section-header>
   <bit-card>
     <bit-form-field>
@@ -16,16 +16,21 @@
       <bit-label *ngIf="hasPassword">{{ "newPassword" | i18n }}</bit-label>
       <input bitInput type="password" formControlName="password" />
       <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
-      <button type="button" bitIconButton="bwi-refresh" bitSuffix></button>
+      <button
+        type="button"
+        bitIconButton="bwi-generate"
+        bitSuffix
+        [appA11yTitle]="'generatePassword' | i18n"
+      ></button>
       <bit-hint>{{ "sendPasswordDescV2" | i18n }}</bit-hint>
     </bit-form-field>
     <bit-form-control *ngIf="!disableHideEmail">
       <input bitCheckbox type="checkbox" formControlName="hideEmail" />
       <bit-label>{{ "hideYourEmail" | i18n }}</bit-label>
     </bit-form-control>
-    <bit-form-field>
+    <bit-form-field disableMargin>
       <bit-label>{{ "privateNote" | i18n }}</bit-label>
-      <textarea bitInput rows="4" formControlName="notes"></textarea>
+      <textarea bitInput rows="3" formControlName="notes"></textarea>
     </bit-form-field>
   </bit-card>
 </bit-section>
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html
index e5b99828fe4..98f399760be 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html
@@ -1,6 +1,6 @@
 <bit-section [formGroup]="sendDetailsForm">
-  <bit-section-header class="tw-mt-4">
-    <h2 bitTypography="h5">{{ "sendDetails" | i18n }}</h2>
+  <bit-section-header class="tw-mt-2">
+    <h2 bitTypography="h6">{{ "sendDetails" | i18n }}</h2>
   </bit-section-header>
 
   <bit-card>
@@ -34,7 +34,7 @@
       ></button>
     </bit-form-field>
 
-    <bit-form-field>
+    <bit-form-field disableMargin>
       <bit-label>{{ "deletionDate" | i18n }}</bit-label>
       <bit-select
         id="deletionDate"
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html
index b8987761cc6..d9ffd1307b2 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.html
@@ -1,20 +1,22 @@
 <bit-section [formGroup]="sendFileDetailsForm">
   <div *ngIf="config.mode === 'edit'">
-    <div class="tw-text-muted">{{ "file" | i18n }}</div>
+    <div bitTypography="body2" class="tw-text-muted">{{ "file" | i18n }}</div>
     <div>{{ originalSendView.file.fileName }}</div>
     <div class="tw-text-muted">{{ originalSendView.file.sizeName }}</div>
   </div>
   <bit-form-field *ngIf="config.mode !== 'edit'">
     <bit-label for="file">{{ "fileToShare" | i18n }}</bit-label>
-    <button bitButton type="button" buttonType="primary" (click)="fileSelector.click()">
-      {{ "chooseFile" | i18n }}
-    </button>
-    <span
-      class="tw-flex tw-items-center tw-pl-3"
-      [ngClass]="fileName ? 'tw-text-main' : 'tw-text-muted'"
-    >
-      {{ fileName || ("noFileChosen" | i18n) }}</span
-    >
+    <div class="tw-flex tw-mt-2 tw-mb-1">
+      <button bitButton type="button" buttonType="secondary" (click)="fileSelector.click()">
+        {{ "chooseFile" | i18n }}
+      </button>
+      <span
+        class="tw-flex tw-items-center tw-pl-3"
+        [ngClass]="fileName ? 'tw-text-main' : 'tw-text-muted'"
+      >
+        {{ fileName || ("noFileChosen" | i18n) }}</span
+      >
+    </div>
     <input
       bitInput
       #fileSelector
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
index 61391e20725..7739ca26528 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
@@ -7,7 +7,12 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendFileView } from "@bitwarden/common/tools/send/models/view/send-file.view";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
-import { ButtonModule, FormFieldModule, SectionComponent } from "@bitwarden/components";
+import {
+  ButtonModule,
+  FormFieldModule,
+  SectionComponent,
+  TypographyModule,
+} from "@bitwarden/components";
 
 import { SendFormConfig } from "../../abstractions/send-form-config.service";
 import { SendFormContainer } from "../../send-form-container";
@@ -24,6 +29,7 @@ import { SendFormContainer } from "../../send-form-container";
     FormFieldModule,
     SectionComponent,
     FormsModule,
+    TypographyModule,
   ],
 })
 export class SendFileDetailsComponent implements OnInit {