Skip to content

Commit

Permalink
Merge branch 'release/fs-ui' into feat/local-fs-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidSouther authored Sep 10, 2024
2 parents 0d564a5 + ceb954b commit 68b979c
Show file tree
Hide file tree
Showing 14 changed files with 2,164 additions and 4,466 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Run Workspace Tests

on:
pull_request:
branches: ["main", "pwa-main"]
branches: ["main", "release/**"]

jobs:
all:
Expand Down
2 changes: 1 addition & 1 deletion components/src/difftable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const DiffTable = ({
</tbody>
</table>
) : (
zeroState ?? <p>Execute test script to compare output.</p>
(zeroState ?? <p>Execute test script to compare output.</p>)
)}
</div>
);
Expand Down
3 changes: 1 addition & 2 deletions components/src/pinout.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Bus, HIGH } from "@nand2tetris/simulator/chip/chip.js";
import { render, screen } from "@testing-library/react";
import { useState } from "react";
import { act } from "react-dom/test-utils";
import { act, useState } from "react";
import { Pinout, reducePin } from "./pinout.js";

describe("<Pinout />", () => {
Expand Down
4 changes: 2 additions & 2 deletions components/src/runbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ export const Runbar = (props: {
}
data-tooltip={
runner.state.running
? props.overrideTooltips?.pause ?? `Pause`
: props.overrideTooltips?.run ?? `Run`
? (props.overrideTooltips?.pause ?? `Pause`)
: (props.overrideTooltips?.run ?? `Run`)
}
data-placement="bottom"
>
Expand Down
2 changes: 1 addition & 1 deletion components/src/stores/chip.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export function makeChipStore(
payload?.invalid ?? state.sim.invalid,
);
state.controls.error = state.sim.invalid
? payload?.error ?? state.controls.error
? (payload?.error ?? state.controls.error)
: undefined;
},

Expand Down
Loading

0 comments on commit 68b979c

Please sign in to comment.