Skip to content

Commit

Permalink
Merge pull request #1870 from oasisprotocol/lw/rename-rose-wallet
Browse files Browse the repository at this point in the history
Rename to ROSE Wallet
  • Loading branch information
lukaw3d authored Apr 5, 2024
2 parents 6d2022d + 92d1aff commit 7cde53e
Show file tree
Hide file tree
Showing 49 changed files with 165 additions and 117 deletions.
1 change: 1 addition & 0 deletions .changelog/1870.breaking.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rename to ROSE Wallet
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-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-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-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 }}
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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)
Expand All @@ -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:

Expand Down Expand Up @@ -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)
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 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`.
Expand Down Expand Up @@ -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
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 Wallet</string>
<string name="title_activity_main">Oasis 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 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-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 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 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-wallet",
"name": "@oasisprotocol/rose-wallet-web",
"version": "1.9.1",
"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-wallet-playwright-test",
"name": "@oasisprotocol/rose-wallet-playwright-test",
"version": "0.0.0-development",
"scripts": {
"test": "playwright test",
Expand Down
2 changes: 1 addition & 1 deletion playwright/tests/syncTabs.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')

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 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 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="./logo192.png" />
<link rel="manifest" href="./app.webmanifest" />
<meta property="og:title" content="Oasis 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="./oasis-og-image.jpg" />
<meta property="og:type" content="website" />
<title>Oasis 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": "./logo512.png",
"512": "./logo512.png"
},
"default_title": "Oasis 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 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 Wallet"
titleTemplate="%s - ROSE Wallet"
>
<meta
content="A wallet for Oasis"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports[`<AddEscrowForm /> should match snapshot 1`] = `
.c5 {
font-size: 12px;
line-height: 18px;
color: #a3a3a3;
color: #0092f6;
font-weight: 600;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/AddEscrowForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const AddEscrowForm = memo((props: Props) => {
onChange={event => setAmount(event.target.value)}
required
icon={
<Text size="xsmall" weight={600} color="lightText">
<Text size="xsmall" weight={600} color="ticker">
{ticker}
</Text>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ exports[`<AmountFormatter /> should render component 1`] = `
.c1 {
font-size: 18px;
line-height: 24px;
color: ticker;
}
<div>
Expand Down Expand Up @@ -60,7 +61,7 @@ exports[`<AmountFormatter /> should render component with small ticker 1`] = `
.c1 {
font-size: 12px;
line-height: 18px;
color: lightText;
color: ticker;
font-weight: 600;
}
Expand Down
6 changes: 4 additions & 2 deletions src/app/components/AmountFormatter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export interface AmountFormatterProps {
hideTicker?: boolean
size?: string
smallTicker?: boolean
plainTicker?: boolean
}

/**
Expand All @@ -35,6 +36,7 @@ export const AmountFormatter = memo(
hideTicker,
size,
smallTicker,
plainTicker,
}: AmountFormatterProps) => {
const ticker = useSelector(selectTicker)
const isUsingBaseUnits = amountUnit === 'baseUnits'
Expand All @@ -51,15 +53,15 @@ export const AmountFormatter = memo(
? {
size: 'xsmall',
weight: 600,
color: 'lightText',
}
: {}
const colorProps = plainTicker ? {} : { color: 'ticker' }

return (
<span>
<Box style={{ display: 'inline-flex', whiteSpace: 'nowrap' }}>{amountString}</Box>
{!hideTicker && (
<Text size={size} {...tickerProps}>
<Text size={size} {...tickerProps} {...colorProps}>
<NoTranslate>{` ${ticker}`}</NoTranslate>
</Text>
)}
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 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 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
2 changes: 1 addition & 1 deletion src/app/components/FatalErrorHandler/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function FatalErrorHandler({ children }: Props) {
return (
<ResponsiveLayer modal background="background-front">
<Box align="end" margin={{ horizontal: 'large', top: 'medium' }}>
<img src={logotype} alt={t('appTitle', 'Oasis Wallet')} width="45" height="45" />
<img src={logotype} alt={t('appTitle', 'ROSE Wallet')} width="45" height="45" />
</Box>
<Box margin={{ horizontal: 'large', bottom: 'large' }}>
<Box direction="row" align="center" gap="small">
Expand Down
Loading

0 comments on commit 7cde53e

Please sign in to comment.