Merge remote-tracking branch 'origin/develop' into Version-v8.0.0

* origin/develop:
  Fix manifest version bump script (#8715)
  Consistent rounded corners on tx details modal/popup (#8714)

.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"

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 {