Merge branch 'development' of github.com:esteemapp/ecency-vision into…

… development
ecency · Jan 17, 2024 · 5f652e4 · 5f652e4
2 parents 9604c01 + 699c2b4
commit 5f652e4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/src/common/components/login/index.tsx b/src/common/components/login/index.tsx
@@ -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>
@@ -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>
       </>
     );

diff --git a/src/common/components/rc-delegations-list/index.tsx b/src/common/components/rc-delegations-list/index.tsx
@@ -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>

diff --git a/src/common/components/rc-info/index.tsx b/src/common/components/rc-info/index.tsx
@@ -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}

diff --git a/src/common/features/chats/components/chat-input.tsx b/src/common/features/chats/components/chat-input.tsx
@@ -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([]);