Skip to content

Commit

Permalink
fix: up a nice icon for Bill Gates
Browse files Browse the repository at this point in the history
  • Loading branch information
kyranjamie committed Jan 9, 2021
1 parent 0faf4a7 commit 480251e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})
8 changes: 6 additions & 2 deletions app/main.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
5 changes: 4 additions & 1 deletion app/pages/onboarding/07-set-password/set-password.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions electron-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ const networkConfigs = {
icon: 'icon.testnet.icns',
appId: 'so.hiro.StacksWalletTestnet',
},
win: {
icon: 'icon.testnet.ico',
},
linux: {
icon: './icons',
},
Expand All @@ -87,6 +90,9 @@ const networkConfigs = {
icon: 'icon.icns',
appId: 'so.hiro.StacksWallet',
},
win: {
icon: 'icon.mainnet.ico',
},
linux: {
icon: 'icon-512x512.png',
},
Expand Down

0 comments on commit 480251e

Please sign in to comment.