From 480251e5436ba56effe9fe325e090f33b119ef19 Mon Sep 17 00:00:00 2001
From: kyranjamie <kyran.burraston@gmail.com>
Date: Sat, 9 Jan 2021 14:34:29 +0100
Subject: [PATCH] fix: up a nice icon for Bill Gates

---
 .github/workflows/publish-version.yml                 | 2 +-
 app/main.dev.ts                                       | 8 ++++++--
 app/pages/onboarding/07-set-password/set-password.tsx | 5 ++++-
 electron-builder.js                                   | 6 ++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml
index 3721f5105..6f30b69f7 100644
--- a/.github/workflows/publish-version.yml
+++ b/.github/workflows/publish-version.yml
@@ -186,4 +186,4 @@ jobs:
         uses: Ilshidur/action-discord@master
         with:
           args: |
-            New release: [Stacks Wallet `v${{ needs.build.outputs.version }}`](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.build.outputs.version }}))
+            🔔 New Stacks Wallet released: [Download `v${{ needs.build.outputs.version }}` here](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.build.outputs.version }})
diff --git a/app/main.dev.ts b/app/main.dev.ts
index 21c27619a..bd5558268 100644
--- a/app/main.dev.ts
+++ b/app/main.dev.ts
@@ -24,6 +24,7 @@ import contextMenu from 'electron-context-menu';
 import MenuBuilder from './menu';
 import { deriveKey } from './crypto/key-generation';
 import Store from 'electron-store';
+import { NETWORK } from './constants/index';
 
 // CSP enabled in production mode, don't warn in development
 delete process.env.ELECTRON_ENABLE_SECURITY_WARNINGS;
@@ -71,7 +72,10 @@ const createWindow = async () => {
     defaultHeight: 728,
   });
 
-  console.log(path.join(__dirname, '../resources/icon-512x512.png'));
+  const iconPath =
+    NETWORK === 'mainnet'
+      ? path.join(__dirname, '../resources/icon-512x512.png')
+      : path.join(__dirname, '../resources/icon-512x512-testnet.png');
 
   mainWindow = new BrowserWindow({
     show: false,
@@ -81,7 +85,7 @@ const createWindow = async () => {
     height: mainWindowState.height,
     frame: process.platform !== 'darwin',
     titleBarStyle: process.platform === 'darwin' ? 'hidden' : 'default',
-    icon: path.join(__dirname, '../resources/icon-512x512.png'),
+    icon: iconPath,
     webPreferences: {
       disableBlinkFeatures: 'Auxclick',
       webSecurity: true,
diff --git a/app/pages/onboarding/07-set-password/set-password.tsx b/app/pages/onboarding/07-set-password/set-password.tsx
index eb4fac0f4..e6c460d38 100644
--- a/app/pages/onboarding/07-set-password/set-password.tsx
+++ b/app/pages/onboarding/07-set-password/set-password.tsx
@@ -72,7 +72,10 @@ export const SetPassword: React.FC = () => {
   return (
     <Onboarding as="form" onSubmit={handleSubmit}>
       <OnboardingTitle>Set a password</OnboardingTitle>
-      <OnboardingText>You’ll use your password to confirm transactions</OnboardingText>
+      <OnboardingText>
+        You’ll use your password to confirm transactions. If you forget your password, you can
+        restore your wallet from your Secret Key.
+      </OnboardingText>
       <Input type="password" mt="extra-loose" onChange={handlePasswordInput} />
       <Text display="block" textStyle="body.small" color="ink.600" mt="base">
         Password strength:
diff --git a/electron-builder.js b/electron-builder.js
index e0219d9e1..193589796 100644
--- a/electron-builder.js
+++ b/electron-builder.js
@@ -70,6 +70,9 @@ const networkConfigs = {
       icon: 'icon.testnet.icns',
       appId: 'so.hiro.StacksWalletTestnet',
     },
+    win: {
+      icon: 'icon.testnet.ico',
+    },
     linux: {
       icon: './icons',
     },
@@ -87,6 +90,9 @@ const networkConfigs = {
       icon: 'icon.icns',
       appId: 'so.hiro.StacksWallet',
     },
+    win: {
+      icon: 'icon.mainnet.ico',
+    },
     linux: {
       icon: 'icon-512x512.png',
     },