diff --git a/.changelog/1870.breaking.md b/.changelog/1870.breaking.md new file mode 100644 index 0000000000..629886ed97 --- /dev/null +++ b/.changelog/1870.breaking.md @@ -0,0 +1 @@ +Rename to ROSE Wallet diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 85973b6754..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-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 d444c9e68d..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-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-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 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 18e74edc0d..7b0c49a231 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Oasis 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,10 +13,10 @@ ![Demo](docs/images/demo.gif) -- [Oasis Wallet](#oasis-wallet) +- [ROSE Wallet](#rose-wallet) - [Features](#features) - [Getting started](#getting-started) - - [Installing and running oasis-wallet][install-link] + - [Installing and running from source code][install-link] - [Test accounts](#test-accounts) - [Architecture](#architecture) - [Contributing & development](#contributing--development) @@ -41,7 +41,7 @@ ## Getting started -### Installing and running oasis-wallet +### Installing and running from source code You can quickly get started with the following commands: @@ -78,7 +78,7 @@ oasis1qq5t7f2gecsjsdxmp5zxtwgck6pzpjmkvc657z6l ## Architecture -Oasis-wallet needs multiple components to run, all provided in the +This code needs multiple components to run, all provided in the [docker-compose.yml] for local development. ![Architecture diagram](docs/images/architecture.svg) @@ -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 Wallet uses [react-i18next] for internationalization. You can +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`. @@ -228,4 +228,4 @@ and download the translation file there, [license-link]: https://opensource.org/licenses/Apache-2.0 [codecov-badge]: https://codecov.io/gh/oasisprotocol/oasis-wallet-web/branch/master/graph/badge.svg [codecov-link]: https://codecov.io/gh/oasisprotocol/oasis-wallet-web -[install-link]: #installing-and-running-oasis-wallet +[install-link]: #installing-and-running-from-source-code diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 94ea8e20a9..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 Wallet - Oasis Wallet + ROSE Wallet + ROSE Wallet com.oasisprotocol.wallet com.oasisprotocol.wallet diff --git a/capacitor.config.ts b/capacitor.config.ts index 73b775a522..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 Wallet', + appName: 'ROSE Wallet', webDir: 'build', server: { androidScheme: 'https', diff --git a/docs/release-process.md b/docs/release-process.md index 9ba7528bb3..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-wallet-$VERSION-$COMMIT.zip build-ext/ +zip -r rose-wallet-$VERSION-$COMMIT.zip build-ext/ ``` - GitHub pre-release with zip file diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 09f2442138..c26a300648 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - Oasis Wallet + ROSE Wallet CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/package.json b/package.json index 614359de00..75b5ff1fd4 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-wallet", + "name": "@oasisprotocol/rose-wallet-web", "version": "1.9.1", "private": true, "repository": { diff --git a/playwright/package.json b/playwright/package.json index 8845060570..9ca672b7c6 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -1,5 +1,5 @@ { - "name": "@oasisprotocol/oasis-wallet-playwright-test", + "name": "@oasisprotocol/rose-wallet-playwright-test", "version": "0.0.0-development", "scripts": { "test": "playwright test", diff --git a/playwright/tests/syncTabs.spec.ts b/playwright/tests/syncTabs.spec.ts index 92ac42e364..24b2814284 100644 --- a/playwright/tests/syncTabs.spec.ts +++ b/playwright/tests/syncTabs.spec.ts @@ -76,7 +76,7 @@ test.describe('syncTabs', () => { // Second tab should sync the opened wallet await tab2.goto('/') await expect(tab2.getByTestId('account-selector')).toBeVisible() - await tab2.getByRole('link', { name: 'Wallet', exact: true }).click() + await tab2.getByRole('link', { name: 'ROSE Wallet', exact: true }).click() await expect(tab2).toHaveURL(new RegExp(`/account/${privateKeyAddress}`)) await expect(tab2.getByTestId('account-balance-summary')).toContainText('ROSE') diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index 4f6fab2814..545d0414c0 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -1,6 +1,6 @@ { "appName": { - "message": "Oasis Wallet", + "message": "ROSE Wallet", "description": "The name of the application" }, "appDescription": { diff --git a/public/app.webmanifest b/public/app.webmanifest index 959a514478..19a63b997e 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 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 61c35d8b1f..0339343e2e 100644 --- a/public/index.html +++ b/public/index.html @@ -9,11 +9,11 @@ - + - Oasis Wallet + ROSE Wallet diff --git a/public/manifest.json b/public/manifest.json index 865dbb6b50..26b2bfcf39 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -25,7 +25,7 @@ "128": "./logo512.png", "512": "./logo512.png" }, - "default_title": "Oasis 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 75cf5c709e..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 Wallet" + titleTemplate="%s - ROSE Wallet" > should match snapshot 1`] = ` .c5 { font-size: 12px; line-height: 18px; - color: #a3a3a3; + color: #0092f6; font-weight: 600; } diff --git a/src/app/components/AddEscrowForm/index.tsx b/src/app/components/AddEscrowForm/index.tsx index 6c8b4ff1cc..00e6f30431 100644 --- a/src/app/components/AddEscrowForm/index.tsx +++ b/src/app/components/AddEscrowForm/index.tsx @@ -106,7 +106,7 @@ export const AddEscrowForm = memo((props: Props) => { onChange={event => setAmount(event.target.value)} required icon={ - + {ticker} } diff --git a/src/app/components/AmountFormatter/__tests__/__snapshots__/index.test.tsx.snap b/src/app/components/AmountFormatter/__tests__/__snapshots__/index.test.tsx.snap index 64cc4dd5cd..966f2ec206 100644 --- a/src/app/components/AmountFormatter/__tests__/__snapshots__/index.test.tsx.snap +++ b/src/app/components/AmountFormatter/__tests__/__snapshots__/index.test.tsx.snap @@ -18,6 +18,7 @@ exports[` should render component 1`] = ` .c1 { font-size: 18px; line-height: 24px; + color: ticker; }
@@ -60,7 +61,7 @@ exports[` should render component with small ticker 1`] = ` .c1 { font-size: 12px; line-height: 18px; - color: lightText; + color: ticker; font-weight: 600; } diff --git a/src/app/components/AmountFormatter/index.tsx b/src/app/components/AmountFormatter/index.tsx index 4b0a77129a..939043ef8c 100644 --- a/src/app/components/AmountFormatter/index.tsx +++ b/src/app/components/AmountFormatter/index.tsx @@ -21,6 +21,7 @@ export interface AmountFormatterProps { hideTicker?: boolean size?: string smallTicker?: boolean + plainTicker?: boolean } /** @@ -35,6 +36,7 @@ export const AmountFormatter = memo( hideTicker, size, smallTicker, + plainTicker, }: AmountFormatterProps) => { const ticker = useSelector(selectTicker) const isUsingBaseUnits = amountUnit === 'baseUnits' @@ -51,15 +53,15 @@ export const AmountFormatter = memo( ? { size: 'xsmall', weight: 600, - color: 'lightText', } : {} + const colorProps = plainTicker ? {} : { color: 'ticker' } return ( {amountString} {!hideTicker && ( - + {` ${ticker}`} )} diff --git a/src/app/components/BuildBanner/index.tsx b/src/app/components/BuildBanner/index.tsx index b8e37f6e85..6972ab7231 100644 --- a/src/app/components/BuildBanner/index.tsx +++ b/src/app/components/BuildBanner/index.tsx @@ -29,7 +29,7 @@ export const BuildBanner = () => { }> {t( 'banner.buildStaging', - 'Please note this is the staging deployment of Oasis 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 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/FatalErrorHandler/index.tsx b/src/app/components/FatalErrorHandler/index.tsx index 2c240651a5..30a42b8c96 100644 --- a/src/app/components/FatalErrorHandler/index.tsx +++ b/src/app/components/FatalErrorHandler/index.tsx @@ -61,7 +61,7 @@ export function FatalErrorHandler({ children }: Props) { return ( - {t('appTitle', + {t('appTitle', 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 7bb48f8452..6b113042e7 100644 --- a/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap +++ b/src/app/components/Footer/__tests__/__snapshots__/index.test.tsx.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`
should render mobile version of footer 1`] = ` -.c8 { +.c9 { display: inline-block; -webkit-flex: 0 0 auto; -ms-flex: 0 0 auto; @@ -12,23 +12,23 @@ exports[`
should render mobile version of footer 1`] = ` stroke: #666666; } -.c8 g { +.c9 g { fill: inherit; stroke: inherit; } -.c8 *:not([stroke])[fill='none'] { +.c9 *:not([stroke])[fill='none'] { stroke-width: 0; } -.c8 *[stroke*='#'],.c8 *[STROKE*='#'] { +.c9 *[stroke*='#'],.c9 *[STROKE*='#'] { stroke: inherit; fill: none; } -.c8 *[fill-rule], -.c8 *[FILL-RULE], -.c8 *[fill*='#'],.c8 *[FILL*='#'] { +.c9 *[fill-rule], +.c9 *[FILL-RULE], +.c9 *[fill*='#'],.c9 *[FILL*='#'] { fill: inherit; stroke: none; } @@ -79,7 +79,7 @@ exports[`
should render mobile version of footer 1`] = ` flex-direction: column; } -.c6 { +.c7 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -103,7 +103,7 @@ exports[`
should render mobile version of footer 1`] = ` padding-right: 24px; } -.c7 { +.c8 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -151,12 +151,14 @@ exports[`
should render mobile version of footer 1`] = ` text-align: center; } -.c9 { - font-size: 14px; - line-height: 20px; +.c5 { + font-size: inherit; + line-height: normal; + color: #0092f6; + font-weight: 600; } -.c5 { +.c6 { background-color: #FFFFFF; position: fixed; bottom: 0; @@ -208,14 +210,14 @@ exports[`
should render mobile version of footer 1`] = ` } @media only screen and (max-width:768px) { - .c6 { + .c7 { padding-left: 12px; padding-right: 12px; } } @media only screen and (max-width:768px) { - .c7 { + .c8 { margin: 3px; } } @@ -227,7 +229,7 @@ exports[`
+ + + ROSE + + + + trademark pending +