merge fixes

actualbudget · Nov 8, 2024 · d4b0e49 · d4b0e49
1 parent 906ed5e
commit d4b0e49
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 46 deletions.
diff --git a/packages/desktop-client/src/components/FinancesApp.tsx b/packages/desktop-client/src/components/FinancesApp.tsx
@@ -36,9 +36,9 @@ import { ManagePayeesPage } from './payees/ManagePayeesPage';
 import { Reports } from './reports';
 import { LoadingIndicator } from './reports/LoadingIndicator';
 import { NarrowAlternate, WideComponent } from './responsive';
+import { useResponsive } from './responsive/ResponsiveProvider';
 import { UserDirectoryPage } from './responsive/wide';
 import { useMultiuserEnabled } from './ServerContext';
-import { useResponsive } from './responsive/ResponsiveProvider';
 import { Settings } from './settings';
 import { FloatableSidebar } from './sidebar';
 import { Titlebar } from './Titlebar';

diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
@@ -54,8 +54,8 @@ import { ImportYNAB5Modal } from './modals/manager/ImportYNAB5Modal';
 import { ManageRulesModal } from './modals/ManageRulesModal';
 import { MergeUnusedPayeesModal } from './modals/MergeUnusedPayeesModal';
 import { NotesModal } from './modals/NotesModal';
-import { OutOfSyncMigrationsModal } from './modals/OutOfSyncMigrationsModal';
 import { OpenIDEnableModal } from './modals/OpenIDEnableModal';
+import { OutOfSyncMigrationsModal } from './modals/OutOfSyncMigrationsModal';
 import { PasswordEnableModal } from './modals/PasswordEnableModal';
 import { PayeeAutocompleteModal } from './modals/PayeeAutocompleteModal';
 import { ScheduledTransactionMenuModal } from './modals/ScheduledTransactionMenuModal';
@@ -640,33 +640,6 @@ export function Modals() {
         case 'enable-password-auth':
           return <PasswordEnableModal key={name} onSave={options.onSave} />;
 
-        case 'edit-access':
-          return (
-            <EditUserAccess
-              key={name}
-              defaultUserAccess={options.access}
-              onSave={options.onSave}
-            />
-          );
-
-        case 'edit-user':
-          return (
-            <EditUserFinanceApp
-              key={name}
-              defaultUser={options.user}
-              onSave={options.onSave}
-            />
-          );
-
-        case 'transfer-ownership':
-          return <TransferOwnership key={name} onSave={options.onSave} />;
-
-        case 'enable-openid':
-          return <OpenIDEnableModal key={name} onSave={options.onSave} />;
-
-        case 'enable-password-auth':
-          return <PasswordEnableModal key={name} onSave={options.onSave} />;
-
         default:
           throw new Error('Unknown modal');
       }

diff --git a/packages/desktop-client/src/components/common/SimpleTable.tsx b/packages/desktop-client/src/components/common/SimpleTable.tsx
@@ -6,7 +6,6 @@ import React, {
   type CSSProperties,
 } from 'react';
 
-
 import { View } from './View';
 
 type SimpleTableProps = {

diff --git a/packages/desktop-client/src/components/manager/BudgetList.tsx b/packages/desktop-client/src/components/manager/BudgetList.tsx
@@ -288,20 +288,20 @@ function FileItem({
       >
         <View
           title={getFileDescription(file, t) || ''}
-          style={{ alignItems: 'flex-start', width: '100%' }}>
-        <View style={{ flexDirection: 'row', width: '100%' }}
+          style={{ alignItems: 'flex-start', width: '100%' }}
         >
+          <View style={{ flexDirection: 'row', width: '100%' }}>
             <Text style={{ fontSize: 16, fontWeight: 700 }}>{file.name}</Text>
-          {multiuserEnabled && (
-            <UserAccessForFile
-              fileId={(file as RemoteFile).cloudFileId}
-              currentUserId={currentUserId}
-            />
-          )}
-        </View>
+            {multiuserEnabled && (
+              <UserAccessForFile
+                fileId={(file as RemoteFile).cloudFileId}
+                currentUserId={currentUserId}
+              />
+            )}
+          </View>
 
-        <FileState file={file} currentUserId={currentUserId} />
-      </View>
+          <FileState file={file} currentUserId={currentUserId} />
+        </View>
 
         <View
           style={{

diff --git a/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.tsx b/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.tsx
@@ -148,4 +148,3 @@ export function ConfirmOldPasswordForm({ buttons, onSetPassword }) {
     </View>
   );
 }
-
diff --git a/packages/desktop-client/src/components/manager/subscribe/Login.tsx b/packages/desktop-client/src/components/manager/subscribe/Login.tsx
@@ -255,10 +255,10 @@ export function Login() {
           }}
         >
           <Trans>
-          If you lost your password, you likely still have access to your server
-            to manually reset it.
+            If you lost your password, you likely still have access to your
+            server to manually reset it.
           </Trans>
-      </Text>
+        </Text>
       )}
 
       {loginMethods.length > 1 && (

diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsx
@@ -23,8 +23,8 @@ import { Page } from '../Page';
 import { useResponsive } from '../responsive/ResponsiveProvider';
 import { useServerVersion } from '../ServerContext';
 
-import { Backups } from './Backups';
 import { AuthSettings } from './AuthSettings';
+import { Backups } from './Backups';
 import { BudgetTypeSettings } from './BudgetTypeSettings';
 import { EncryptionSettings } from './Encryption';
 import { ExperimentalFeatures } from './Experimental';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,4 +148,3 @@ export function ConfirmOldPasswordForm({ buttons, onSetPassword }) {
		</View>
		);
		}