From b0d970d2dedba17072dddc257e5f501b7c7b45b3 Mon Sep 17 00:00:00 2001 From: jiftechnify Date: Tue, 9 Jan 2024 00:39:03 +0900 Subject: [PATCH 1/4] small fix to combine PRs config --- .github/workflows/{combine-prs.yml => combine_prs.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{combine-prs.yml => combine_prs.yml} (98%) diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine_prs.yml similarity index 98% rename from .github/workflows/combine-prs.yml rename to .github/workflows/combine_prs.yml index 355898b..42bba3f 100644 --- a/.github/workflows/combine-prs.yml +++ b/.github/workflows/combine_prs.yml @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -name: 'Combine PRs' +name: 'Combine Dependabot PRs' # Controls when the action will run - in this case triggered manually on: @@ -165,7 +165,7 @@ jobs: await github.rest.pulls.create({ owner: context.repo.owner, repo: context.repo.repo, - title: 'Combined PR', + title: 'Combined Dependabot PRs', head: '${{ github.event.inputs.combineBranchName }}', base: baseBranch, body: body From 9a2e856a68a627fb220e8319cacc01a217383ac9 Mon Sep 17 00:00:00 2001 From: jiftechnify Date: Tue, 9 Jan 2024 00:39:34 +0900 Subject: [PATCH 2/4] upgrade GitHub actions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8f9702..22966df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "20.x" From de5c50470713c9a2f0d4d0a2e441480f1a92de89 Mon Sep 17 00:00:00 2001 From: jiftechnify Date: Tue, 9 Jan 2024 00:40:14 +0900 Subject: [PATCH 3/4] run typos on PR --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22966df..1c39c26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,3 +24,13 @@ jobs: - name: Lint run: yarn lint + + typos: + name: Detect typos + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Run typos + uses: crate-ci/typos@v1.17.0 From 48de05e1303cc09c6bbb8ac15298773f4c96ec9e Mon Sep 17 00:00:00 2001 From: jiftechnify Date: Tue, 9 Jan 2024 00:41:09 +0900 Subject: [PATCH 4/4] fix typos --- src/components/HeaderMenu.tsx | 6 +++--- src/states/nostr.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/HeaderMenu.tsx b/src/components/HeaderMenu.tsx index 1299ad1..4dab7d2 100644 --- a/src/components/HeaderMenu.tsx +++ b/src/components/HeaderMenu.tsx @@ -76,7 +76,7 @@ const LoggedInHeaderMenuBody: React.FC = ({ myData }) => { - + @@ -100,7 +100,7 @@ const LoggedOutHeaderMenuBody: React.FC = () => { - + @@ -185,7 +185,7 @@ const MenuItemToggleColorTheme: React.FC = () => { ); }; -const MenuItemSwitchLangage: React.FC = () => { +const MenuItemSwitchLanguage: React.FC = () => { const { t, i18n } = useTranslation(); const onLangChange = (v: string) => { diff --git a/src/states/nostr.ts b/src/states/nostr.ts index 88d0b1d..1639916 100644 --- a/src/states/nostr.ts +++ b/src/states/nostr.ts @@ -567,7 +567,7 @@ const applyStatusUpdate = (ev: NostrEvent) => { } jotaiStore.set(followingsStatusesAtom, new Map(statusesMap)); } else { - // status update with emtpy content -> invalidate + // status update with empty content -> invalidate invalidationScheduler.cancel(pubkey, category); invalidateStatus(pubkey, category); }