- 
+ 
+
)
}
diff --git a/src/renderer/components/attachment/Attachment.tsx b/packages/frontend/src/components/attachment/Attachment.tsx
similarity index 97%
rename from src/renderer/components/attachment/Attachment.tsx
rename to packages/frontend/src/components/attachment/Attachment.tsx
index 937437caa8..476bb9acdf 100644
--- a/src/renderer/components/attachment/Attachment.tsx
+++ b/packages/frontend/src/components/attachment/Attachment.tsx
@@ -1,6 +1,6 @@
import mimeTypes from 'mime-types'
import { Type } from '../../backend-com'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
/* Section - Data Copied in part from Signal */
// Supported media types in google chrome
diff --git a/src/renderer/components/attachment/mediaAttachment.tsx b/packages/frontend/src/components/attachment/mediaAttachment.tsx
similarity index 98%
rename from src/renderer/components/attachment/mediaAttachment.tsx
rename to packages/frontend/src/components/attachment/mediaAttachment.tsx
index 72ddd614f3..7ef1692cac 100644
--- a/src/renderer/components/attachment/mediaAttachment.tsx
+++ b/packages/frontend/src/components/attachment/mediaAttachment.tsx
@@ -15,9 +15,9 @@ import {
} from './Attachment'
import Timestamp from '../conversations/Timestamp'
import { makeContextMenu, OpenContextMenu } from '../ContextMenu'
-import { runtime } from '../../runtime'
-import { getLogger } from '../../../shared/logger'
-import { truncateText } from '../../../shared/util'
+import { runtime } from '@deltachat-desktop/runtime-interface'
+import { getLogger } from '../../../../shared/logger'
+import { truncateText } from '@deltachat-desktop/shared/util'
import { selectedAccountId } from '../../ScreenController'
import ConfirmationDialog from '../dialogs/ConfirmationDialog'
import useDialog from '../../hooks/dialog/useDialog'
diff --git a/src/renderer/components/attachment/messageAttachment.tsx b/packages/frontend/src/components/attachment/messageAttachment.tsx
similarity index 98%
rename from src/renderer/components/attachment/messageAttachment.tsx
rename to packages/frontend/src/components/attachment/messageAttachment.tsx
index 30f18b5dcb..e89ca920c1 100644
--- a/src/renderer/components/attachment/messageAttachment.tsx
+++ b/packages/frontend/src/components/attachment/messageAttachment.tsx
@@ -12,9 +12,9 @@ import {
dragAttachmentOut,
MessageTypeAttachmentSubset,
} from './Attachment'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { ConversationType } from '../message/MessageList'
-import { getDirection } from '../../../shared/util'
+import { getDirection } from '../../utils/getDirection'
import { Type } from '../../backend-com'
import FullscreenMedia, {
NeighboringMediaMode,
diff --git a/src/renderer/components/chat/ChatList.tsx b/packages/frontend/src/components/chat/ChatList.tsx
similarity index 99%
rename from src/renderer/components/chat/ChatList.tsx
rename to packages/frontend/src/components/chat/ChatList.tsx
index 0a208fe270..31da3c0dc8 100644
--- a/src/renderer/components/chat/ChatList.tsx
+++ b/packages/frontend/src/components/chat/ChatList.tsx
@@ -43,7 +43,7 @@ import type {
ContactChatListItemData,
MessageChatListItemData,
} from './ChatListItemRow'
-import { isInviteLink } from '../../../shared/util'
+import { isInviteLink } from '../../../../shared/util'
const enum LoadStatus {
FETCHING = 1,
@@ -470,8 +470,7 @@ export default function ChatList(props: {
diff --git a/src/renderer/components/chat/ChatListContextMenu.tsx b/packages/frontend/src/components/chat/ChatListContextMenu.tsx
similarity index 99%
rename from src/renderer/components/chat/ChatListContextMenu.tsx
rename to packages/frontend/src/components/chat/ChatListContextMenu.tsx
index 60ebe6d61b..201fadc96f 100644
--- a/src/renderer/components/chat/ChatListContextMenu.tsx
+++ b/packages/frontend/src/components/chat/ChatListContextMenu.tsx
@@ -1,7 +1,7 @@
import React, { useContext, useState } from 'react'
import { C } from '@deltachat/jsonrpc-client'
-import { Timespans } from '../../../shared/constants'
+import { Timespans } from '../../../../shared/constants'
import { ContextMenuItem } from '../ContextMenu'
import MailingListProfile from '../dialogs/MessageListProfile'
import { BackendRemote } from '../../backend-com'
diff --git a/src/renderer/components/chat/ChatListHelpers.tsx b/packages/frontend/src/components/chat/ChatListHelpers.tsx
similarity index 98%
rename from src/renderer/components/chat/ChatListHelpers.tsx
rename to packages/frontend/src/components/chat/ChatListHelpers.tsx
index b70e3daeb7..5f5fc33350 100644
--- a/src/renderer/components/chat/ChatListHelpers.tsx
+++ b/packages/frontend/src/components/chat/ChatListHelpers.tsx
@@ -1,5 +1,5 @@
import { useState, useEffect, useMemo } from 'react'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import { debounce } from 'debounce'
import { BackendRemote, onDCEvent } from '../../backend-com'
import { selectedAccountId } from '../../ScreenController'
diff --git a/src/renderer/components/chat/ChatListItem.tsx b/packages/frontend/src/components/chat/ChatListItem.tsx
similarity index 97%
rename from src/renderer/components/chat/ChatListItem.tsx
rename to packages/frontend/src/components/chat/ChatListItem.tsx
index b52cf5bc87..a28a532d24 100644
--- a/src/renderer/components/chat/ChatListItem.tsx
+++ b/packages/frontend/src/components/chat/ChatListItem.tsx
@@ -6,11 +6,11 @@ import Timestamp from '../conversations/Timestamp'
import { Avatar } from '../Avatar'
import { Type, EffectfulBackendActions } from '../../backend-com'
import { mapCoreMsgStatus2String } from '../helpers/MapMsgStatus'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import { useContextMenuWithActiveState } from '../ContextMenu'
import { selectedAccountId } from '../../ScreenController'
import { InlineVerifiedIcon } from '../VerifiedIcon'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { message2React } from '../message/MessageMarkdown'
const log = getLogger('renderer/chatlist/item')
@@ -102,17 +102,17 @@ function Message({
{summaryPreviewImage && !iswebxdc && (
)}
{iswebxdc && lastMessageId && (
)}
@@ -174,7 +174,7 @@ function ChatListItemArchiveLink({
}`}
>
- 
+ 
+
{tx('chat_archived_chats_title')}
diff --git a/src/renderer/components/chat/ChatListItemRow.tsx b/packages/frontend/src/components/chat/ChatListItemRow.tsx
similarity index 100%
rename from src/renderer/components/chat/ChatListItemRow.tsx
rename to packages/frontend/src/components/chat/ChatListItemRow.tsx
diff --git a/src/renderer/components/composer/Composer.tsx b/packages/frontend/src/components/composer/Composer.tsx
similarity index 98%
rename from src/renderer/components/composer/Composer.tsx
rename to packages/frontend/src/components/composer/Composer.tsx
index 16638a747b..61ffb2311f 100644
--- a/src/renderer/components/composer/Composer.tsx
+++ b/packages/frontend/src/components/composer/Composer.tsx
@@ -10,7 +10,7 @@ import { C, T } from '@deltachat/jsonrpc-client'
import MenuAttachment from './menuAttachment'
import ComposerMessageInput from './ComposerMessageInput'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import { EmojiAndStickerPicker } from './EmojiAndStickerPicker'
import { replaceColonsSafe } from '../conversations/emoji'
import { Quote } from '../message/Message'
@@ -24,7 +24,7 @@ import {
} from '../../backend-com'
import { selectedAccountId } from '../../ScreenController'
import { MessageTypeAttachmentSubset } from '../attachment/Attachment'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { confirmDialog } from '../message/messageFunctions'
import { ProtectionBrokenDialog } from '../dialogs/ProtectionStatusDialog'
import useDialog from '../../hooks/dialog/useDialog'
@@ -239,18 +239,12 @@ const Composer = forwardRef<
const file = e.clipboardData.files[0]
log.debug(
- `paste: received file: "${file.path}" "${file.name}" ${file.type}`,
+ `paste: received file: "${file.name}" ${file.type}`,
e.clipboardData.files
)
const msgType: Viewtype = file.type.startsWith('image') ? 'Image' : 'File'
- // file.path is always set to empty string?
- if (file.path) {
- addFileToDraft(file.path, msgType)
- return
- }
-
try {
// Write clipboard to file then attach it to the draft
const path = await runtime.writeClipboardToTempFile()
diff --git a/src/renderer/components/composer/ComposerMessageInput.tsx b/packages/frontend/src/components/composer/ComposerMessageInput.tsx
similarity index 99%
rename from src/renderer/components/composer/ComposerMessageInput.tsx
rename to packages/frontend/src/components/composer/ComposerMessageInput.tsx
index 9a0d394e91..3c0318890f 100644
--- a/src/renderer/components/composer/ComposerMessageInput.tsx
+++ b/packages/frontend/src/components/composer/ComposerMessageInput.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import debounce from 'debounce'
import { ActionEmitter, KeybindAction } from '../../keybindings'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import { DialogContext } from '../../contexts/DialogContext'
const log = getLogger('renderer/composer/ComposerMessageInput')
diff --git a/src/renderer/components/composer/EmojiAndStickerPicker.tsx b/packages/frontend/src/components/composer/EmojiAndStickerPicker.tsx
similarity index 98%
rename from src/renderer/components/composer/EmojiAndStickerPicker.tsx
rename to packages/frontend/src/components/composer/EmojiAndStickerPicker.tsx
index df939b0a73..63d3072b79 100644
--- a/src/renderer/components/composer/EmojiAndStickerPicker.tsx
+++ b/packages/frontend/src/components/composer/EmojiAndStickerPicker.tsx
@@ -8,7 +8,7 @@ import classNames from 'classnames'
import { BackendRemote } from '../../backend-com'
import { selectedAccountId } from '../../ScreenController'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import EmojiPicker from '../EmojiPicker'
import Button from '../Button'
import useTranslationFunction from '../../hooks/useTranslationFunction'
diff --git a/src/renderer/components/composer/menuAttachment.tsx b/packages/frontend/src/components/composer/menuAttachment.tsx
similarity index 97%
rename from src/renderer/components/composer/menuAttachment.tsx
rename to packages/frontend/src/components/composer/menuAttachment.tsx
index 9934fdbf1f..7884260a6a 100644
--- a/src/renderer/components/composer/menuAttachment.tsx
+++ b/packages/frontend/src/components/composer/menuAttachment.tsx
@@ -1,10 +1,10 @@
import React, { useCallback, useContext } from 'react'
import { dirname } from 'path'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { useStore } from '../../stores/store'
import SettingsStoreInstance from '../../stores/settings'
-import { IMAGE_EXTENSIONS } from '../../../shared/constants'
+import { IMAGE_EXTENSIONS } from '../../../../shared/constants'
import useConfirmationDialog from '../../hooks/dialog/useConfirmationDialog'
import useTranslationFunction from '../../hooks/useTranslationFunction'
import useDialog from '../../hooks/dialog/useDialog'
diff --git a/src/renderer/components/composer/styles.module.scss b/packages/frontend/src/components/composer/styles.module.scss
similarity index 100%
rename from src/renderer/components/composer/styles.module.scss
rename to packages/frontend/src/components/composer/styles.module.scss
diff --git a/src/renderer/components/contact/Contact.tsx b/packages/frontend/src/components/contact/Contact.tsx
similarity index 100%
rename from src/renderer/components/contact/Contact.tsx
rename to packages/frontend/src/components/contact/Contact.tsx
diff --git a/src/renderer/components/contact/ContactList.tsx b/packages/frontend/src/components/contact/ContactList.tsx
similarity index 100%
rename from src/renderer/components/contact/ContactList.tsx
rename to packages/frontend/src/components/contact/ContactList.tsx
diff --git a/src/renderer/components/contact/ContactListItem.tsx b/packages/frontend/src/components/contact/ContactListItem.tsx
similarity index 100%
rename from src/renderer/components/contact/ContactListItem.tsx
rename to packages/frontend/src/components/contact/ContactListItem.tsx
diff --git a/src/renderer/components/conversations/Timestamp.tsx b/packages/frontend/src/components/conversations/Timestamp.tsx
similarity index 98%
rename from src/renderer/components/conversations/Timestamp.tsx
rename to packages/frontend/src/components/conversations/Timestamp.tsx
index 48fbba293c..99ac569e89 100644
--- a/src/renderer/components/conversations/Timestamp.tsx
+++ b/packages/frontend/src/components/conversations/Timestamp.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback } from 'react'
import classNames from 'classnames'
import moment from 'moment'
import formatRelativeTime from './formatRelativeTime'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
const log = getLogger('renderer/Component/Timestamp')
diff --git a/src/renderer/components/conversations/emoji.ts b/packages/frontend/src/components/conversations/emoji.ts
similarity index 97%
rename from src/renderer/components/conversations/emoji.ts
rename to packages/frontend/src/components/conversations/emoji.ts
index f2f0c35dfc..aedb40aa6e 100644
--- a/src/renderer/components/conversations/emoji.ts
+++ b/packages/frontend/src/components/conversations/emoji.ts
@@ -1,7 +1,7 @@
// @ts-ignore
// We only really need the emoji data of this module
import EmojiConvertor from 'emoji-js-clean'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import { count_emojis_if_only_contains_emoji } from '@deltachat/message_parser_wasm'
const log = getLogger('renderer/emoji')
diff --git a/src/renderer/components/conversations/formatRelativeTime.ts b/packages/frontend/src/components/conversations/formatRelativeTime.ts
similarity index 100%
rename from src/renderer/components/conversations/formatRelativeTime.ts
rename to packages/frontend/src/components/conversations/formatRelativeTime.ts
diff --git a/src/renderer/components/dialogs/About.tsx b/packages/frontend/src/components/dialogs/About.tsx
similarity index 95%
rename from src/renderer/components/dialogs/About.tsx
rename to packages/frontend/src/components/dialogs/About.tsx
index d851f4c999..5f2cbfc091 100644
--- a/src/renderer/components/dialogs/About.tsx
+++ b/packages/frontend/src/components/dialogs/About.tsx
@@ -1,11 +1,10 @@
import React, { useState, useEffect } from 'react'
import reactStringReplace from 'react-string-replace'
-import { getLogger } from '../../../shared/logger'
-import { gitHubUrl, gitHubLicenseUrl } from '../../../shared/constants'
-import { VERSION, GIT_REF } from '../../../shared/build-info'
+import { getLogger } from '../../../../shared/logger'
+import { gitHubUrl, gitHubLicenseUrl } from '../../../../shared/constants'
import ClickableLink from '../helpers/ClickableLink'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { BackendRemote } from '../../backend-com'
import { DialogBody, DialogContent, DialogWithHeader } from '../Dialog'
import useTranslationFunction from '../../hooks/useTranslationFunction'
@@ -114,6 +113,7 @@ export default function About({ onClose }: DialogProps) {
)
)
+ const { VERSION, GIT_REF } = runtime.getRuntimeInfo().buildInfo
return (
-
-
-
- {verifier && (
-
- )}
-
-
- )}
- {contact.lastSeen !== 0 && (
-
-
-
- )}
-
- {!isDeviceChat && (
-
- )}
-
- {statusText != '' && (
- <>
-
- {tx('pref_default_status_label')}
-
-
-
+
+ )}
+
+
+ {verifier && (
+
+ )}
+ {contact.lastSeen !== 0 && (
+
-
-
+
+
+
+ )}
+
+ {!isDeviceChat && (
+
)}
+ {statusText != '' && (
+ <>
+
+ {tx('pref_default_status_label')}
+
+
+
+
+
+
+ )}
{!(isDeviceChat || isSelfChat) && (
<>
{tx('profile_shared_chats')}
-
+
{({ width, height }) => (
'key' + chatListIds[index]}
itemHeight={CHATLISTITEM_CHAT_HEIGHT}
>
diff --git a/src/renderer/components/dialogs/ViewProfile/styles.module.scss b/packages/frontend/src/components/dialogs/ViewProfile/styles.module.scss
similarity index 56%
rename from src/renderer/components/dialogs/ViewProfile/styles.module.scss
rename to packages/frontend/src/components/dialogs/ViewProfile/styles.module.scss
index 4d6d2748cf..6ee656aa78 100644
--- a/src/renderer/components/dialogs/ViewProfile/styles.module.scss
+++ b/packages/frontend/src/components/dialogs/ViewProfile/styles.module.scss
@@ -6,5 +6,12 @@
.viewProfileDialogBody {
display: flex;
flex-direction: column;
- padding-bottom: 0.6px;
+ padding-bottom: 2px;
+}
+
+.statusText {
+ padding: 15px 15px;
+ color: var(--globalText);
+ white-space: pre-wrap;
+ overflow-y: scroll;
}
diff --git a/src/renderer/components/dialogs/WebxdcSendToChat/index.tsx b/packages/frontend/src/components/dialogs/WebxdcSendToChat/index.tsx
similarity index 98%
rename from src/renderer/components/dialogs/WebxdcSendToChat/index.tsx
rename to packages/frontend/src/components/dialogs/WebxdcSendToChat/index.tsx
index 17f551a30b..92837d4318 100644
--- a/src/renderer/components/dialogs/WebxdcSendToChat/index.tsx
+++ b/packages/frontend/src/components/dialogs/WebxdcSendToChat/index.tsx
@@ -10,7 +10,7 @@ import { useChatList } from '../../chat/ChatListHelpers'
import { useThemeCssVar } from '../../../ThemeManager'
import { BackendRemote } from '../../../backend-com'
import { selectedAccountId } from '../../../ScreenController'
-import { runtime } from '../../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import Dialog, {
DialogBody,
DialogFooter,
diff --git a/src/renderer/components/dialogs/WebxdcSendToChat/styles.module.scss b/packages/frontend/src/components/dialogs/WebxdcSendToChat/styles.module.scss
similarity index 100%
rename from src/renderer/components/dialogs/WebxdcSendToChat/styles.module.scss
rename to packages/frontend/src/components/dialogs/WebxdcSendToChat/styles.module.scss
diff --git a/src/renderer/components/helpers/ClickableLink.tsx b/packages/frontend/src/components/helpers/ClickableLink.tsx
similarity index 100%
rename from src/renderer/components/helpers/ClickableLink.tsx
rename to packages/frontend/src/components/helpers/ClickableLink.tsx
diff --git a/src/renderer/components/helpers/MapMsgStatus.ts b/packages/frontend/src/components/helpers/MapMsgStatus.ts
similarity index 92%
rename from src/renderer/components/helpers/MapMsgStatus.ts
rename to packages/frontend/src/components/helpers/MapMsgStatus.ts
index ec7cb5122f..527e570635 100644
--- a/src/renderer/components/helpers/MapMsgStatus.ts
+++ b/packages/frontend/src/components/helpers/MapMsgStatus.ts
@@ -1,5 +1,5 @@
import { C } from '@deltachat/jsonrpc-client'
-import { msgStatus } from '../../../shared/shared-types'
+import { msgStatus } from '../../types-app'
export function mapCoreMsgStatus2String(state: number): msgStatus {
switch (state) {
diff --git a/src/renderer/components/helpers/PseudoListItem.tsx b/packages/frontend/src/components/helpers/PseudoListItem.tsx
similarity index 100%
rename from src/renderer/components/helpers/PseudoListItem.tsx
rename to packages/frontend/src/components/helpers/PseudoListItem.tsx
diff --git a/src/renderer/components/helpers/SessionStorage.ts b/packages/frontend/src/components/helpers/SessionStorage.ts
similarity index 100%
rename from src/renderer/components/helpers/SessionStorage.ts
rename to packages/frontend/src/components/helpers/SessionStorage.ts
diff --git a/src/renderer/components/helpers/hooks.ts b/packages/frontend/src/components/helpers/hooks.ts
similarity index 100%
rename from src/renderer/components/helpers/hooks.ts
rename to packages/frontend/src/components/helpers/hooks.ts
diff --git a/src/renderer/components/message/EmptyChatMessage.tsx b/packages/frontend/src/components/message/EmptyChatMessage.tsx
similarity index 100%
rename from src/renderer/components/message/EmptyChatMessage.tsx
rename to packages/frontend/src/components/message/EmptyChatMessage.tsx
diff --git a/src/renderer/components/message/Link.tsx b/packages/frontend/src/components/message/Link.tsx
similarity index 97%
rename from src/renderer/components/message/Link.tsx
rename to packages/frontend/src/components/message/Link.tsx
index dd86e6ad90..7ceda653fb 100644
--- a/src/renderer/components/message/Link.tsx
+++ b/packages/frontend/src/components/message/Link.tsx
@@ -1,9 +1,9 @@
import React, { useContext, useState } from 'react'
import { DeltaCheckbox } from '../contact/ContactListItem'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import reactStringReplace from 'react-string-replace'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import Dialog, {
DialogBody,
DialogContent,
@@ -15,7 +15,7 @@ import useDialog from '../../hooks/dialog/useDialog'
import useOpenLinkSafely from '../../hooks/useOpenLinkSafely'
import useProcessQr from '../../hooks/useProcessQr'
import useTranslationFunction from '../../hooks/useTranslationFunction'
-import { isInviteLink } from '../../../shared/util'
+import { isInviteLink } from '@deltachat-desktop/shared/util'
import { MessagesDisplayContext } from '../../contexts/MessagesDisplayContext'
import { selectedAccountId } from '../../ScreenController'
diff --git a/src/renderer/components/message/Message.tsx b/packages/frontend/src/components/message/Message.tsx
similarity index 98%
rename from src/renderer/components/message/Message.tsx
rename to packages/frontend/src/components/message/Message.tsx
index 43b7bddc38..824c312f57 100644
--- a/src/renderer/components/message/Message.tsx
+++ b/packages/frontend/src/components/message/Message.tsx
@@ -18,10 +18,11 @@ import {
} from './messageFunctions'
import Attachment from '../attachment/messageAttachment'
import { isGenericAttachment } from '../attachment/Attachment'
-import { runtime } from '../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { AvatarFromContact } from '../Avatar'
import { ConversationType } from './MessageList'
-import { getDirection, truncateText } from '../../../shared/util'
+import { truncateText } from '@deltachat-desktop/shared/util'
+import { getDirection } from '../../utils/getDirection'
import { mapCoreMsgStatus2String } from '../helpers/MapMsgStatus'
import { ContextMenuItem } from '../ContextMenu'
import { onDCEvent, BackendRemote } from '../../backend-com'
@@ -479,8 +480,8 @@ export default function Message(props: {
className='verified-icon-info-msg'
src={
isProtectionBrokenMsg
- ? '../images/verified_broken.svg'
- : '../images/verified.svg'
+ ? './images/verified_broken.svg'
+ : './images/verified.svg'
}
/>
)}
diff --git a/src/renderer/components/message/MessageBody.tsx b/packages/frontend/src/components/message/MessageBody.tsx
similarity index 100%
rename from src/renderer/components/message/MessageBody.tsx
rename to packages/frontend/src/components/message/MessageBody.tsx
diff --git a/src/renderer/components/message/MessageList.tsx b/packages/frontend/src/components/message/MessageList.tsx
similarity index 99%
rename from src/renderer/components/message/MessageList.tsx
rename to packages/frontend/src/components/message/MessageList.tsx
index 558f714b7e..fb79cdb3d8 100644
--- a/src/renderer/components/message/MessageList.tsx
+++ b/packages/frontend/src/components/message/MessageList.tsx
@@ -13,7 +13,7 @@ import { C } from '@deltachat/jsonrpc-client'
import { debounce } from 'debounce'
import { MessageWrapper } from './MessageWrapper'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import { KeybindAction } from '../../keybindings'
import { useMessageList } from '../../stores/messagelist'
import { BackendRemote, onDCEvent } from '../../backend-com'
diff --git a/src/renderer/components/message/MessageListAndComposer.tsx b/packages/frontend/src/components/message/MessageListAndComposer.tsx
similarity index 75%
rename from src/renderer/components/message/MessageListAndComposer.tsx
rename to packages/frontend/src/components/message/MessageListAndComposer.tsx
index 71ea364694..111045dd82 100644
--- a/src/renderer/components/message/MessageListAndComposer.tsx
+++ b/packages/frontend/src/components/message/MessageListAndComposer.tsx
@@ -3,11 +3,11 @@ import { join, parse } from 'path'
import { Viewtype } from '@deltachat/jsonrpc-client/dist/generated/types'
import Composer, { useDraft } from '../composer/Composer'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import MessageList from './MessageList'
import ComposerMessageInput from '../composer/ComposerMessageInput'
-import { DesktopSettingsType } from '../../../shared/shared-types'
-import { runtime } from '../../runtime'
+import { DesktopSettingsType } from '../../../../shared/shared-types'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { RecoverableCrashScreen } from '../screens/RecoverableCrashScreen'
import { useSettingsStore } from '../../stores/settings'
import ConfirmSendingFiles from '../dialogs/ConfirmSendingFiles'
@@ -88,7 +88,7 @@ export default function MessageListAndComposer({ accountId, chat }: Props) {
messageInputRef
)
- const onDrop = (e: React.DragEvent) => {
+ const onDrop = async (e: React.DragEvent) => {
if (chat === null) {
log.warn('dropped something, but no chat is selected')
return
@@ -97,22 +97,18 @@ export default function MessageListAndComposer({ accountId, chat }: Props) {
e.preventDefault()
e.stopPropagation()
- const sanitizedFileList: Pick[] = []
+ const sanitizedFileList: File[] = []
{
- const fileList: FileList = (e.target as any).files || e.dataTransfer.files
- // TODO maybe add a clause here for windows because that uses backslash instead of slash
- const forbiddenPathRegEx = /DeltaChat\/.+?\.sqlite-blobs\//gi
+ const fileList: FileList =
+ /* (e.target as any).files */ e.dataTransfer.files
for (let i = 0; i < fileList.length; i++) {
- const { path, name, type } = fileList[i]
- // TODO filter out folders somehow
- // if that is possible without a backend call to check whether the file exists,
- // maybe some browser api like FileReader could help
- if (!forbiddenPathRegEx.test(path.replace('\\', '/'))) {
- sanitizedFileList.push({ path, name, type })
+ const file = fileList[i]
+ if (runtime.isDroppedFileFromOutside(file)) {
+ sanitizedFileList.push(file)
} else {
log.warn(
'Prevented a file from being send again while dragging it out',
- name
+ file.name
)
}
}
@@ -124,14 +120,47 @@ export default function MessageListAndComposer({ accountId, chat }: Props) {
return
}
+ function writeTempFileFromFile(file: File): Promise {
+ if (file.size > 1e8 /* 100mb */) {
+ log.warn(
+ `dropped file is bigger than 100mb ${file.name} ${file.size} ${file.type}`
+ )
+ }
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader()
+ reader.onload = _ => {
+ if (reader.result === null) {
+ return reject(new Error('result empty'))
+ } else if (typeof reader.result !== 'string') {
+ return reject(new Error('wrong type'))
+ }
+ const base64Content = reader.result.split(',')[1]
+ runtime
+ .writeTempFileFromBase64(file.name, base64Content)
+ .then(tempUrl => {
+ resolve(tempUrl)
+ })
+ .catch(err => {
+ reject(err)
+ })
+ }
+ reader.onerror = err => {
+ reject(err)
+ }
+ reader.readAsDataURL(file)
+ })
+ }
+
if (fileCount === 1) {
- log.debug(`dropped image of type ${sanitizedFileList[0].type}`)
- const msgViewType: Viewtype = sanitizedFileList[0].type.startsWith(
- 'image'
- )
+ const file = sanitizedFileList[0]
+ log.debug(`dropped image of type ${file.type}`)
+ const msgViewType: Viewtype = file.type.startsWith('image')
? 'Image'
: 'File'
- addFileToDraft(sanitizedFileList[0].path, msgViewType)
+
+ const path = await writeTempFileFromFile(sanitizedFileList[0])
+ await addFileToDraft(path, msgViewType)
+ await runtime.removeTempFile(path)
return
}
@@ -139,13 +168,20 @@ export default function MessageListAndComposer({ accountId, chat }: Props) {
openDialog(ConfirmSendingFiles, {
sanitizedFileList,
chatName: chat.name,
- onClick: (isConfirmed: boolean) => {
+ onClick: async (isConfirmed: boolean) => {
if (!isConfirmed) {
return
}
for (const file of sanitizedFileList) {
- sendMessage(accountId, chat.id, { file: file.path, viewtype: 'File' })
+ const path = await writeTempFileFromFile(file)
+ sendMessage(accountId, chat.id, {
+ file: path,
+ viewtype: 'File',
+ }).then(() => {
+ // start sending other files, don't wait until last file is sent
+ runtime.removeTempFile(path)
+ })
}
},
})
diff --git a/src/renderer/components/message/MessageMarkdown.tsx b/packages/frontend/src/components/message/MessageMarkdown.tsx
similarity index 99%
rename from src/renderer/components/message/MessageMarkdown.tsx
rename to packages/frontend/src/components/message/MessageMarkdown.tsx
index a364e6ec9a..582b6223a3 100644
--- a/src/renderer/components/message/MessageMarkdown.tsx
+++ b/packages/frontend/src/components/message/MessageMarkdown.tsx
@@ -6,7 +6,7 @@ import {
} from '@deltachat/message_parser_wasm/message_parser_wasm'
import { LabeledLink, Link } from './Link'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import { ActionEmitter, KeybindAction } from '../../keybindings'
import { BackendRemote } from '../../backend-com'
import { selectedAccountId } from '../../ScreenController'
diff --git a/src/renderer/components/message/MessageMetaData.tsx b/packages/frontend/src/components/message/MessageMetaData.tsx
similarity index 97%
rename from src/renderer/components/message/MessageMetaData.tsx
rename to packages/frontend/src/components/message/MessageMetaData.tsx
index a5b48c8266..c06ffbbfbc 100644
--- a/src/renderer/components/message/MessageMetaData.tsx
+++ b/packages/frontend/src/components/message/MessageMetaData.tsx
@@ -4,7 +4,7 @@ import { T } from '@deltachat/jsonrpc-client'
import Timestamp from '../conversations/Timestamp'
import { isImage, isVideo } from '../attachment/Attachment'
-import { msgStatus } from '../../../shared/shared-types'
+import { msgStatus } from '../../types-app'
import useTranslationFunction from '../../hooks/useTranslationFunction'
type Props = {
diff --git a/src/renderer/components/message/MessageWrapper.tsx b/packages/frontend/src/components/message/MessageWrapper.tsx
similarity index 97%
rename from src/renderer/components/message/MessageWrapper.tsx
rename to packages/frontend/src/components/message/MessageWrapper.tsx
index ba6a0b360f..d578035982 100644
--- a/src/renderer/components/message/MessageWrapper.tsx
+++ b/packages/frontend/src/components/message/MessageWrapper.tsx
@@ -3,7 +3,7 @@ import { C } from '@deltachat/jsonrpc-client'
import Message from './Message'
import { ConversationType } from './MessageList'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../../shared/logger'
import type { T } from '@deltachat/jsonrpc-client'
diff --git a/src/renderer/components/message/VCard.tsx b/packages/frontend/src/components/message/VCard.tsx
similarity index 100%
rename from src/renderer/components/message/VCard.tsx
rename to packages/frontend/src/components/message/VCard.tsx
diff --git a/src/renderer/components/message/messageFunctions.ts b/packages/frontend/src/components/message/messageFunctions.ts
similarity index 97%
rename from src/renderer/components/message/messageFunctions.ts
rename to packages/frontend/src/components/message/messageFunctions.ts
index d8eb04b1b2..d8ece5a9b1 100644
--- a/src/renderer/components/message/messageFunctions.ts
+++ b/packages/frontend/src/components/message/messageFunctions.ts
@@ -1,7 +1,7 @@
import moment from 'moment'
-import { getLogger } from '../../../shared/logger'
-import { runtime } from '../../runtime'
+import { getLogger } from '../../../../shared/logger'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import { BackendRemote, Type } from '../../backend-com'
import { selectedAccountId } from '../../ScreenController'
import { internalOpenWebxdc } from '../../system-integration/webxdc'
diff --git a/src/renderer/components/message/styles.module.scss b/packages/frontend/src/components/message/styles.module.scss
similarity index 100%
rename from src/renderer/components/message/styles.module.scss
rename to packages/frontend/src/components/message/styles.module.scss
diff --git a/src/renderer/components/screens/AccountDeletionScreen/AccountDeletionScreen.tsx b/packages/frontend/src/components/screens/AccountDeletionScreen/AccountDeletionScreen.tsx
similarity index 98%
rename from src/renderer/components/screens/AccountDeletionScreen/AccountDeletionScreen.tsx
rename to packages/frontend/src/components/screens/AccountDeletionScreen/AccountDeletionScreen.tsx
index 066bb9ac2f..3eff924eb3 100644
--- a/src/renderer/components/screens/AccountDeletionScreen/AccountDeletionScreen.tsx
+++ b/packages/frontend/src/components/screens/AccountDeletionScreen/AccountDeletionScreen.tsx
@@ -16,7 +16,7 @@ import { T } from '@deltachat/jsonrpc-client'
import { BackendRemote } from '../../../backend-com'
import { Screens } from '../../../ScreenController'
import { avatarInitial } from '../../Avatar'
-import { getLogger } from '../../../../shared/logger'
+import { getLogger } from '../../../../../shared/logger'
import ImageBackdrop from '../../ImageBackdrop'
const log = getLogger('AccountDeletionScreen')
diff --git a/src/renderer/components/screens/AccountDeletionScreen/styles.module.scss b/packages/frontend/src/components/screens/AccountDeletionScreen/styles.module.scss
similarity index 100%
rename from src/renderer/components/screens/AccountDeletionScreen/styles.module.scss
rename to packages/frontend/src/components/screens/AccountDeletionScreen/styles.module.scss
diff --git a/src/renderer/components/screens/AccountSetupScreen.tsx b/packages/frontend/src/components/screens/AccountSetupScreen.tsx
similarity index 98%
rename from src/renderer/components/screens/AccountSetupScreen.tsx
rename to packages/frontend/src/components/screens/AccountSetupScreen.tsx
index 5ebf751b80..ec7f9bfb36 100644
--- a/src/renderer/components/screens/AccountSetupScreen.tsx
+++ b/packages/frontend/src/components/screens/AccountSetupScreen.tsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect, useCallback } from 'react'
-import { Credentials } from '../../../shared/shared-types'
+import { Credentials } from '../../types-app'
import ImageBackdrop from '../ImageBackdrop'
import LoginForm, {
defaultCredentials,
diff --git a/src/renderer/components/screens/CrashScreen.tsx b/packages/frontend/src/components/screens/CrashScreen.tsx
similarity index 91%
rename from src/renderer/components/screens/CrashScreen.tsx
rename to packages/frontend/src/components/screens/CrashScreen.tsx
index 33c3226371..e9e5143228 100644
--- a/src/renderer/components/screens/CrashScreen.tsx
+++ b/packages/frontend/src/components/screens/CrashScreen.tsx
@@ -1,8 +1,7 @@
import React from 'react'
-import { runtime } from '../../runtime'
-import { VERSION, GIT_REF } from '../../../shared/build-info'
-import { getLogger } from '../../../shared/logger'
+import { runtime } from '@deltachat-desktop/runtime-interface'
+import { getLogger } from '../../../../shared/logger'
import { DialogContext } from '../../contexts/DialogContext'
const log = getLogger('renderer/react-crashhandler')
@@ -34,6 +33,7 @@ export class CrashScreen extends React.Component {
render() {
if (this.state.hasError) {
+ const { VERSION, GIT_REF } = runtime.getRuntimeInfo().buildInfo
return (
Ooops something crashed
diff --git a/src/renderer/components/screens/MainScreen.tsx b/packages/frontend/src/components/screens/MainScreen.tsx similarity index 100% rename from src/renderer/components/screens/MainScreen.tsx rename to packages/frontend/src/components/screens/MainScreen.tsx diff --git a/src/renderer/components/screens/NoAccountSelectedScreen/NoAccountSelectedScreen.tsx b/packages/frontend/src/components/screens/NoAccountSelectedScreen/NoAccountSelectedScreen.tsx similarity index 100% rename from src/renderer/components/screens/NoAccountSelectedScreen/NoAccountSelectedScreen.tsx rename to packages/frontend/src/components/screens/NoAccountSelectedScreen/NoAccountSelectedScreen.tsx diff --git a/src/renderer/components/screens/NoAccountSelectedScreen/styles.module.scss b/packages/frontend/src/components/screens/NoAccountSelectedScreen/styles.module.scss similarity index 84% rename from src/renderer/components/screens/NoAccountSelectedScreen/styles.module.scss rename to packages/frontend/src/components/screens/NoAccountSelectedScreen/styles.module.scss index cab0d3e217..b12be217a1 100644 --- a/src/renderer/components/screens/NoAccountSelectedScreen/styles.module.scss +++ b/packages/frontend/src/components/screens/NoAccountSelectedScreen/styles.module.scss @@ -4,7 +4,7 @@ .background { background-size: cover; - background-image: url('../images/backgrounds/petito-moreno.webp'); + background-image: url('./images/backgrounds/petito-moreno.webp'); height: 100vh; margin-top: 0px; diff --git a/src/renderer/components/screens/RecoverableCrashScreen.tsx b/packages/frontend/src/components/screens/RecoverableCrashScreen.tsx similarity index 93% rename from src/renderer/components/screens/RecoverableCrashScreen.tsx rename to packages/frontend/src/components/screens/RecoverableCrashScreen.tsx index f34be2209c..28a8568003 100644 --- a/src/renderer/components/screens/RecoverableCrashScreen.tsx +++ b/packages/frontend/src/components/screens/RecoverableCrashScreen.tsx @@ -1,8 +1,7 @@ import React from 'react' -import { runtime } from '../../runtime' -import { VERSION, GIT_REF } from '../../../shared/build-info' -import { getLogger } from '../../../shared/logger' +import { runtime } from '@deltachat-desktop/runtime-interface' +import { getLogger } from '../../../../shared/logger' import { DialogContext } from '../../contexts/DialogContext' const log = getLogger('renderer/react-crashhandler') @@ -57,6 +56,7 @@ export class RecoverableCrashScreen extends React.Component<{ this.state.hasError && this.state.old_error_reset_key === this.props.reset_on_change_key ) { + const { VERSION, GIT_REF } = runtime.getRuntimeInfo().buildInfo return (
{this.props.reset_on_change_key}:{this.state.timestamp}
diff --git a/src/renderer/components/screens/WelcomeScreen/AdditionalActionInfo.tsx b/packages/frontend/src/components/screens/WelcomeScreen/AdditionalActionInfo.tsx
similarity index 100%
rename from src/renderer/components/screens/WelcomeScreen/AdditionalActionInfo.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/AdditionalActionInfo.tsx
diff --git a/src/renderer/components/screens/WelcomeScreen/AlternativeSetupsDialog.tsx b/packages/frontend/src/components/screens/WelcomeScreen/AlternativeSetupsDialog.tsx
similarity index 97%
rename from src/renderer/components/screens/WelcomeScreen/AlternativeSetupsDialog.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/AlternativeSetupsDialog.tsx
index cac23f4874..5e2308de5f 100644
--- a/src/renderer/components/screens/WelcomeScreen/AlternativeSetupsDialog.tsx
+++ b/packages/frontend/src/components/screens/WelcomeScreen/AlternativeSetupsDialog.tsx
@@ -11,7 +11,7 @@ import {
LastUsedSlot,
rememberLastUsedPath,
} from '../../../utils/lastUsedPaths'
-import { runtime } from '../../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import styles from './styles.module.scss'
diff --git a/src/renderer/components/screens/WelcomeScreen/ImportBackupProgressDialog.tsx b/packages/frontend/src/components/screens/WelcomeScreen/ImportBackupProgressDialog.tsx
similarity index 97%
rename from src/renderer/components/screens/WelcomeScreen/ImportBackupProgressDialog.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/ImportBackupProgressDialog.tsx
index ca8f4e51da..2249b86db8 100644
--- a/src/renderer/components/screens/WelcomeScreen/ImportBackupProgressDialog.tsx
+++ b/packages/frontend/src/components/screens/WelcomeScreen/ImportBackupProgressDialog.tsx
@@ -5,7 +5,7 @@ import useTranslationFunction from '../../../hooks/useTranslationFunction'
import { BackendRemote } from '../../../backend-com'
import { DeltaProgressBar } from '../../Login-Styles'
import { DialogBody, DialogContent, DialogWithHeader } from '../../Dialog'
-import { getLogger } from '../../../../shared/logger'
+import { getLogger } from '../../../../../shared/logger'
import { selectedAccountId } from '../../../ScreenController'
import type { DcEventType } from '@deltachat/jsonrpc-client'
diff --git a/src/renderer/components/screens/WelcomeScreen/InstantOnboardingScreen.tsx b/packages/frontend/src/components/screens/WelcomeScreen/InstantOnboardingScreen.tsx
similarity index 100%
rename from src/renderer/components/screens/WelcomeScreen/InstantOnboardingScreen.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/InstantOnboardingScreen.tsx
diff --git a/src/renderer/components/screens/WelcomeScreen/OnboardingScreen.tsx b/packages/frontend/src/components/screens/WelcomeScreen/OnboardingScreen.tsx
similarity index 96%
rename from src/renderer/components/screens/WelcomeScreen/OnboardingScreen.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/OnboardingScreen.tsx
index b477530cb0..06259187bf 100644
--- a/src/renderer/components/screens/WelcomeScreen/OnboardingScreen.tsx
+++ b/packages/frontend/src/components/screens/WelcomeScreen/OnboardingScreen.tsx
@@ -7,7 +7,7 @@ import useDialog from '../../../hooks/dialog/useDialog'
import useTranslationFunction from '../../../hooks/useTranslationFunction'
import { BackendRemote, EffectfulBackendActions } from '../../../backend-com'
import { DialogBody, DialogContent, DialogHeader } from '../../Dialog'
-import { getLogger } from '../../../../shared/logger'
+import { getLogger } from '../../../../../shared/logger'
import styles from './styles.module.scss'
@@ -71,7 +71,7 @@ export default function OnboardingScreen(props: Props) {
{tx('welcome_chat_over_email')}
diff --git a/src/renderer/components/screens/WelcomeScreen/UseOtherServerDialog.tsx b/packages/frontend/src/components/screens/WelcomeScreen/UseOtherServerDialog.tsx
similarity index 97%
rename from src/renderer/components/screens/WelcomeScreen/UseOtherServerDialog.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/UseOtherServerDialog.tsx
index ec0b83a7b1..fe515faf81 100644
--- a/src/renderer/components/screens/WelcomeScreen/UseOtherServerDialog.tsx
+++ b/packages/frontend/src/components/screens/WelcomeScreen/UseOtherServerDialog.tsx
@@ -7,7 +7,7 @@ import useDialog from '../../../hooks/dialog/useDialog'
import useTranslationFunction from '../../../hooks/useTranslationFunction'
import { ScreenContext } from '../../../contexts/ScreenContext'
import { Screens } from '../../../ScreenController'
-import { runtime } from '../../../runtime'
+import { runtime } from '@deltachat-desktop/runtime-interface'
import styles from './styles.module.scss'
diff --git a/src/renderer/components/screens/WelcomeScreen/UserAgreement.tsx b/packages/frontend/src/components/screens/WelcomeScreen/UserAgreement.tsx
similarity index 100%
rename from src/renderer/components/screens/WelcomeScreen/UserAgreement.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/UserAgreement.tsx
diff --git a/src/renderer/components/screens/WelcomeScreen/chatmailInstances.ts b/packages/frontend/src/components/screens/WelcomeScreen/chatmailInstances.ts
similarity index 100%
rename from src/renderer/components/screens/WelcomeScreen/chatmailInstances.ts
rename to packages/frontend/src/components/screens/WelcomeScreen/chatmailInstances.ts
diff --git a/src/renderer/components/screens/WelcomeScreen/index.tsx b/packages/frontend/src/components/screens/WelcomeScreen/index.tsx
similarity index 100%
rename from src/renderer/components/screens/WelcomeScreen/index.tsx
rename to packages/frontend/src/components/screens/WelcomeScreen/index.tsx
diff --git a/src/renderer/components/screens/WelcomeScreen/styles.module.scss b/packages/frontend/src/components/screens/WelcomeScreen/styles.module.scss
similarity index 100%
rename from src/renderer/components/screens/WelcomeScreen/styles.module.scss
rename to packages/frontend/src/components/screens/WelcomeScreen/styles.module.scss
diff --git a/src/renderer/contexts.ts b/packages/frontend/src/contexts.ts
similarity index 100%
rename from src/renderer/contexts.ts
rename to packages/frontend/src/contexts.ts
diff --git a/src/renderer/contexts/ChatContext.tsx b/packages/frontend/src/contexts/ChatContext.tsx
similarity index 100%
rename from src/renderer/contexts/ChatContext.tsx
rename to packages/frontend/src/contexts/ChatContext.tsx
diff --git a/src/renderer/contexts/ContextMenuContext.tsx b/packages/frontend/src/contexts/ContextMenuContext.tsx
similarity index 100%
rename from src/renderer/contexts/ContextMenuContext.tsx
rename to packages/frontend/src/contexts/ContextMenuContext.tsx
diff --git a/src/renderer/contexts/DialogContext.tsx b/packages/frontend/src/contexts/DialogContext.tsx
similarity index 100%
rename from src/renderer/contexts/DialogContext.tsx
rename to packages/frontend/src/contexts/DialogContext.tsx
diff --git a/src/renderer/contexts/I18nContext.tsx b/packages/frontend/src/contexts/I18nContext.tsx
similarity index 65%
rename from src/renderer/contexts/I18nContext.tsx
rename to packages/frontend/src/contexts/I18nContext.tsx
index 0b7a2212a5..5f52da8343 100644
--- a/src/renderer/contexts/I18nContext.tsx
+++ b/packages/frontend/src/contexts/I18nContext.tsx
@@ -1,5 +1,5 @@
import { createContext } from 'react'
-import { getMessageFunction } from '../../shared/localize'
+import { getMessageFunction } from '../../../shared/localize'
export const I18nContext = createContext