Merge branch 'master' into sign/verify

.gitlab-ci.yml

@@ -71,6 +71,7 @@ deploy review:
   environment:
     name: $CI_BUILD_REF_NAME
     url: $BASE_REVIEW_URL/$CI_BUILD_REF_NAME
+    on_stop: delete review
   script:
     - echo "Deploy a review app"
     - '[ -z "${DEPLOY_BASE_DIR}" ] && echo "Deploy base dir cannot be empty" && exit 255'
@@ -114,3 +115,22 @@ deploy stage stable:
     - stable
   tags:
     - deploy
+
+delete review:
+  before_script: []
+  stage: deploy
+  variables:
+    GIT_STRATEGY: none
+  when: manual
+  environment:
+    name: $CI_BUILD_REF_NAME
+    action: stop
+  script:
+    - '[ -z "${DEPLOY_BASE_DIR}" ] && echo "Deploy dir can not be empty" && exit 1'
+    - '[ -z "${CI_BUILD_REF_NAME}" ] && echo "Build name can not be empty" && exit 1'
+    - '[ ! -d "${DEPLOY_BASE_DIR}/${CI_BUILD_REF_NAME}" ] && echo "Folder can not be found, skipping..." && exit 0'
+    - 'rm -r "${DEPLOY_BASE_DIR}/${CI_BUILD_REF_NAME}"'
+  only:
+    - branches
+  tags:
+    - deploy

CHANGELOG.md

@@ -1,12 +1,20 @@
-# 1.0.2-beta
+## 1.0.2-beta
+__changed__
 - Fiat rates from coingecko (https://github.com/trezor/trezor-wallet/pull/242)
 - firmware update link to beta-wallet (https://github.com/trezor/trezor-wallet/commit/b9b7d2d076f2d4c59ae2e055dc140cda6aaa5512)
-- set default gas limit button
 - update list of ETH and ETC tokens
+
+__added__
+- set default gas limit button (https://github.com/trezor/trezor-wallet/issues/184)
 - added 1 click to select value in input (https://github.com/trezor/trezor-wallet/issues/251)
 - added account loader (https://github.com/trezor/trezor-wallet/pull/225)
+- added message how to add ERC20 tokens (https://github.com/trezor/trezor-wallet/issues/238)
 
-# 1.0.1-beta
+__fixed__
+- validation of token existence in send tx draft (https://github.com/trezor/trezor-wallet/pull/252)
+
+
+## 1.0.1-beta
 __added__
 - DigiByte in coin menu
 - blocking device with seedless setup
@@ -18,5 +26,5 @@ __fixed__
 - images preloader for offline status (https://github.com/trezor/trezor-wallet/issues/218)
 
 
-# 1.0.0-beta
+## 1.0.0-beta
 - first release

src/components/modals/passphrase/Passphrase/index.js

@@ -91,8 +91,7 @@ class Passphrase extends PureComponent<Props, State> {
         super(props);
         const { device, selectedDevice } = props;
 
-        // Check if this device is already known
+        // if device is already remembered then only one input is presented
-        // if device is already known then only one input is presented
         let deviceLabel = device.label;
         let shouldShowSingleInput = false;
         if (selectedDevice && selectedDevice.path === device.path) {
@@ -171,7 +170,7 @@ class Passphrase extends PureComponent<Props, State> {
         this.setState(previousState => ({
             isPassphraseHidden: !previousState.isPassphraseHidden,
             passphraseInputValue: previousState.passphraseInputValue,
-            passphraseCheckInputValue: previousState.passphraseCheckInputValue,
+            passphraseCheckInputValue: previousState.passphraseInputValue,
             doPassphraseInputsMatch: match,
         }));
     }