Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/rust-tauri-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
with:
toolchain: 1.88
toolchain: 1.89
components: rustfmt
- run: cargo fmt --all -- --check

Expand All @@ -53,7 +53,7 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
with:
toolchain: 1.88
toolchain: 1.89
components: clippy
cache: false
- name: fake html dist dir to make it build
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
with:
toolchain: 1.88
toolchain: 1.89
- name: fake html dist dir to make it build
run: |
mkdir packages/target-tauri/html-dist
Expand Down
133 changes: 117 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions packages/frontend/src/components/Settings/Advanced.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { useEffect, useState, useCallback } from 'react'

import type { SettingsStoreState } from '../../stores/settings'
import { ExperimentalFeatures } from './ExperimentalFeatures'
import ImapFolderHandling from './ImapFolderHandling'
import SettingsHeading from './SettingsHeading'
import SettingsSeparator from './SettingsSeparator'
import useTranslationFunction from '../../hooks/useTranslationFunction'
Expand All @@ -21,13 +19,12 @@ import { DialogProps } from '../../contexts/DialogContext'
import { getLogger } from '../../../../shared/logger'

type Props = {
settingsStore: SettingsStoreState
onClose: DialogProps['onClose']
}

const log = getLogger('renderer/settings/advanced')

export default function Advanced({ onClose, settingsStore }: Props) {
export default function Advanced({ onClose }: Props) {
const tx = useTranslationFunction()
const { openDialog } = useDialog()
const openProxySettings = () => {
Expand Down Expand Up @@ -105,14 +102,6 @@ export default function Advanced({ onClose, settingsStore }: Props) {
<SettingsAutoStart />
</>
)}

{settingsStore.settings.is_chatmail === '0' && (
<>
<SettingsSeparator />
<SettingsHeading>Legacy Options</SettingsHeading>
<ImapFolderHandling settingsStore={settingsStore} />
</>
)}
</>
)
}
Expand Down
Loading
Loading