Skip to content

Commit

Permalink
redo because squash bad with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Leouarz committed Apr 29, 2024
2 parents ef6f13b + 70186e0 commit e5ab120
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 94 deletions.
184 changes: 92 additions & 92 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
name: Master
on:
push:
branches:
- master
# name: Master
# on:
# push:
# branches:
# - master

jobs:
# publish to gh-pages (& IPFS when a release is detected)
www:
if: "! startsWith(github.event.head_commit.message, '[CI Skip]')"
strategy:
matrix:
step: ['build:release:www']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_PAT_BOT }}
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- name: ${{ matrix.step }}
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
CRUST_SEEDS: ${{ secrets.CRUST_SEEDS }}
GH_PAGES_SRC: packages/apps/build
GH_PAT: ${{ secrets.GH_PAT_BOT }}
GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT_BOT }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
PINATA_API_KEY: ${{ secrets.PINATA_API_KEY }}
PINATA_SECRET_KEY: ${{ secrets.PINATA_SECRET_KEY }}
run: |
yarn install --immutable
yarn ${{ matrix.step }}
# jobs:
# # publish to gh-pages (& IPFS when a release is detected)
# www:
# if: "! startsWith(github.event.head_commit.message, '[CI Skip]')"
# strategy:
# matrix:
# step: ['build:release:www']
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# token: ${{ secrets.GH_PAT_BOT }}
# - uses: actions/setup-node@v4
# with:
# node-version: 'lts/*'
# - name: ${{ matrix.step }}
# env:
# CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
# CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
# CRUST_SEEDS: ${{ secrets.CRUST_SEEDS }}
# GH_PAGES_SRC: packages/apps/build
# GH_PAT: ${{ secrets.GH_PAT_BOT }}
# GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT_BOT }}
# NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
# PINATA_API_KEY: ${{ secrets.PINATA_API_KEY }}
# PINATA_SECRET_KEY: ${{ secrets.PINATA_SECRET_KEY }}
# run: |
# yarn install --immutable
# yarn ${{ matrix.step }}

# only run on "CI skip", i.e. when the actual version has been bumped to release/stable
docker:
if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- name: docker
env:
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
run: |
./docker/build.sh
# # only run on "CI skip", i.e. when the actual version has been bumped to release/stable
# docker:
# if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')"
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: actions/setup-node@v4
# with:
# node-version: 'lts/*'
# - name: docker
# env:
# DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
# run: |
# ./docker/build.sh

# only run on "CI skip", i.e. when the actual version has been bumped to release/stable
electron:
if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')"
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_PAT_BOT }}
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- name: Prepare for app notarization (macOS)
if: startsWith(matrix.os, 'macos')
# Import Apple API key for app notarization on macOS
run: |
mkdir -p ~/private_keys/
echo '${{ secrets.API_KEY }}' > ~/private_keys/AuthKey_${{ secrets.API_KEY_ID }}.p8
- name: Build/release Electron app
uses: samuelmeuli/action-electron-builder@v1
with:
# Base64-encoded code signing certificate for macOS
mac_certs: ${{ secrets.MAC_CERTS }}
# Password for decrypting `mac_certs`
mac_certs_password: ${{ secrets.MAC_CERTS_PASSWORD }}
# Base64-encoded code signing certificate for Windows
windows_certs: ${{ secrets.WINDOWS_CERTS }}
# Password for decrypting `windows_certs`
windows_certs_password: ${{ secrets.WINDOWS_CERTS_PASSWORD }}
# GitHub token, automatically provided to the action
# (No need to define this secret in the repo settings)
github_token: ${{ secrets.GITHUB_TOKEN }}
args: '--project packages/apps-electron'
build_script_name: build:release:electron
# If the commit is tagged with a version (e.g. "v1.0.0"),
# release the app after building
release: ${{ startsWith(github.ref, 'refs/tags/v') }}
env:
# macOS notarization API key
API_KEY_ID: ${{ secrets.API_KEY_ID }}
API_KEY_ISSUER_ID: ${{ secrets.API_KEY_ISSUER_ID }}
# # only run on "CI skip", i.e. when the actual version has been bumped to release/stable
# electron:
# if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')"
# strategy:
# matrix:
# os: [macos-latest, ubuntu-latest, windows-latest]
# runs-on: ${{ matrix.os }}
# steps:
# - uses: actions/checkout@v4
# with:
# token: ${{ secrets.GH_PAT_BOT }}
# - uses: actions/setup-node@v4
# with:
# node-version: 'lts/*'
# - name: Prepare for app notarization (macOS)
# if: startsWith(matrix.os, 'macos')
# # Import Apple API key for app notarization on macOS
# run: |
# mkdir -p ~/private_keys/
# echo '${{ secrets.API_KEY }}' > ~/private_keys/AuthKey_${{ secrets.API_KEY_ID }}.p8
# - name: Build/release Electron app
# uses: samuelmeuli/action-electron-builder@v1
# with:
# # Base64-encoded code signing certificate for macOS
# mac_certs: ${{ secrets.MAC_CERTS }}
# # Password for decrypting `mac_certs`
# mac_certs_password: ${{ secrets.MAC_CERTS_PASSWORD }}
# # Base64-encoded code signing certificate for Windows
# windows_certs: ${{ secrets.WINDOWS_CERTS }}
# # Password for decrypting `windows_certs`
# windows_certs_password: ${{ secrets.WINDOWS_CERTS_PASSWORD }}
# # GitHub token, automatically provided to the action
# # (No need to define this secret in the repo settings)
# github_token: ${{ secrets.GITHUB_TOKEN }}
# args: '--project packages/apps-electron'
# build_script_name: build:release:electron
# # If the commit is tagged with a version (e.g. "v1.0.0"),
# # release the app after building
# release: ${{ startsWith(github.ref, 'refs/tags/v') }}
# env:
# # macOS notarization API key
# API_KEY_ID: ${{ secrets.API_KEY_ID }}
# API_KEY_ISSUER_ID: ${{ secrets.API_KEY_ISSUER_ID }}
17 changes: 16 additions & 1 deletion packages/page-accounts/src/Accounts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ interface SortControls {
sortFromMax: boolean;
}

type GroupName = 'accounts' | 'chopsticks' | 'hardware' | 'injected' | 'multisig' | 'proxied' | 'qr' | 'testing';
type GroupName = 'accounts' | 'chopsticks' | 'chopsticks' | 'hardware' | 'injected' | 'multisig' | 'proxied' | 'qr' | 'testing';

const DEFAULT_SORT_CONTROLS: SortControls = { sortBy: 'date', sortFromMax: true };

Expand Down Expand Up @@ -81,6 +81,8 @@ function groupAccounts (accounts: SortedAccount[]): Record<GroupName, string[]>
ret.proxied.push(address);
} else if (cryptoType === 'chopsticks') {
ret.chopsticks.push(address);
} else if (cryptoType === 'chopsticks') {
ret.chopsticks.push(address);
} else if (cryptoType === 'qr') {
ret.qr.push(address);
} else {
Expand Down Expand Up @@ -299,6 +301,12 @@ function Overview ({ className = '', onStatusChange }: Props): React.ReactElemen
onStatusChange={onStatusChange}
/>
)}
{isLocalOpen && (
<Local
onClose={toggleLocal}
onStatusChange={onStatusChange}
/>
)}
{isMultisigOpen && (
<Multisig
onClose={toggleMultisig}
Expand Down Expand Up @@ -392,6 +400,13 @@ function Overview ({ className = '', onStatusChange }: Props): React.ReactElemen
onClick={toggleLocal}
/>
)}
{fork && (
<Button
icon='plus'
label={t('Local')}
onClick={toggleLocal}
/>
)}
</Button.Group>
</SummaryBox>
{!isNextTick || !sortedAccounts.length
Expand Down
13 changes: 12 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13054,6 +13054,17 @@ __metadata:
languageName: node
linkType: hard

"multihashes@npm:~0.4.13, multihashes@npm:~0.4.15":
version: 0.4.21
resolution: "multihashes@npm:0.4.21"
dependencies:
buffer: "npm:^5.5.0"
multibase: "npm:^0.7.0"
varint: "npm:^5.0.0"
checksum: 10/a482d9ba7ed0ad41db22ca589f228e4b7a30207a229a64dfc9888796752314fca00a8d03025fe40d6d73965bbb246f54b73626c5a235463e30c06c7bf7a8785f
languageName: node
linkType: hard

"mute-stream@npm:0.0.8, mute-stream@npm:~0.0.4":
version: 0.0.8
resolution: "mute-stream@npm:0.0.8"
Expand Down Expand Up @@ -15608,7 +15619,7 @@ __metadata:
languageName: node
linkType: hard

"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
version: 5.2.1
resolution: "safe-buffer@npm:5.2.1"
checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451
Expand Down

0 comments on commit e5ab120

Please sign in to comment.