Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/nym wallet rename #890

Merged
merged 6 commits into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ Cargo.* @durch @futurechimp @jstuczyn @neacsu

# Explorer and wallet should probably get looked by the product team
/explorer/ @nymtech/product
/tauri-wallet/ @nymtech/product
/nym-wallet/ @nymtech/product
/wallet-web/ @nymtech/product
36 changes: 18 additions & 18 deletions .github/workflows/nym_wallet.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: Webdriverio tests for nym wallet

on:
push:
on:
push:
paths:
- 'tauri-wallet/**'
- "nym-wallet/**"

defaults:
run:
working-directory: tauri-wallet
working-directory: nym-wallet

jobs:
test:
name: wallet tests
runs-on: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

Expand All @@ -30,41 +30,41 @@ jobs:
- name: Install minimal stable
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
profile: minimal
toolchain: stable

- name: Node v16
uses: actions/setup-node@v1
with:
node-version: 16.x

- name: Install yarn for building application
run: yarn install
run: yarn install

- name: Build application
run: yarn run webpack:build & yarn run tauri:build

- name: Check binary exists
run: |
cd target/release/
(test -f nym-wallet && echo nym binary exists) || echo wallet does not exist
cd target/release/
(test -f nym-wallet && echo nym binary exists) || echo wallet does not exist

- name: Install dependencies
run: yarn install
working-directory: tauri-wallet/webdriver
working-directory: nym-wallet/webdriver

- name: Remove existing user datafile
uses: JesseTG/rm@v1.0.2
with:
path: tauri-wallet/webdriver/common/data/user-data.json
path: nym-wallet/webdriver/common/data/user-data.json

- name: Create user data json file
id: create-json
uses: jsdaniell/create-json@1.1.2
with:
name: "user-data.json"
json: ${{ secrets.WALLET_USERDATA }}
dir: 'tauri-wallet/webdriver/common/data/'
name: "user-data.json"
json: ${{ secrets.WALLET_USERDATA }}
dir: "nym-wallet/webdriver/common/data/"

- name: Install tauri-driver
uses: actions-rs/cargo@v1
Expand All @@ -74,4 +74,4 @@ jobs:

- name: Launch tests
run: xvfb-run yarn test:runall
working-directory: tauri-wallet/webdriver
working-directory: nym-wallet/webdriver
2 changes: 1 addition & 1 deletion .github/workflows/tauri-wallet-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish Tauri Wallet
on:
push:
tags:
- tauri-wallet-*
- nym-wallet-*

jobs:
build:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tauri-wallet-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: Generate TS types
on:
push:
paths-ignore:
- 'explorer/**'
- "explorer/**"
pull_request:
paths-ignore:
- 'explorer/**'
- "explorer/**"

jobs:
tauri-wallet-types:
nym-wallet-types:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }}
steps:
Expand All @@ -20,10 +20,10 @@ jobs:
with:
toolchain: stable
- name: Generate TS
run: cd tauri-wallet/src-tauri && cargo test
run: cd nym-wallet/src-tauri && cargo test
- uses: EndBug/add-and-commit@v7.2.1 # https://github.com/marketplace/actions/add-commit
with:
add: '["tauri-wallet"]'
message: '[ci skip] Generate TS types'
add: '["nym-wallet"]'
message: "[ci skip] Generate TS types"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions nym-wallet/dist/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<title>Nym Wallet</title>
<link rel="icon" href="assets/favicon.ico"><script defer src="main.js"></script></head>
<body>
<div id="root"></div>
</body>
</html>
5,778 changes: 5,778 additions & 0 deletions nym-wallet/dist/main.js

Large diffs are not rendered by default.

File renamed without changes.
Binary file added nym-wallet/public/favicon.ico
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
43 changes: 43 additions & 0 deletions nym-wallet/src/images/logo-background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nym-wallet/src/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion tauri-wallet/webdriver/.prettierrc.json

This file was deleted.