From 5e0ccd2b1bf7bc3db5498138d7306d84e44f4c28 Mon Sep 17 00:00:00 2001
From: kvhnuke <10602065+kvhnuke@users.noreply.github.com>
Date: Mon, 2 Oct 2023 14:19:14 -0700
Subject: [PATCH 1/2] devop: set-output for github actions

---
 .github/workflows/build-all.yml | 4 ++--
 .github/workflows/release.yml   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index 160db5371..96970b650 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -12,11 +12,11 @@ jobs:
         id: node-version
         run: |
           docker build -t enkrypt-build-container .
-          echo ::set-output name=NODE_VERSION::$(docker run --rm -v `pwd`:/home:rw enkrypt-build-container /bin/bash -c "node --version")
+          echo "NODE_VERSION=$(docker run --rm -v `pwd`:/home:rw enkrypt-build-container /bin/bash -c "node --version")" >> $GITHUB_OUTPUT
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - name: Cache yarn modules
         uses: actions/cache@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 04475c28f..41a729225 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,11 +14,11 @@ jobs:
         id: node-version
         run: |
           docker build -t enkrypt-build-container .
-          echo ::set-output name=NODE_VERSION::$(docker run --rm -v `pwd`:/home:rw enkrypt-build-container /bin/bash -c "node --version")
+          echo "NODE_VERSION=$(docker run --rm -v `pwd`:/home:rw enkrypt-build-container /bin/bash -c "node --version")" >> $GITHUB_OUTPUT
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - name: Cache yarn modules
         uses: actions/cache@v3
@@ -34,7 +34,7 @@ jobs:
 
       - name: Get release tag
         id: get_release_tag
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+        run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
       - name: build
         env:

From e5afa5dcaad67ef8ce9f3c9fc5c89ff1d4ac21af Mon Sep 17 00:00:00 2001
From: kvhnuke <10602065+kvhnuke@users.noreply.github.com>
Date: Fri, 20 Oct 2023 11:24:37 -0700
Subject: [PATCH 2/2] fix: btc address naming

---
 packages/extension/src/libs/utils/accounts.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/extension/src/libs/utils/accounts.ts b/packages/extension/src/libs/utils/accounts.ts
index b0ee77cdf..0f008bd32 100644
--- a/packages/extension/src/libs/utils/accounts.ts
+++ b/packages/extension/src/libs/utils/accounts.ts
@@ -21,7 +21,7 @@ export const getAccountsByNetworkName = async (
 
   const accounts = await keyring.getAccounts(network.signer);
 
-  return accounts.filter((account) => {
+  const filtered = accounts.filter((account) => {
     if (account.isHardware && account.HWOptions !== undefined) {
       // Polkadot and Kusama ledger apps only work for those networks
       if (
@@ -34,6 +34,15 @@ export const getAccountsByNetworkName = async (
 
     return true;
   });
+  return filtered.map((f) => {
+    if (
+      network.signer.includes(SignerType.secp256k1btc) &&
+      f.name === "Bitcoin Account 1"
+    ) {
+      f.name = f.name.replace("Bitcoin", network.name_long);
+    }
+    return f;
+  });
 };
 
 export { getOtherSigners };