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

Jump to bottom

[Files] - Show current bucket decryption key #1534

Merged
merged 5 commits into from
Sep 17, 2021
Merged

[Files] - Show current bucket decryption key #1534

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60e178e
show current bucket decryption key
Tbaut Sep 16, 2021
4eff92f
Merge branch 'dev' into fix/tbaut-show-right-decryption-key
Tbaut Sep 16, 2021
d9a303d
lingui extract
actions-user Sep 16, 2021
d2106f4
Merge branch 'dev' into fix/tbaut-show-right-decryption-key
Tbaut Sep 17, 2021
cd6c9cc
Merge branch 'dev' into fix/tbaut-show-right-decryption-key
Tbaut Sep 17, 2021
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
5 changes: 2 additions & 3 deletions packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React, { useState, useEffect } from "react"
import CustomModal from "../../Elements/CustomModal"
import CustomButton from "../../Elements/CustomButton"
import { Trans } from "@lingui/macro"
import { FileFullInfo, useFiles } from "../../../Contexts/FilesContext"
import { FileFullInfo } from "../../../Contexts/FilesContext"
import {
Button,
formatBytes,
Expand Down Expand Up @@ -161,7 +161,6 @@ interface IFileInfoModuleProps {
const FileInfoModal = ({ filePath, close }: IFileInfoModuleProps) => {
const classes = useStyles()
const { filesApiClient } = useFilesApi()
const { personalEncryptionKey } = useFiles()
const [loadingFileInfo, setLoadingInfo] = useState(false)
const [fullFileInfo, setFullFullInfo] = useState<FileFullInfo | undefined>()
const { bucket } = useFileBrowser()
Expand Down Expand Up @@ -381,7 +380,7 @@ const FileInfoModal = ({ filePath, close }: IFileInfoModuleProps) => {
component="p"
>
<ToggleHiddenText hiddenLength={14}>
<span>{ personalEncryptionKey }</span>
<span>{bucket?.encryptionKey}</span>
</ToggleHiddenText>
</Typography>
</div>
Expand Down