Skip to content

Commit

Permalink
Merge pull request #530 from alephium/next
Browse files Browse the repository at this point in the history
Next -> master
  • Loading branch information
nop33 committed Apr 23, 2024
2 parents f4aff42 + fbeb9ca commit ce73a3a
Show file tree
Hide file tree
Showing 101 changed files with 1,532 additions and 1,175 deletions.
5 changes: 5 additions & 0 deletions .changeset/dull-boats-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"alephium-desktop-wallet": patch
---

Cleaner, more compact transaction lists
5 changes: 5 additions & 0 deletions .changeset/eleven-pugs-talk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"alephium-desktop-wallet": patch
---

Redesign transaction details modal
5 changes: 5 additions & 0 deletions .changeset/empty-poets-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"alephium-desktop-wallet": patch
---

Support display of .mp4 NFTs
5 changes: 5 additions & 0 deletions .changeset/funny-carrots-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@alephium/explorer": patch
---

Allow devnet as valid network type
5 changes: 5 additions & 0 deletions .changeset/plenty-glasses-confess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"alephium-desktop-wallet": patch
---

Update tokens labels shown when no metadata exists in token list
5 changes: 5 additions & 0 deletions .changeset/silent-spoons-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"alephium-desktop-wallet": patch
---

Migrate network settings to node-v210 & backend-v117
5 changes: 5 additions & 0 deletions .changeset/thin-pumpkins-listen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@alephium/mobile-wallet": patch
---

Migrate network settings to node-v210 & backend-v117
5 changes: 5 additions & 0 deletions .changeset/tidy-lobsters-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"alephium-desktop-wallet": patch
---

Simplify NFT cards
5 changes: 5 additions & 0 deletions .changeset/two-crabs-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"alephium-desktop-wallet": patch
---

New NFT details modal
9 changes: 5 additions & 4 deletions .github/actions/setup-monorepo/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Prepare and install everything for the monorepo
inputs:
node-version:
description: Version of Node to use
default: 18.x
default: 20.x

pnpm-version:
description: Version of pnpm to use
Expand All @@ -22,17 +22,18 @@ runs:
using: composite
steps:
- name: 🏗 Setup pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: ${{ inputs.pnpm-version }}

- name: 🏗 Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: pnpm

- name: 🏗 Setup Expo
if: ${{ inputs.expo-token }}
uses: expo/expo-github-action@v8
with:
eas-version: ${{ inputs.eas-version }}
Expand All @@ -43,7 +44,7 @@ runs:
shell: bash

- name: ♻️ Restore cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
key: turbo-${{ runner.os }}-${{ github.sha }}
restore-keys: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 🏗 Setup repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/deploy-gh-pages-explorer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8

- name: Install NPM dependencies
run: pnpm install
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Build
run: cd apps/explorer && pnpm run ci:build:gh-pages
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/deploy-mainnet-explorer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8

- name: Install NPM dependencies
run: pnpm install
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Build frontend
run: cd apps/explorer && pnpm run ci:build && pnpm init-docker
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/deploy-testnet-explorer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8

- name: Install NPM dependencies
run: pnpm install
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Build frontend
run: cd apps/explorer && pnpm run ci:build && pnpm init-docker
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/publish-docker-explorer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.workflow_run.head_branch }}

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8

- name: Install NPM dependencies
run: pnpm install
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Build the static website
run: cd apps/explorer && pnpm run ci:build
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/release-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,10 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8

- name: Install NPM dependencies
run: pnpm install
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Prepare for app notarization
if: startsWith(matrix.os, 'macos')
Expand All @@ -37,11 +32,11 @@ jobs:
shell: bash

- name: Install Snapcraft
uses: samuelmeuli/action-snapcraft@v1
uses: samuelmeuli/action-snapcraft@v2
if: startsWith(matrix.os, 'ubuntu')

- name: Build & release Electron app
uses: nop33/action-electron-builder@v1.8.1
uses: nop33/action-electron-builder@v1.8.2
if: ${{ startsWith(github.ref, 'refs/tags/alephium-desktop-wallet@') }}
with:
package_root: 'apps/desktop-wallet'
Expand All @@ -65,7 +60,7 @@ jobs:

- name: Upload notarization-error.log
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: notarization-error-log
path: ${{ github.workspace }}/apps/desktop-wallet/notarization-error.log
11 changes: 3 additions & 8 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8

- name: Install NPM dependencies
run: pnpm install
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Lint all workspaces in parallel
run: pnpm run lint
Expand Down
27 changes: 6 additions & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,10 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8

- name: Install NPM dependencies
run: pnpm install

- name: Use Node.js for vitest
uses: actions/setup-node@v4
with:
node-version: 16
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Run test scripts of all workspaces in parallel
run: pnpm run test
Expand All @@ -38,15 +28,10 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Install pnpm package manager
uses: pnpm/action-setup@v2
with:
version: 8
uses: actions/checkout@v4

- name: Install NPM dependencies
run: pnpm install
- name: 🏗 Setup monorepo
uses: ./.github/actions/setup-monorepo

- name: Extract platform name
id: get-os
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20
10 changes: 8 additions & 2 deletions apps/desktop-wallet/locales/bg-BG/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
"Unlocked at": "Отключено на",
"Unlocks at": "Отключва се на",
"Unselect all": "Unselect all",
"Unverified": "Unverified",
"No metadata": "No metadata",
"Update": "Актуализиране",
"Use an existing wallet": "Използване на вече съществуващ портфейл",
"Use max amount": "Използване на максимална сума",
Expand Down Expand Up @@ -484,5 +484,11 @@
"Hide": "Hide",
"Could not decode unsigned tx": "Could not decode unsigned tx",
"Could not sign unsigned tx": "Could not sign unsigned tx",
"Could not sign message": "Could not sign message"
"Could not sign message": "Could not sign message",
"NFT details": "NFT details",
"Image URL": "Image URL",
"Attributes": "Attributes",
"Collection": "Collection",
"ID": "ID",
"Copy ID": "Copy ID"
}
10 changes: 8 additions & 2 deletions apps/desktop-wallet/locales/de-DE/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
"Unlocked at": "Entsperrt am",
"Unlocks at": "Entsperrt zum",
"Unselect all": "Unselect all",
"Unverified": "Unverified",
"No metadata": "No metadata",
"Update": "Update",
"Use an existing wallet": "Vorhandene Wallet verwenden",
"Use max amount": "Maximalbetrag verwenden",
Expand Down Expand Up @@ -484,5 +484,11 @@
"Hide": "Hide",
"Could not decode unsigned tx": "Could not decode unsigned tx",
"Could not sign unsigned tx": "Could not sign unsigned tx",
"Could not sign message": "Could not sign message"
"Could not sign message": "Could not sign message",
"NFT details": "NFT details",
"Image URL": "Image URL",
"Attributes": "Attributes",
"Collection": "Collection",
"ID": "ID",
"Copy ID": "Copy ID"
}
10 changes: 8 additions & 2 deletions apps/desktop-wallet/locales/en-US/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
"Type your password to show the phrase.": "Type your password to show the phrase.",
"Type your recovery phrase": "Type your recovery phrase",
"Unable to convert the amount": "Unable to convert the amount",
"Unverified": "Unverified",
"No metadata": "No metadata",
"Unknown": "Unknown",
"Unknown token": "Unknown token",
"Unknown tokens": "Unknown tokens",
Expand Down Expand Up @@ -484,5 +484,11 @@
"Hide": "Hide",
"Could not decode unsigned tx": "Could not decode unsigned tx",
"Could not sign unsigned tx": "Could not sign unsigned tx",
"Could not sign message": "Could not sign message"
"Could not sign message": "Could not sign message",
"NFT details": "NFT details",
"Image URL": "Image URL",
"Attributes": "Attributes",
"Collection": "Collection",
"ID": "ID",
"Copy ID": "Copy ID"
}
10 changes: 8 additions & 2 deletions apps/desktop-wallet/locales/es-ES/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
"Unlocked at": "Desbloqueado en",
"Unlocks at": "Se desbloquea en",
"Unselect all": "Unselect all",
"Unverified": "Unverified",
"No metadata": "No metadata",
"Update": "Actualizar",
"Use an existing wallet": "Utilizar una billetera existente",
"Use max amount": "Utilizar la cantidad máxima",
Expand Down Expand Up @@ -484,5 +484,11 @@
"Hide": "Hide",
"Could not decode unsigned tx": "Could not decode unsigned tx",
"Could not sign unsigned tx": "Could not sign unsigned tx",
"Could not sign message": "Could not sign message"
"Could not sign message": "Could not sign message",
"NFT details": "NFT details",
"Image URL": "Image URL",
"Attributes": "Attributes",
"Collection": "Collection",
"ID": "ID",
"Copy ID": "Copy ID"
}
10 changes: 8 additions & 2 deletions apps/desktop-wallet/locales/fr-FR/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
"Unlocked at": "Déverrouillé à",
"Unlocks at": "Sera déverrouillé à",
"Unselect all": "Tout désélectionner",
"Unverified": "Unverified",
"No metadata": "No metadata",
"Update": "Mettre à jour",
"Use an existing wallet": "Utiliser un portefeuille existant",
"Use max amount": "Utiliser le montant max",
Expand Down Expand Up @@ -484,5 +484,11 @@
"Hide": "Cacher",
"Could not decode unsigned tx": "Could not decode unsigned tx",
"Could not sign unsigned tx": "Could not sign unsigned tx",
"Could not sign message": "Could not sign message"
"Could not sign message": "Could not sign message",
"NFT details": "NFT details",
"Image URL": "Image URL",
"Attributes": "Attributes",
"Collection": "Collection",
"ID": "ID",
"Copy ID": "Copy ID"
}

0 comments on commit ce73a3a

Please sign in to comment.