Merge branch 'dev' into big-container

2026-04-21 00:32:51 +02:00 · 2021-09-17 03:09:42 -04:00
parent 89ea9aaff5 aa0008862c
commit 1344a17482
4 changed files with 24 additions and 17 deletions
@@ -101,8 +101,13 @@ export function TerminalRoot({ terminal, router, player }: IProps): React.ReactE
                </ListItem>
              );
          })}
+
+          {terminal.action !== null && (
+            <ListItem classes={{ root: classes.nopadding }}>
+              <ActionTimer terminal={terminal} />{" "}
+            </ListItem>
+          )}
        </List>
-        {terminal.action !== null && <ActionTimer terminal={terminal} />}
        <div ref={scrollHook}></div>
      </Box>
      <Box position="sticky" bottom={0} width="100%" px={0}>