groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: add formattedData in IConnection references

Browse Source
This commit is contained in:
Ali BARIN
2022-03-04 20:02:40 +01:00
committed by Ömer Faruk Aydın
parent 719a948134
commit 6a8ec97c31
9 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/src/components/AppConnectionRow/index.tsx
View File

@@ -42,7 +42,7 @@ function AppConnectionRow(props: AppConnectionRowProps): React.ReactElement {
const [deleteConnection] = useMutation(DELETE_CONNECTION);
const formatMessage = useFormatMessage();
const { id, key, data, verified, createdAt } = props.connection;
const { id, key, formattedData, verified, createdAt } = props.connection;
const contextButtonRef = React.useRef<SVGSVGElement | null>(null);
const [anchorEl, setAnchorEl] = React.useState<SVGSVGElement | null>(null);
@@ -88,7 +88,7 @@ function AppConnectionRow(props: AppConnectionRowProps): React.ReactElement {
spacing={1}
>
<Typography variant="h6">
{data.screenName}
{formattedData?.screenName}
</Typography>
<Typography variant="caption">

6
packages/web/src/components/ChooseAccountSubstep/index.tsx
View File

@@ -21,12 +21,12 @@ type ChooseAccountSubstepProps = {
step: IStep;
};
const optionGenerator = (connection: IConnection<IJSONObject>): { label: string; value: string; } => ({
label: connection?.data?.screenName as string ?? 'Unnamed',
const optionGenerator = (connection: IConnection): { label: string; value: string; } => ({
label: connection?.formattedData?.screenName as string ?? 'Unnamed',
value: connection?.id as string,
});
const getOption = (options: Record<string, unknown>[], connectionId: string) => options.find(connection => connection.value === connectionId) || null;
const getOption = (options: Record<string, unknown>[], connectionId?: string) => options.find(connection => connection.value === connectionId) || null;
function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElement {
const {