fix: rename bundled assets to hiro naming

.github/workflows/create-version.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - 'main'
-      - 'beta'
+      - 'dev'
     tags-ignore:
       - '**'
     paths-ignore:
@@ -109,7 +109,7 @@ jobs:
 
       # When successful, this job creates a version tag, triggering `publish-version.yml`
       - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v2.5.4
+        uses: cycjimmy/semantic-release-action@v2.6.0
         id: semantic
         if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
         env:

.github/workflows/debug-build.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - uses: lucasmotta/[email protected]
-        if: github.repository == 'blockstack/stacks-wallet'
+        if: github.repository == 'hirosystems/stacks-wallet'
         with:
           header: '> _Building new release, please wait for the latest_&nbsp; <img src="https://user-images.githubusercontent.com/1618764/97873036-51dfb200-1d17-11eb-89f5-0a922dc3ac92.gif" width="12" />'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -20,6 +20,8 @@ jobs:
 
     env:
       STX_NETWORK: ${{ matrix.stx_network }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+      SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
 
     strategy:
       matrix:
@@ -68,7 +70,7 @@ jobs:
         id: cache-node-modules
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}-${{ secrets.CACHE_BUSTER }}
 
       - name: Variables
         id: vars
@@ -120,6 +122,7 @@ jobs:
           BRANCH_NAME: ${{ steps.vars.outputs.branch_name }}
           CSC_LINK: ${{ secrets[matrix.CSC_LINK_SECRET_NAME] }}
           CSC_KEY_PASSWORD: ${{ secrets[matrix.CSC_KEY_PASSWORD_SECRET_NAME] }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
 
@@ -128,7 +131,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         name: ${{ matrix.NPM_COMMAND }} ${{ matrix.stx_network }} upload
         with:
-          name: stacks-wallet-${{ matrix.stx_network }}-${{ matrix.NPM_COMMAND }}
+          name: hiro-wallet-${{ matrix.stx_network }}-${{ matrix.NPM_COMMAND }}
           path: ${{ matrix.UPLOAD_ASSETS }}
 
   asset-signatures:
@@ -171,13 +174,13 @@ jobs:
 
     steps:
       - uses: lucasmotta/[email protected]
-        if: (!contains(needs.*.result, 'failure')) && github.repository == 'blockstack/stacks-wallet'
+        if: (!contains(needs.*.result, 'failure')) && github.repository == 'hirosystems/stacks-wallet'
         with:
           header: '> [Download the latest build](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: lucasmotta/[email protected]
-        if: (contains(needs.*.result, 'failure')) && github.repository == 'blockstack/stacks-wallet'
+        if: (contains(needs.*.result, 'failure')) && github.repository == 'hirosystems/stacks-wallet'
         with:
           header: '> _Build failed, [see here for details](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})_'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration-tests.yml

@@ -1,6 +1,13 @@
 name: Integration tests
 
-on: [pull_request]
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      url:
+        description: 'API URL to test'
+        required: true
+        default: https://stacks-node-api.testnet.stacks.co
 
 jobs:
   test-integration:
@@ -9,6 +16,7 @@ jobs:
     env:
       STX_NETWORK: ${{ matrix.stx_network }}
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+      DEFAULT_TESTNET_STACKS_NODE_URL: ${{ github.event.inputs.name }}
 
     strategy:
       matrix:

.github/workflows/publish-version.yml

@@ -35,9 +35,6 @@ jobs:
             CSC_LINK_SECRET_NAME: CODE_SIGNING_CERTIFICATE_WINDOWS
             CSC_KEY_PASSWORD_SECRET_NAME: CODE_SIGNING_PASSWORD_WINDOWS
 
-    outputs:
-      version: ${{ steps.extract_version.outputs.version }}
-
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
@@ -49,7 +46,7 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}-${{ secrets.CACHE_BUSTER }}
 
       - name: Add required Linux dependencies
         uses: ./.github/actions/linux-deps
@@ -73,10 +70,6 @@ jobs:
         with:
           node-version: 12
 
-      - name: Extract version
-        id: extract_version
-        uses: Saionaro/[email protected]
-
       #
       # Windows build breaks when using the package.json script to install `app/` packages
       # using separate run to install those packages separately
@@ -100,6 +93,8 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_ENV: production
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
           CSC_LINK: ${{ secrets[matrix.CSC_LINK_SECRET_NAME] }}
           CSC_KEY_PASSWORD: ${{ secrets[matrix.CSC_KEY_PASSWORD_SECRET_NAME] }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
@@ -108,7 +103,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         name: ${{ matrix.os }} upload
         with:
-          name: stacks-wallet-${{ matrix.stx_network }}-${{ matrix.NPM_COMMAND }}
+          name: hiro-wallet-${{ matrix.stx_network }}-${{ matrix.NPM_COMMAND }}
           path: ${{ matrix.UPLOAD_ASSETS }}
 
   create-release:
@@ -118,19 +113,24 @@ jobs:
 
     outputs:
       release_upload_url: ${{ steps.create_release.outputs.upload_url }}
+      new_version: ${{ steps.extract_version.outputs.version }}
 
     steps:
       - uses: actions/checkout@v2
         with:
           token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
 
+      - name: Extract version
+        id: extract_version
+        uses: Saionaro/[email protected]
+
       - name: Download binaries
         uses: actions/download-artifact@v2
         with:
           path: release
 
       - name: Move binaries to root directory
-        run: mv release/*/stacks-wallet* .
+        run: mv release/*/hiro-wallet* .
 
       - name: Download release-notes.txt from create-version workflow
         uses: dawidd6/action-download-artifact@v2
@@ -149,21 +149,25 @@ jobs:
         run: |
           sed -i '1d' release-notes.txt
           echo "\`\`\`" >> release-notes.txt
-          shasum -a 256 stacks-wallet* >> shasums.txt
-          gpg --armor --output shasums.txt.asc --clearsign shasums.txt
+          shasum -a 256 hiro-wallet* >> shasums.txt
+          gpg --armor --output shasums.txt.asc --clearsign --digest-algo SHA256 shasums.txt
           cat release-notes.txt shasums.txt.asc > release-body.txt
           echo "\`\`\`" >> release-body.txt
 
+      - run: echo ${{ steps.extract_version.outputs.version }}
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
+        # check for case where it hasn't found version number
+        if: steps.extract_version.outputs.version != ''
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: v${{ needs.build.outputs.version }}
-          release_name: Hiro Wallet v${{ needs.build.outputs.version }}
+          tag_name: v${{ steps.extract_version.outputs.version }}
+          release_name: Hiro Wallet v${{ steps.extract_version.outputs.version }}
           draft: false
-          prerelease: ${{ contains(needs.build.outputs.version, 'beta') }}
+          prerelease: ${{ contains(steps.extract_version.outputs.version, 'dev') }}
           body_path: release-body.txt
 
   upload-release-assets:
@@ -201,23 +205,30 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.create-release.outputs.release_upload_url }}
-          asset_path: release/stacks-wallet-${{ matrix.stx_network }}-${{ matrix.os }}/stacks-wallet.${{ matrix.stx_network }}.${{ matrix.ext }}
-          asset_name: stacks-wallet.${{ matrix.stx_network }}.v${{ needs.build.outputs.version }}.${{ matrix.ext }}
+          asset_path: release/hiro-wallet-${{ matrix.stx_network }}-${{ matrix.os }}/hiro-wallet.${{ matrix.stx_network }}.${{ matrix.ext }}
+          asset_name: hiro-wallet.${{ matrix.stx_network }}.v${{ needs.create-release.outputs.new_version }}.${{ matrix.ext }}
           asset_content_type: application/octet-stream
 
   announce-release:
     runs-on: ubuntu-latest
+    env:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_UX_NOTIFS_WEBHOOK }}
 
     needs:
-      - build
+      - create-release
       - upload-release-assets
 
     steps:
-      - name: Discord notification
-        if: github.ref == 'refs/heads/main'
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      - name: Discord Stable Release Notification
+        if: contains(needs.create-release.outputs.new_version, 'dev') == false
+        uses: Ilshidur/action-discord@master
+        with:
+          args: |
+            🔔 New Hiro Wallet released: [Download `v${{ needs.create-release.outputs.new_version }}` here](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.create-release.outputs.new_version }})
+
+      - name: Discord Dev Release Notification
+        if: contains(needs.create-release.outputs.new_version, 'dev') == true
         uses: Ilshidur/action-discord@master
         with:
           args: |
-            🔔 New Hiro Wallet released: [Download `v${{ needs.build.outputs.version }}` here](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.build.outputs.version }})
+            New Hiro Wallet Preview released: [Download `v${{ needs.create-release.outputs.new_version }}` here](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.create-release.outputs.new_version }})

CHANGELOG.md

@@ -1,3 +1,62 @@
+# [4.6.0-dev.5](https://github.com/blockstack/stacks-wallet/compare/v4.6.0-dev.4...v4.6.0-dev.5) (2021-12-01)
+
+
+### Bug Fixes
+
+* **send-form:** incorrect fee calc in send max button ([b4c1fee](https://github.com/blockstack/stacks-wallet/commit/b4c1fee7c7f9c83f46d83fd3e20f92d9fd5369b9))
+
+# [4.6.0-dev.4](https://github.com/blockstack/stacks-wallet/compare/v4.6.0-dev.3...v4.6.0-dev.4) (2021-11-16)
+
+
+### Features
+
+* add segment integration ([c1d6f1f](https://github.com/blockstack/stacks-wallet/commit/c1d6f1f1b447aa2ec178a4b0ff019940a4f0ea43)), closes [#928](https://github.com/blockstack/stacks-wallet/issues/928)
+
+# [4.6.0-dev.3](https://github.com/blockstack/stacks-wallet/compare/v4.6.0-dev.2...v4.6.0-dev.3) (2021-11-02)
+
+
+### Bug Fixes
+
+* **sentry:** use dsn in debug mode ([eea392c](https://github.com/blockstack/stacks-wallet/commit/eea392cdb10c6347c9324f2ea26049a352e981ef))
+
+# [4.6.0-dev.2](https://github.com/blockstack/stacks-wallet/compare/v4.6.0-dev.1...v4.6.0-dev.2) (2021-10-28)
+
+
+### Bug Fixes
+
+* separate discord notifications, stable/dev ([55114dc](https://github.com/blockstack/stacks-wallet/commit/55114dc26d0dc0afbaee9dc1de13c9fb74d3a512))
+
+# [4.6.0-dev.1](https://github.com/blockstack/stacks-wallet/compare/v4.5.3...v4.6.0-dev.1) (2021-10-28)
+
+
+### Bug Fixes
+
+* lack of warning when you're using the wrong ledger device ([099b03f](https://github.com/blockstack/stacks-wallet/commit/099b03f84c7ed2f6c684a794820504f20d17a8ab))
+* remove 3rd party notification from link to explorer, closes [#937](https://github.com/blockstack/stacks-wallet/issues/937) ([edf6bb3](https://github.com/blockstack/stacks-wallet/commit/edf6bb32ea42f1a4d6b7a7004fb28245f3223486))
+* **stacking:** fee incorrectly applied to stacking contract calls ([cf608d0](https://github.com/blockstack/stacks-wallet/commit/cf608d0af4434e397945fcc0f91f8b751b0f0c91))
+* typo with SENTRY_DSN ([5ba69ed](https://github.com/blockstack/stacks-wallet/commit/5ba69ed617f1e0bc9806ae1a54ee5ccafb2aa5ea))
+
+
+### Features
+
+* **sentry:** add opt-in diagnostics with sentry, closes [#899](https://github.com/blockstack/stacks-wallet/issues/899) ([5670b9d](https://github.com/blockstack/stacks-wallet/commit/5670b9d4e5c4fbc0fd92229b23838742b2f9617f))
+* update release flow branches ([ee594d3](https://github.com/blockstack/stacks-wallet/commit/ee594d3da57b0c508034fd104667ecc953918fcf))
+
+# [4.6.0-beta.1](https://github.com/blockstack/stacks-wallet/compare/v4.5.3...v4.6.0-beta.1) (2021-10-28)
+
+
+### Bug Fixes
+
+* lack of warning when you're using the wrong ledger device ([099b03f](https://github.com/blockstack/stacks-wallet/commit/099b03f84c7ed2f6c684a794820504f20d17a8ab))
+* remove 3rd party notification from link to explorer, closes [#937](https://github.com/blockstack/stacks-wallet/issues/937) ([edf6bb3](https://github.com/blockstack/stacks-wallet/commit/edf6bb32ea42f1a4d6b7a7004fb28245f3223486))
+* **stacking:** fee incorrectly applied to stacking contract calls ([cf608d0](https://github.com/blockstack/stacks-wallet/commit/cf608d0af4434e397945fcc0f91f8b751b0f0c91))
+* typo with SENTRY_DSN ([5ba69ed](https://github.com/blockstack/stacks-wallet/commit/5ba69ed617f1e0bc9806ae1a54ee5ccafb2aa5ea))
+
+
+### Features
+
+* **sentry:** add opt-in diagnostics with sentry, closes [#899](https://github.com/blockstack/stacks-wallet/issues/899) ([5670b9d](https://github.com/blockstack/stacks-wallet/commit/5670b9d4e5c4fbc0fd92229b23838742b2f9617f))
+
 ## [4.5.3](https://github.com/blockstack/stacks-wallet/compare/v4.5.2...v4.5.3) (2021-09-15)
 
 

README.md

@@ -1,8 +1,11 @@
-# Hiro Wallet for Desktop
+# Hiro Wallet—Desktop
 
 ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/blockstack/stacks-wallet/Build)
+[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/blockstack/stacks-wallet)](https://github.com/blockstack/stacks-wallet/releases/latest)
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![coverage](https://raw.githubusercontent.com/blockstack/stacks-wallet/gh-pages/badge.svg)](https://blockstack.github.io/stacks-wallet/)
 
+
 [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/blockstack/stacks-wallet)
 
 ![Hiro Wallet Hero](/resources/readme.png)

app/app.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'none'; font-src 'self'; img-src data:; style-src 'unsafe-inline'; script-src 'self' 'unsafe-eval' 'nonce-6ca3c3e1fcd34bbc8cfaeceaa8106e36' 'nonce-6ca3c3e1fcd34bbc8cfaeceaa8106e37'; connect-src *; frame-ancestors 'none';"
+      content="default-src 'none'; font-src 'self'; img-src data:; style-src 'unsafe-inline'; script-src 'self' 'unsafe-eval' 'nonce-6ca3c3e1fcd34bbc8cfaeceaa8106e36' 'nonce-6ca3c3e1fcd34bbc8cfaeceaa8106e37'; connect-src *;"
     />
   </head>
 

app/components/external-link.tsx

@@ -10,7 +10,7 @@ interface ExternalLinkProps extends BoxProps {
 export const ExternalLink: FC<ExternalLinkProps> = ({ href, children, ...props }) => {
   const openUrl = () => openExternalLink(href);
   return (
-    <LegalDisclaimerTooltip>
+    <LegalDisclaimerTooltip display="inline-block">
       <Text
         onClick={openUrl}
         as="button"

app/components/home/balance-card.tsx

@@ -7,7 +7,7 @@ import { toHumanReadableStx } from '@utils/unit-convert';
 import { safeAwait } from '@utils/safe-await';
 import { delay } from '@utils/delay';
 
-import { ExternalLink } from '@components/external-link';
+import { InternalLink } from '@components/internal-link';
 import { makeExplorerAddressLink } from '@utils/external-links';
 import { isTestnet } from '@utils/network-utils';
 import { useBalance } from '@hooks/use-balance';
@@ -46,9 +46,9 @@ export const BalanceCard: FC<BalanceCardProps> = props => {
         </Text>
 
         {address !== null && (
-          <ExternalLink href={makeExplorerAddressLink(address)} textStyle="caption" ml="tight">
+          <InternalLink href={makeExplorerAddressLink(address)} textStyle="caption" ml="tight">
             View on Explorer
-          </ExternalLink>
+          </InternalLink>
         )}
       </Flex>
       <Title fontSize="40px" lineHeight="56px">

app/components/internal-link.tsx

@@ -0,0 +1,30 @@
+import React, { FC } from 'react';
+import { Box, Text, BoxProps, color } from '@stacks/ui';
+import { openExternalLink } from '@utils/external-links';
+
+interface InternalLinkProps extends BoxProps {
+  href: string;
+}
+
+export const InternalLink: FC<InternalLinkProps> = ({ href, children, ...props }) => {
+  const openUrl = () => openExternalLink(href);
+  return (
+    <Text
+      onClick={openUrl}
+      as="button"
+      type="button"
+      cursor="pointer"
+      display="block"
+      outline={0}
+      color={color('brand')}
+      _hover={{ textDecoration: 'underline' }}
+      _focus={{ textDecoration: 'underline' }}
+      {...props}
+    >
+      {children}
+      <Box display="inline-block" ml="extra-tight" mb="1px">
+        ↗
+      </Box>
+    </Text>
+  );
+};