Merge pull request #1683 from TryQuiet/bug/1678

bug/1678
TryQuiet · Aug 1, 2023 · f0d23e2 · f0d23e2
2 parents 5abbd97 + a9cda45
commit f0d23e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/mobile/src/components/Chat/Chat.component.tsx b/packages/mobile/src/components/Chat/Chat.component.tsx
@@ -170,22 +170,25 @@ export const Chat: FC<ChatProps & FileActionsProps> = ({
             <View
               style={{
                 flexDirection: 'row',
+                width: '100%',
               }}
             >
               <Input
                 ref={messageInputRef}
                 onChangeText={onInputTextChange}
                 placeholder={`Message #${channel?.name}`}
                 multiline={true}
-                wrapperStyle={{ flexGrow: 1 }}
+                wrapperStyle={{ width: didKeyboardShow || areFilesUploaded ? '75%' : '85%' }}
                 disabled={!ready}
               />
+
               <View
                 style={{
                   paddingLeft: 10,
                   paddingRight: 10,
                   gap: 5,
                   flexDirection: 'row',
+                  width: didKeyboardShow || areFilesUploaded ? '25%' : '15%',
                 }}
               >
                 <AttachmentButton onPress={openAttachments} />

diff --git a/packages/mobile/src/components/Chat/Chat.test.tsx b/packages/mobile/src/components/Chat/Chat.test.tsx
@@ -3318,13 +3318,14 @@ describe('Chat component', () => {
                 style={
                   {
                     "flexDirection": "row",
+                    "width": "100%",
                   }
                 }
               >
                 <View
                   style={
                     {
-                      "flexGrow": 1,
+                      "width": "85%",
                     }
                   }
                 >
@@ -3399,6 +3400,7 @@ describe('Chat component', () => {
                       "gap": 5,
                       "paddingLeft": 10,
                       "paddingRight": 10,
+                      "width": "15%",
                     }
                   }
                 >
@@ -3772,13 +3774,14 @@ describe('Chat component', () => {
                 style={
                   {
                     "flexDirection": "row",
+                    "width": "100%",
                   }
                 }
               >
                 <View
                   style={
                     {
-                      "flexGrow": 1,
+                      "width": "75%",
                     }
                   }
                 >
@@ -3853,6 +3856,7 @@ describe('Chat component', () => {
                       "gap": 5,
                       "paddingLeft": 10,
                       "paddingRight": 10,
+                      "width": "25%",
                     }
                   }
                 >