Skip to content
This repository has been archived by the owner on Jan 15, 2025. It is now read-only.

Bugfix/different bugfixes #1532

Merged
merged 3 commits into from
Jan 15, 2024
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
1 change: 0 additions & 1 deletion src/common/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import { UIManager } from "@ui/core";
import defaults from "./constants/defaults.json";
import { getAccessToken } from "./helper/user-token";


// Define lazy pages
const ProfileContainer = loadable(() => import("./pages/profile-functional"));
const ProfilePage = (props: any) => <ProfileContainer {...props} />;
Expand Down
18 changes: 10 additions & 8 deletions src/common/components/login/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export class LoginKc extends BaseComponent<LoginKcProps, LoginKcState> {

return (
<>
<div className="dialog-header">
<div className="dialog-header flex flex-col items-center justify-center">
<img src={keyChainLogo} alt="Logo" />
<h2>{_t("login.with-keychain")}</h2>
</div>
Expand All @@ -182,13 +182,15 @@ export class LoginKc extends BaseComponent<LoginKcProps, LoginKcState> {
onKeyDown={this.inputKeyDown}
/>
</div>
<Button disabled={inProgress} className="block" onClick={this.login}>
{inProgress && spinner}
{_t("g.login")}
</Button>
<Button outline={true} className="block" disabled={inProgress} onClick={this.back}>
{_t("g.back")}
</Button>
<div className="flex items-center justify-center gap-4">
<Button disabled={inProgress} className="block" onClick={this.login}>
{inProgress && spinner}
{_t("g.login")}
</Button>
<Button outline={true} className="block" disabled={inProgress} onClick={this.back}>
{_t("g.back")}
</Button>
</div>
</Form>
</>
);
Expand Down
11 changes: 1 addition & 10 deletions src/common/components/rc-delegations-list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -210,16 +210,7 @@ export const ConfirmDelete = (props: any) => {
const { to, activeUser, hideConfirmDelete } = props;
return (
<>
<div
className="container"
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
width: "25%",
flexDirection: "column"
}}
>
<div className="container">
<h5 className="text" style={{ width: "350px", alignSelf: "center" }}>
{_t("rc-info.confirm-delete")}
</h5>
Expand Down
2 changes: 1 addition & 1 deletion src/common/components/rc-info/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export const ResourceCreditsInfo = (props: any) => {
<ModalHeader thin={true} closeButton={true}>
<ModalTitle />
</ModalHeader>
<ModalBody>
<ModalBody className="border rounded-2xl">
<ConfirmDelete
activeUser={activeUser}
to={toFromList}
Expand Down
4 changes: 2 additions & 2 deletions src/common/features/chats/components/chat-input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ export default function ChatInput({ currentChannel, currentContact }: Props) {
}, [isCommunity, isCurrentUser]);

const submit = async () => {
if (isDisabled || isSendMessageLoading || isFilesUploading || !message) {
const nextMessage = buildImages(message);
if (isDisabled || isSendMessageLoading || isFilesUploading || !nextMessage) {
return;
}
const nextMessage = buildImages(message);
await sendMessage(nextMessage);
setFiles([]);
setUploadedFileLinks([]);
Expand Down