Skip to content

Commit

Permalink
Merge pull request #1893 from oasisprotocol/mz/brand-2
Browse files Browse the repository at this point in the history
Further refinement of Oasis branding
  • Loading branch information
buberdds authored Apr 16, 2024
2 parents 75153ec + 87d7aee commit c76a807
Show file tree
Hide file tree
Showing 26 changed files with 44 additions and 43 deletions.
1 change: 1 addition & 0 deletions .changelog/1893.feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Further refinement of Oasis branding
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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`.
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">Oasis ROSE Wallet</string>
<string name="title_activity_main">Oasis ROSE Wallet</string>
<string name="app_name">ROSE Wallet</string>
<string name="title_activity_main">ROSE Wallet</string>
<string name="package_name">com.oasisprotocol.wallet</string>
<string name="custom_url_scheme">com.oasisprotocol.wallet</string>
</resources>
2 changes: 1 addition & 1 deletion capacitor.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
<title>Oasis Web Extension</title>
<title>ROSE Wallet Extension</title>
</head>
<body>
<div id="root" style="min-width: 360px; min-height: 600px"></div>
Expand Down
2 changes: 1 addition & 1 deletion ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Oasis ROSE Wallet</string>
<string>ROSE Wallet</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion playwright/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion public/_locales/en/messages.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"appName": {
"message": "Oasis ROSE Wallet",
"message": "ROSE Wallet",
"description": "The name of the application"
},
"appDescription": {
Expand Down
2 changes: 1 addition & 1 deletion public/app.webmanifest
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand Down
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<meta name="theme-color" content="#000000" />
<link rel="apple-touch-icon" href="./Icon Blue 192.png" />
<link rel="manifest" href="./app.webmanifest" />
<meta property="og:title" content="Oasis ROSE Wallet" />
<meta property="og:title" content="ROSE Wallet" />
<meta property="og:description" content="The official non-custodial web wallet for the Oasis Network." />
<meta property="og:image" content="./Rose Wallet - OpenGraph Banner.png" />
<meta property="og:type" content="website" />
<title>Oasis ROSE Wallet</title>
<title>ROSE Wallet</title>
<meta name="description" content="The official non-custodial web wallet for the Oasis Network." />
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
4 changes: 2 additions & 2 deletions src/app/__tests__/__snapshots__/index.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`<App /> should render and match the snapshot 1`] = `
<FatalErrorHandler>
<ModalProvider>
<Helmet
defaultTitle="Oasis ROSE Wallet"
defaultTitle="ROSE Wallet"
defer={true}
encodeSpecialCharacters={true}
htmlAttributes={
Expand All @@ -13,7 +13,7 @@ exports[`<App /> should render and match the snapshot 1`] = `
}
}
prioritizeSeoTags={false}
titleTemplate="%s - Oasis ROSE Wallet"
titleTemplate="%s - ROSE Wallet"
>
<meta
content="A wallet for Oasis"
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/BuildBanner/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const BuildBanner = () => {
<AlertBox status="warning" center icon={<Alert size="20px" color="currentColor" />}>
{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.',
)}
</AlertBox>
</StickyBanner>
Expand All @@ -41,7 +41,7 @@ export const BuildBanner = () => {
<AlertBox status="warning" center icon={<Alert size="20px" color="currentColor" />}>
{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.',
)}
</AlertBox>
</StickyBanner>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ exports[`<Footer /> should render mobile version of footer 1`] = `
class="c1"
>
<span>
Oasis ROSE Wallet is fully
ROSE Wallet is fully
</span>
<a
class="c2"
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const Footer = memo(() => {
i18nKey="footer.github"
t={t}
components={{ GithubLink: <Anchor href={githubLink} target="_blank" rel="noopener noreferrer" /> }}
defaults="Oasis ROSE Wallet is fully <GithubLink>open source</GithubLink> - Feedback and issues are appreciated!"
defaults="ROSE Wallet is fully <GithubLink>open source</GithubLink> - Feedback and issues are appreciated!"
/>
</Text>
<Text size={responsiveSize} textAlign="center" margin={{ bottom: responsiveSize }}>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Persist/DeleteProfileButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function DeleteProfileButton({ prominent, variant }: DeleteProfileButtonP
<span>
{t(
'persist.loginToProfile.deleteProfile.forgotPasswordDescription',
'Oasis ROSE Wallet does not store your password and cannot help you retrieve it. If you forgot your password, you can delete your locked profile here. After that, you can create a new one using your mnemonic phrase or private keys, and use your ROSE tokens again.',
'ROSE Wallet does not store your password and cannot help you retrieve it. If you forgot your password, you can delete your locked profile here. After that, you can create a new one using your mnemonic phrase or private keys, and use your ROSE tokens again.',
)}
<br />
<br />
Expand Down
4 changes: 2 additions & 2 deletions src/app/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export function App() {
<FatalErrorHandler>
<ModalProvider>
<Helmet
titleTemplate="%s - Oasis ROSE Wallet"
defaultTitle="Oasis ROSE Wallet"
titleTemplate="%s - ROSE Wallet"
defaultTitle="ROSE Wallet"
htmlAttributes={{ lang: i18n.language }}
>
<meta name="description" content="A wallet for Oasis" />
Expand Down
2 changes: 1 addition & 1 deletion src/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"oasisscan": "Oasis Scan API"
},
"banner": {
"buildStaging": "Bitte beachte, dass dies die Testversion der Oasis ROSE Wallet ist. VERWENDE SIE NUR ZU TESTZWECKEN."
"buildStaging": "Bitte beachte, dass dies die Testversion der ROSE Wallet ist. VERWENDE SIE NUR ZU TESTZWECKEN."
},
"common": {
"amount": "Betrag",
Expand Down
8 changes: 4 additions & 4 deletions src/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
"oasisscan": "Oasis Scan API"
},
"banner": {
"buildPreview": "Please note this is an experimental build of Oasis ROSE Wallet and your secrets are not safe. ONLY USE IT FOR TESTING.",
"buildStaging": "Please note this is the staging deployment of Oasis ROSE Wallet. ONLY USE IT FOR TESTING."
"buildPreview": "Please note this is an experimental build of ROSE Wallet and your secrets are not safe. ONLY USE IT FOR TESTING.",
"buildStaging": "Please note this is the staging deployment of ROSE Wallet. ONLY USE IT FOR TESTING."
},
"common": {
"amount": "Amount",
Expand Down Expand Up @@ -184,7 +184,7 @@
"thirdPartyDisclaimer": "This service is provided by an external party. Oasis* does not carry any responsibility. All fees charged by Transak."
},
"footer": {
"github": "Oasis ROSE Wallet is fully <GithubLink>open source</GithubLink> - Feedback and issues are appreciated!",
"github": "ROSE Wallet is fully <GithubLink>open source</GithubLink> - Feedback and issues are appreciated!",
"poweredBy": {
"oasismonitor": "Powered by Oasis Monitor API & Oasis gRPC",
"oasisscan": "Powered by Oasis Scan API & Oasis gRPC"
Expand Down Expand Up @@ -400,7 +400,7 @@
"button": "Delete profile",
"description": "This will <strong>permanently remove your private keys from this device.</strong><br/><br/>To confirm and proceed, please type '{{confirmationKeyword}}' below.",
"forgotPasswordButton": "Forgot password?",
"forgotPasswordDescription": "Oasis ROSE Wallet does not store your password and cannot help you retrieve it. If you forgot your password, you can delete your locked profile here. After that, you can create a new one using your mnemonic phrase or private keys, and use your ROSE tokens again.",
"forgotPasswordDescription": "ROSE Wallet does not store your password and cannot help you retrieve it. If you forgot your password, you can delete your locked profile here. After that, you can create a new one using your mnemonic phrase or private keys, and use your ROSE tokens again.",
"title": "Delete Profile"
},
"description": "Log into your existing user profile on this computer to access the wallets you already added.",
Expand Down
6 changes: 3 additions & 3 deletions src/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"invalidAddress": "Adresse invalide",
"invalidNonce": "Nonce invalide (numéro de transaction)",
"invalidPrivateKey": "Clé privée invalide",
"ledgerAppVersionNotSupported": "Erreur reçue : \"Ledger App Version not supported\", cette erreur peut être un faux positif, relancez Oasis ROSE Wallet et réessayez. Si l'erreur persiste, mettez à jour l'application Oasis dans votre Ledger.",
"ledgerAppVersionNotSupported": "Erreur reçue : \"Ledger App Version not supported\", cette erreur peut être un faux positif, relancez ROSE Wallet et réessayez. Si l'erreur persiste, mettez à jour l'application Oasis dans votre Ledger.",
"ledgerCannotOpenOasisApp": "Impossible d'accéder à l'application Oasis sur le Ledger. Assurez vous qu'il est dévérouillé et que l'application Oasis est ouverte.",
"ledgerNoDeviceSelected": "Aucun matériel Ledger détecté. Vérifiez qu'il soit connecté. <LedgerHelp>Vérifiez les problèmes de connexion USB courants avec le matériel Ledger</LedgerHelp>. <ChromeHelp>Vérifiez que les permissions du site ne bloque pas les appareils de type USB</ChromeHelp>.",
"ledgerTransactionRejected": "Transaction rejetée sur le Ledger.",
Expand All @@ -117,10 +117,10 @@
"copied": "Erreur copiée",
"copy": "Copier l'erreur",
"heading": "Une erreur fatale s'est produite",
"instruction": "Une erreur fatale s'est produite et Oasis ROSE Wallet doit s'arrêter. Essayez d'actualiser la page et d'ouvrir à nouveau votre portefeuille pour voir si le problème persiste. Si le problème persiste, veuillez contacter notre équipe d'assistance via l'e-mail <Email/> . Envoyez l'email et joignez le rapport ci-dessous."
"instruction": "Une erreur fatale s'est produite et ROSE Wallet doit s'arrêter. Essayez d'actualiser la page et d'ouvrir à nouveau votre portefeuille pour voir si le problème persiste. Si le problème persiste, veuillez contacter notre équipe d'assistance via l'e-mail <Email/> . Envoyez l'email et joignez le rapport ci-dessous."
},
"footer": {
"github": "Oasis ROSE Wallet est entièrement <GithubLink>open source</GithubLink> - N'hésitez pas à remonter tout problème !",
"github": "ROSE Wallet est entièrement <GithubLink>open source</GithubLink> - N'hésitez pas à remonter tout problème !",
"poweredBy": {
"oasismonitor": "Alimenté par Oasis Monitor API & Oasis gRPC",
"oasisscan": "Alimenté par Oasis Scan API & Oasis gRPC"
Expand Down
8 changes: 4 additions & 4 deletions src/locales/sl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
"oasisscan": "Oasis Scan API"
},
"banner": {
"buildPreview": "Uporabljate eksperimentalno različico Oasis ROSE Walleta in vaši ključi so morda ogroženi. UPORABLJAJTE LE KLJUČE ZA TESTIRANJE.",
"buildStaging": "Uporabljate razvojno različico Oasis ROSE Walleta. UPORABLJAJTE GA LE ZA TESTIRANJE."
"buildPreview": "Uporabljate eksperimentalno različico ROSE Walleta in vaši ključi so morda ogroženi. UPORABLJAJTE LE KLJUČE ZA TESTIRANJE.",
"buildStaging": "Uporabljate razvojno različico ROSE Walleta. UPORABLJAJTE GA LE ZA TESTIRANJE."
},
"common": {
"amount": "Znesek",
Expand Down Expand Up @@ -165,7 +165,7 @@
"copied": "Napaka skopirana v odložišče",
"copy": "Skopiraj napako v odložišče",
"heading": "Pojavila se je usodna napaka",
"instruction": "Pojavila se je usodna napaka in Oasis ROSE Wallet se mora zapreti. Poskusite ponovno naložiti stran in odpreti vašo denarnico, da preverite, če se napaka ponovi. V tem primeru vas prosimo, da obvestite podporno ekipo na e-naslov <Email/> in pripnete spodnje poročilo."
"instruction": "Pojavila se je usodna napaka in ROSE Wallet se mora zapreti. Poskusite ponovno naložiti stran in odpreti vašo denarnico, da preverite, če se napaka ponovi. V tem primeru vas prosimo, da obvestite podporno ekipo na e-naslov <Email/> in pripnete spodnje poročilo."
},
"fiatOnramp": {
"astarFootnote": "AStar Technologies, registrirana na Kajmanskih otokih, deluje v imenu in za namene Oasisa in je tudi ponudnik ROSE Walleta.",
Expand All @@ -180,7 +180,7 @@
"thirdPartyDisclaimer": "Storitev opravlja zunanje izvajalec. Oasis* ne nosi odgovornosti za njeno delovanje. Vse provizije zaračuna ponudnik Transak."
},
"footer": {
"github": "Oasis ROSE Wallet je <GithubLink>odprtokodna aplikacija</GithubLink>. Dobrodošli odzivi in morebitna poročila o težavah!",
"github": "ROSE Wallet je <GithubLink>odprtokodna aplikacija</GithubLink>. Dobrodošli odzivi in morebitna poročila o težavah!",
"poweredBy": {
"oasismonitor": "Deluje s pomočjo Oasis Monitor API & Oasis gRPC",
"oasisscan": "Deluje s pomočjo Oasis Scan API & Oasis gRPC"
Expand Down
4 changes: 2 additions & 2 deletions src/locales/tr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
"oasisscan": "Oasis Arama API"
},
"banner": {
"buildPreview": "Lütfen bunun Oasis ROSE Wallet'ın deneysel bir yapısı olduğunu ve sırlarınızın güvende olmadığını unutmayın. SADECE TEST AMAÇLI KULLANIN.",
"buildStaging": "Lütfen bunun Oasis ROSE Wallet'ın hazırlık dağıtımı olduğunu unutmayın. SADECE TEST AMAÇLI KULLANIN."
"buildPreview": "Lütfen bunun ROSE Wallet'ın deneysel bir yapısı olduğunu ve sırlarınızın güvende olmadığını unutmayın. SADECE TEST AMAÇLI KULLANIN.",
"buildStaging": "Lütfen bunun ROSE Wallet'ın hazırlık dağıtımı olduğunu unutmayın. SADECE TEST AMAÇLI KULLANIN."
},
"common": {
"amount": "Miktar",
Expand Down

0 comments on commit c76a807

Please sign in to comment.