From 87d7aee065a1143c2058c70078789b41d47c5088 Mon Sep 17 00:00:00 2001 From: Michal Zielenkiewicz Date: Tue, 16 Apr 2024 16:32:14 +0200 Subject: [PATCH] Further refinement of Oasis branding --- .changelog/1893.feature.md | 1 + .github/workflows/ci-build.yml | 2 +- .github/workflows/release.yml | 6 +++--- README.md | 6 +++--- android/app/src/main/res/values/strings.xml | 4 ++-- capacitor.config.ts | 2 +- docs/release-process.md | 2 +- extension/src/popup.html | 2 +- ios/App/App/Info.plist | 2 +- package.json | 2 +- playwright/package.json | 2 +- public/_locales/en/messages.json | 2 +- public/app.webmanifest | 2 +- public/index.html | 4 ++-- public/manifest.json | 2 +- src/app/__tests__/__snapshots__/index.test.tsx.snap | 4 ++-- src/app/components/BuildBanner/index.tsx | 4 ++-- .../Footer/__tests__/__snapshots__/index.test.tsx.snap | 2 +- src/app/components/Footer/index.tsx | 2 +- src/app/components/Persist/DeleteProfileButton.tsx | 2 +- src/app/index.tsx | 4 ++-- src/locales/de/translation.json | 2 +- src/locales/en/translation.json | 8 ++++---- src/locales/fr/translation.json | 6 +++--- src/locales/sl/translation.json | 8 ++++---- src/locales/tr/translation.json | 4 ++-- 26 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 .changelog/1893.feature.md diff --git a/.changelog/1893.feature.md b/.changelog/1893.feature.md new file mode 100644 index 0000000000..bdc7b33917 --- /dev/null +++ b/.changelog/1893.feature.md @@ -0,0 +1 @@ +Further refinement of Oasis branding diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4c130c74b4..1aa928cce7 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -45,5 +45,5 @@ jobs: if: github.event_name == 'push' uses: actions/upload-artifact@v4 with: - name: oasis-rose-wallet-web-${{ steps.vars.outputs.SHORT_SHA }} + name: rose-wallet-web-${{ steps.vars.outputs.SHORT_SHA }} path: build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 742db38419..a80710bf0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - name: Create zip file run: | cd build/ - zip -r ../oasis-rose-wallet-web-${{ steps.vars.outputs.VERSION }}.zip . + zip -r ../rose-wallet-web-${{ steps.vars.outputs.VERSION }}.zip . - name: Parse CHANGELOG.md file and extract changes for the given version uses: buberdds/extract-changelog-action@v1 id: changelog @@ -53,10 +53,10 @@ jobs: uses: softprops/action-gh-release@v1 with: files: | - oasis-rose-wallet-web-${{ steps.vars.outputs.VERSION }}.zip + rose-wallet-web-${{ steps.vars.outputs.VERSION }}.zip build/Content-Security-Policy.txt build/Permissions-Policy.txt - name: Oasis ROSE Wallet ${{ steps.vars.outputs.VERSION }} + name: ROSE Wallet ${{ steps.vars.outputs.VERSION }} body: ${{ steps.changelog.outputs.content }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 68145f7196..6f48121a2b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Oasis ROSE Wallet +# ROSE Wallet [![CI build status][github-ci-build-badge]][github-ci-build-link] [![CI test status][github-ci-test-badge]][github-ci-test-link] @@ -13,7 +13,7 @@ [demo-video] -- [Oasis ROSE Wallet](#oasis-rose-wallet) +- [ROSE Wallet](#rose-wallet) - [Features](#features) - [Getting started](#getting-started) - [Installing and running from source code][install-link] @@ -172,7 +172,7 @@ A detailed post on Git commit messages: [How To Write a Git Commit Message]. Translating: We have [Transifex] to easily contribute translations. -Development: Oasis ROSE Wallet uses [react-i18next] for internationalization. +Development: ROSE Wallet uses [react-i18next] for internationalization. You can simply use the [useTranslation hook] inside your components to add additional translation-ready strings. You can then export the new keys to the [English translation.json] by running `yarn run extract-messages`. diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 9d5d5404dc..0a3546f887 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - Oasis ROSE Wallet - Oasis ROSE Wallet + ROSE Wallet + ROSE Wallet com.oasisprotocol.wallet com.oasisprotocol.wallet diff --git a/capacitor.config.ts b/capacitor.config.ts index cd9190142f..d6a55101a8 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -2,7 +2,7 @@ import { CapacitorConfig } from '@capacitor/cli' const config: CapacitorConfig = { appId: 'com.oasisprotocol.wallet', - appName: 'Oasis ROSE Wallet', + appName: 'ROSE Wallet', webDir: 'build', server: { androidScheme: 'https', diff --git a/docs/release-process.md b/docs/release-process.md index d727117a43..2547e7002e 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -60,7 +60,7 @@ VERSION=`cat extension/src/manifest.json | jq .version -r` COMMIT=`git rev-parse --short HEAD` yarn install --frozen-lockfile yarn build:ext -zip -r oasis-rose-wallet-$VERSION-$COMMIT.zip build-ext/ +zip -r rose-wallet-$VERSION-$COMMIT.zip build-ext/ ``` - GitHub pre-release with zip file diff --git a/extension/src/popup.html b/extension/src/popup.html index 9b5465d37d..3a79692d34 100644 --- a/extension/src/popup.html +++ b/extension/src/popup.html @@ -2,7 +2,7 @@ - Oasis Web Extension + ROSE Wallet Extension
diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 963caca468..c26a300648 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - Oasis ROSE Wallet + ROSE Wallet CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/package.json b/package.json index 62b4fc6f36..c676a87c24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/lukaw3d/parcel-bundler-json-schemas/main/package_schema.json", - "name": "@oasisprotocol/oasis-rose-wallet", + "name": "@oasisprotocol/rose-wallet", "version": "1.10.0", "private": true, "repository": { diff --git a/playwright/package.json b/playwright/package.json index 4885df9dad..ff796b9e34 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -1,5 +1,5 @@ { - "name": "@oasisprotocol/oasis-rose-wallet-playwright-test", + "name": "@oasisprotocol/rose-wallet-playwright-test", "version": "0.0.0-development", "private": true, "scripts": { diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index 5ae455554b..545d0414c0 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -1,6 +1,6 @@ { "appName": { - "message": "Oasis ROSE Wallet", + "message": "ROSE Wallet", "description": "The name of the application" }, "appDescription": { diff --git a/public/app.webmanifest b/public/app.webmanifest index ff8e60420f..f241fc2ad5 100644 --- a/public/app.webmanifest +++ b/public/app.webmanifest @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/web-manifest-combined.json", - "short_name": "Oasis ROSE Wallet", + "short_name": "ROSE Wallet", "name": "The official non-custodial web wallet for the Oasis Network.", "icons": [ { diff --git a/public/index.html b/public/index.html index 4572bfd81d..3b22c8c913 100644 --- a/public/index.html +++ b/public/index.html @@ -9,11 +9,11 @@ - + - Oasis ROSE Wallet + ROSE Wallet diff --git a/public/manifest.json b/public/manifest.json index e07edc659d..5a33a3928f 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -25,7 +25,7 @@ "128": "./Icon Blue 512.png", "512": "./Icon Blue 512.png" }, - "default_title": "Oasis ROSE Wallet", + "default_title": "ROSE Wallet", "default_popup": "../extension/src/popup.html" }, "permissions": ["storage", "notifications", "activeTab"], diff --git a/src/app/__tests__/__snapshots__/index.test.tsx.snap b/src/app/__tests__/__snapshots__/index.test.tsx.snap index 0c14935e41..f2735ff069 100644 --- a/src/app/__tests__/__snapshots__/index.test.tsx.snap +++ b/src/app/__tests__/__snapshots__/index.test.tsx.snap @@ -4,7 +4,7 @@ exports[` should render and match the snapshot 1`] = ` should render and match the snapshot 1`] = ` } } prioritizeSeoTags={false} - titleTemplate="%s - Oasis ROSE Wallet" + titleTemplate="%s - ROSE Wallet" > { }> {t( 'banner.buildStaging', - 'Please note this is the staging deployment of Oasis ROSE Wallet. ONLY USE IT FOR TESTING.', + 'Please note this is the staging deployment of ROSE Wallet. ONLY USE IT FOR TESTING.', )} @@ -41,7 +41,7 @@ export const BuildBanner = () => { }> {t( 'banner.buildPreview', - 'Please note this is an experimental build of Oasis ROSE Wallet and your secrets are not safe. ONLY USE IT FOR TESTING.', + 'Please note this is an experimental build of ROSE Wallet and your secrets are not safe. ONLY USE IT FOR TESTING.', )} diff --git a/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap b/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap index 11704e70aa..84c8b059b1 100644 --- a/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap +++ b/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap @@ -222,7 +222,7 @@ exports[`