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: 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 };