From fb906e21504454cbf09546ed5fde4d73af8462cd Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Mon, 1 Jun 2020 13:04:39 -0700 Subject: [PATCH 1/2] Consistent rounded corners on tx details modal/popup (#8714) --- ui/app/components/ui/popover/index.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/app/components/ui/popover/index.scss b/ui/app/components/ui/popover/index.scss index 4eb70d08f..1cf453914 100644 --- a/ui/app/components/ui/popover/index.scss +++ b/ui/app/components/ui/popover/index.scss @@ -85,6 +85,7 @@ justify-content: flex-start; align-items: stretch; align-content: stretch; + border-radius: 10px; } &-container { From 991ef366d7dff6ab13dfed72b8adc1b8ad770b7b Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Mon, 1 Jun 2020 18:07:27 -0300 Subject: [PATCH 2/2] Fix manifest version bump script (#8715) The version bump script referenced the old file path for the manifest. It was stored as a single file called `manifest.json`, but it was split into `_base.json` and platform-specific manifests in #8140. The manifest version bump script has been updated to reference `_base.json`, which is the piece that has the version property. --- .circleci/scripts/release-bump-manifest-version | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/scripts/release-bump-manifest-version b/.circleci/scripts/release-bump-manifest-version index 44b193c97..7579ad70a 100755 --- a/.circleci/scripts/release-bump-manifest-version +++ b/.circleci/scripts/release-bump-manifest-version @@ -19,8 +19,8 @@ fi printf '%s\n' 'Updating the manifest version if needed' version="${CIRCLE_BRANCH/Version-v/}" -updated_manifest="$(jq ".version = \"$version\"" app/manifest.json)" -printf '%s\n' "$updated_manifest" > app/manifest.json +updated_manifest="$(jq ".version = \"$version\"" app/manifest/_base.json)" +printf '%s\n' "$updated_manifest" > app/manifest/_base.json if [[ -z $(git status --porcelain) ]] then @@ -32,7 +32,7 @@ git \ -c user.name='MetaMask Bot' \ -c user.email='metamaskbot@users.noreply.github.com' \ commit --message "${CIRCLE_BRANCH/-/ }" \ - CHANGELOG.md app/manifest.json + CHANGELOG.md app/manifest/_base.json repo_slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME" git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" "$CIRCLE_BRANCH"