From 35d92be63ca3bac48e0fefb6355f1c7b775d66c8 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Wed, 20 Sep 2023 00:22:34 +0530
Subject: [PATCH] chore: update vaults preferences

---
 .../Vaults/Invites/ContactInviteModal.tsx     |  2 +-
 .../Preferences/Panes/Vaults/Vaults.tsx       | 55 +++++++++----------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/ContactInviteModal.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/ContactInviteModal.tsx
index df42cc2f7..121290ffa 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/ContactInviteModal.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Invites/ContactInviteModal.tsx
@@ -130,7 +130,7 @@ const ContactInviteModal: FunctionComponent<Props> = ({ vault, onCloseDialog })
                       wrapper: 'col-start-2',
                     }}
                     items={Object.keys(SharedVaultUserPermission.PERMISSIONS).map((key) => ({
-                      label: application.vaultUsers.getFormattedMemberPermission(key),
+                      label: application.vaultUsers.getFormattedMemberPermission(key.toLowerCase()),
                       value: key,
                     }))}
                     value={selectedContact.permission}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx
index 5dc8508f2..6bbb2d6b1 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx
@@ -138,13 +138,11 @@ const Vaults = observer(() => {
       <ModalOverlay isOpen={isAddContactModalOpen} close={closeAddContactModal}>
         <EditContactModal onCloseDialog={closeAddContactModal} />
       </ModalOverlay>
-
       <EditVaultModal
         isVaultModalOpen={isVaultModalOpen}
         creatingSharedVault={isCreatingSharedVault}
         closeVaultModal={closeVaultModal}
       />
-
       {invites.length > 0 && (
         <PreferencesGroup>
           <PreferencesSegment>
@@ -157,7 +155,6 @@ const Vaults = observer(() => {
           </PreferencesSegment>
         </PreferencesGroup>
       )}
-
       {hasAccount && (
         <PreferencesGroup>
           <PreferencesSegment>
@@ -175,33 +172,6 @@ const Vaults = observer(() => {
           </PreferencesSegment>
         </PreferencesGroup>
       )}
-
-      <PreferencesGroup>
-        <PreferencesSegment>
-          <Title>Vaults</Title>
-          {vaults.length > 0 && (
-            <div className="my-2 flex flex-col gap-3.5">
-              {vaults.map((vault) => {
-                return <VaultItem vault={vault} key={vault.uuid} />
-              })}
-            </div>
-          )}
-          {canCreateMoreVaults ? (
-            <div className="mt-2.5 flex gap-3">
-              <Button label="Create Vault" onClick={createNewVault} />
-              {hasAccount && <Button label="Create Shared Vault" onClick={createNewSharedVault} />}
-            </div>
-          ) : (
-            <div className="mt-3.5">
-              <NoProSubscription
-                application={application}
-                text={<span>Please upgrade in order to increase your shared vault limit.</span>}
-              />
-            </div>
-          )}
-        </PreferencesSegment>
-      </PreferencesGroup>
-
       {hasAccount && (
         <PreferencesGroup>
           <PreferencesSegment>
@@ -244,6 +214,31 @@ const Vaults = observer(() => {
           </PreferencesSegment>
         </PreferencesGroup>
       )}
+      <PreferencesGroup>
+        <PreferencesSegment>
+          <Title>Vaults</Title>
+          {vaults.length > 0 && (
+            <div className="my-2 flex flex-col gap-3.5">
+              {vaults.map((vault) => {
+                return <VaultItem vault={vault} key={vault.uuid} />
+              })}
+            </div>
+          )}
+          {canCreateMoreVaults ? (
+            <div className="mt-2.5 flex gap-3">
+              <Button label="Create Vault" onClick={createNewVault} />
+              {hasAccount && <Button label="Create Shared Vault" onClick={createNewSharedVault} />}
+            </div>
+          ) : (
+            <div className="mt-3.5">
+              <NoProSubscription
+                application={application}
+                text={<span>Please upgrade in order to increase your shared vault limit.</span>}
+              />
+            </div>
+          )}
+        </PreferencesSegment>
+      </PreferencesGroup>
     </PreferencesPane>
   )
 })