From 7f3a9028a0c210071d14564d579da29d7b8fc65b Mon Sep 17 00:00:00 2001 From: GuillemGarciaDev Date: Thu, 7 Sep 2023 08:25:05 +0200 Subject: [PATCH 1/2] fix: ActivityCard layout --- src/config/config.dev.json | 2 +- .../core/ActivityCard/ActivityCard.styles.ts | 1 - .../core/ActivityCard/ActivityCard.tsx | 35 +++++++++---------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/config/config.dev.json b/src/config/config.dev.json index d24e76b9..2d70ee9b 100644 --- a/src/config/config.dev.json +++ b/src/config/config.dev.json @@ -1,5 +1,5 @@ { "enableMainnet": true, "enableSignerApp": true, - "signerUrl": "http://localhost:3001" + "signerUrl": "http://192.168.1.55:3001" } diff --git a/src/module/activity/core/ActivityCard/ActivityCard.styles.ts b/src/module/activity/core/ActivityCard/ActivityCard.styles.ts index 860eb6f9..4c4086de 100644 --- a/src/module/activity/core/ActivityCard/ActivityCard.styles.ts +++ b/src/module/activity/core/ActivityCard/ActivityCard.styles.ts @@ -4,7 +4,6 @@ import { ChevronRightIcon } from "icons"; export const ActivityCardRoot = styled(Row)(() => ({ height: 92, - justifyContent: "space-between", alignItems: "center", })); diff --git a/src/module/activity/core/ActivityCard/ActivityCard.tsx b/src/module/activity/core/ActivityCard/ActivityCard.tsx index 81ed6dbc..496b3684 100644 --- a/src/module/activity/core/ActivityCard/ActivityCard.tsx +++ b/src/module/activity/core/ActivityCard/ActivityCard.tsx @@ -1,4 +1,4 @@ -import { Col, Row, Typography } from "@peersyst/react-native-components"; +import { Col, Typography } from "@peersyst/react-native-components"; import { ReactElement } from "react"; import { ActivityCardRoot, ActivityDisplay, DefaultActivityAction, Details } from "module/activity/core/ActivityCard/ActivityCard.styles"; import { Pressable, TextStyle, ViewStyle } from "react-native"; @@ -36,23 +36,22 @@ const ActivityCard = ({ } = {}, }: ActivityCardProps): JSX.Element => { return ( - - - - - - {title} - - - {description} - - {details && ( -
- {details} -
- )} - -
+ + + + + {title} + + + {description} + + {details && ( +
+ {details} +
+ )} + + {amount && } {onAction && ( From 060a7c64530abdc5d14b60832db3806f6b409427 Mon Sep 17 00:00:00 2001 From: GuillemGarciaDev Date: Thu, 7 Sep 2023 08:26:51 +0200 Subject: [PATCH 2/2] fix: reset signerUrl dev environment --- src/config/config.dev.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/config.dev.json b/src/config/config.dev.json index 2d70ee9b..d24e76b9 100644 --- a/src/config/config.dev.json +++ b/src/config/config.dev.json @@ -1,5 +1,5 @@ { "enableMainnet": true, "enableSignerApp": true, - "signerUrl": "http://192.168.1.55:3001" + "signerUrl": "http://localhost:3001" }