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

New Crowdin translations #202

Merged
merged 2 commits into from
Jan 20, 2019
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
71 changes: 55 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
#
version: 2

aliases:
- &attach_workspace
attach_workspace:
at: ~/repo

jobs:
build:
build-setup:
working_directory: ~/repo
docker:
- image: circleci/node:8-browsers
Expand All @@ -27,42 +32,76 @@ jobs:
- run: npm run build-js-cardano-wasm
- run: npm install

# code checks // TODO: Not runnning on this branch :/
# code quality checks
- run: npm run flow
- run: npm run eslint

# run tests!
- run: npm run test-e2e
- run: npm run build -- --env "staging"
- run: npm run compress -- --env "staging" --zip-only --app-id $APP_ID --codebase "https://www.sample.com/dw/yoroi-extension.crx"
# create extensions to be consumed by browsers
- run: npm run test-prepare

# persist results to then use them in tests
- persist_to_workspace:
root: ~/repo
paths: .

test-chrome:
working_directory: ~/repo
docker:
- image: circleci/node:8-browsers

# Persist the specified paths (~/repo) into the workspace for use in downstream job.
# TODO:
#- persist_to_workspace:
# root: ~/
# paths:
# - ./repo/yoroi.zip
steps:
- checkout
- *attach_workspace
- run: npm run test-e2e-chrome

test-firefox:
working_directory: ~/repo
docker:
- image: circleci/node:8-browsers

steps:
- checkout
- *attach_workspace

# unsiggned addons are only supported in Firefox-dev, Firefox nightly and Firefox-esr
# CircleCI comes w/ Firefox but we need to replace it w/ Firefox-esr
# Firefox-esr is easier to install of Debian so we pick it
# https://www.mozilla.org/en-US/firefox/organizations/
- run: sudo rm -f /opt/firefox/firefox
- run: sudo rm -f /usr/local/bin/firefox
- run: sudo apt install firefox-esr
- run: sudo ln -s /usr/bin/firefox-esr /usr/local/bin/firefox

- run: npm run test-e2e-firefox

deploy-testnet:
working_directory: ~/repo
docker:
- image: circleci/node:8-browsers

steps:
- attach_workspace:
at: ~/build
- *attach_workspace

- run: npm run build -- --env "staging"
- run: npm run compress -- --env "staging" --zip-only --app-id $APP_ID --codebase "https://www.sample.com/dw/yoroi-extension.crx"
- run: sudo npm install -g chrome-webstore-upload-cli
- run: cd ~/build/repo/ && webstore upload --source yoroi.zip --extension-id="${APP_ID}" --client-id="${CLIENT_ID}" --client-secret="${CLIENT_SECRET}" --refresh-token="${REFRESH_TOKEN}" --auto-publish --trusted-testers

workflows:
version: 2
build-deploy:
jobs:
- build
- build-setup
- test-chrome:
requires:
- build-setup
- test-firefox:
requires:
- build-setup
- deploy-testnet:
requires:
- build
- test-chrome
- test-firefox
filters:
branches:
only: staging
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dev/
dll/

*.zip
*.xpi
*.crx
# pem files are used to sign the extension so we ignore the to avoid accidental leakage
*.pem
Expand Down
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $ npm run dev
$ npm run build -- --env "mainnet"
```

- Testnet
- Testnet (not supported yet)
```bash
# build files to './build'
$ npm run build -- --env "testnet"
Expand All @@ -41,6 +41,12 @@ $ npm run build -- --env "testnet"

_Note_: `dev` should hot reload on code change

## Run Yoroi Firefox extension

Debug builds are not maintained for Firefox as firefox rejects manifest files with non-https `localhost` in them.
You can bypass this by manually adding the extension into your Firefox folder but this is kind of tedious.
I suggest instead installing the `mainnet` build as it does not use `localhost`. (through `about:debugging` or `about:addons`). See [SETUP.md](docs/SETUP.md) for how to makes the unittests pass.

## Build release candidate

[RELEASE.md](docs/RELEASE.md)
Expand All @@ -55,7 +61,8 @@ $ npm run flow
# lint
$ npm run eslint
# features (command to run all existing tests)
$ npm run test-e2e
$ npm run test-prepare
$ npm run test-e2e-chrome
# How to run one .feature file (One feature file = one covered component from youtrack)
$ npm run test-by-feature feature/wallet-creation.feature
# How to run one test. Instead of '@it-10' you can use any tag from youtrack
Expand Down
4 changes: 3 additions & 1 deletion app/components/wallet/send/WalletSendConfirmationDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ export default class WalletSendConfirmationDialog extends Component<Props> {
const actions = [
{
label: intl.formatMessage(globalMessages.walletSendConfirmationBackButtonLabel),
onClick: !isSubmitting && onCancel,
onClick: isSubmitting
? () => {} // noop
: onCancel
},
{
label: intl.formatMessage(messages.sendButtonLabel),
Expand Down
3 changes: 3 additions & 0 deletions app/components/widgets/forms/InlineEditingInput.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
}
}

// need this as Firefox disabled bubbling of click events on disabled inputs
input[disabled] {pointer-events:none}

.button {
bottom: 10px;
color: var(--theme-label-button-color);
Expand Down
Loading