Skip to content

Commit

Permalink
Merge pull request #339 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 8f88c4c + 6e3428f commit bd68c38
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ yarn-error.log*
__pycache__/

# Ignore build releases.
oasis-rose-wallet-*.zip
rose-wallet-*.zip
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ all: build

# Build.
build:
@$(ECHO) "$(MAGENTA)*** Building Oasis ROSE Wallet Browser Extension...$(OFF)"
@$(ECHO) "$(MAGENTA)*** Building ROSE Wallet Browser Extension...$(OFF)"
@yarn buildProd

# Lint code, commits and documentation.
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Oasis ROSE Wallet - Browser Extension
# ROSE Wallet - Browser Extension

[![CI lint status][github-ci-lint-badge]][github-ci-lint-link]

Expand All @@ -11,7 +11,7 @@ The official non-custodial browser extension wallet for the [Oasis Network].

## Introduction

Oasis ROSE Wallet - Browser Extension provides a complete solution for managing your
ROSE Wallet - Browser Extension provides a complete solution for managing your
ROSE tokens, including everything for convenient staking of your ROSE tokens.

## Features
Expand All @@ -24,7 +24,7 @@ ROSE tokens, including everything for convenient staking of your ROSE tokens.
- Import accounts directly from their private keys
- Watch 3rd-party accounts
- Address book of your saved accounts
- Easily switch between different Oasis ROSE wallets that use the same [ADR 0008]
- Easily switch between different ROSE wallets that use the same [ADR 0008]
standard account key generation process.

### Transactions
Expand Down Expand Up @@ -71,7 +71,7 @@ The extension is roughly laid out this way:

### build extension

Oasis ROSE Wallet extension repo uses git-secret to encrypt the endpoints and the api keys. So, you can't build this without creating your own config file. You should create your own `config.js` file in the folder. Refer to the `config.example.js` sample file to create your own configuration.
ROSE Wallet extension repo uses git-secret to encrypt the endpoints and the api keys. So, you can't build this without creating your own config file. You should create your own `config.js` file in the folder. Refer to the `config.example.js` sample file to create your own configuration.

```sh
yarn install
Expand Down Expand Up @@ -103,7 +103,7 @@ COMMIT=`git rev-parse --short HEAD`
rm -rf dist/
yarn install --frozen-lockfile
yarn buildProd
zip -r oasis-rose-wallet-$VERSION-$COMMIT.zip dist/
zip -r rose-wallet-$VERSION-$COMMIT.zip dist/
```

If you're actually making a new release, follow the applicable steps in the
Expand Down
2 changes: 1 addition & 1 deletion config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Oasis ROSE Wallet - Browser Extension's configuration.
* ROSE Wallet - Browser Extension's configuration.
*
* NOTE: If you intend to build a custom version of the extension, edit this
* file appropriately and rebuild the extension.
Expand Down
12 changes: 6 additions & 6 deletions docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ VERSION=`cat public/manifest.json | jq .version -r`
rm -rf dist/
yarn install --frozen-lockfile
yarn buildProd
zip -r oasis-rose-wallet-$VERSION.zip dist/
zip -r rose-wallet-$VERSION.zip dist/
```

Note: The zip file has no Git commit hash.
Expand All @@ -78,7 +78,7 @@ Note: The zip file has no Git commit hash.
Create a tag and create a
[new release](https://github.com/oasisprotocol/oasis-wallet-ext/releases/new) on GitHub.

Enter `Oasis ROSE Wallet <VERSION> Release Candidate` for the title.
Enter `ROSE Wallet <VERSION> Release Candidate` for the title.

Our Change Log is a file under version control, so all we do is put the link in the description:

Expand All @@ -98,7 +98,7 @@ _This step is for our web store account admins._
_Contact an admin if you don't have access._

Go to [Chrome Web Store Developer Dashboard](https://chrome.google.com/webstore/devconsole/),
browse to the _Oasis_ROSE Wallet_ item,
browse to the _ROSE Wallet_ item,
select _Package_ in the side bar and
choose _Upload new package_.

Expand All @@ -107,15 +107,15 @@ choose _Upload new package_.
Change the title:

```diff
-Oasis ROSE Wallet <VERSION> Release Candidate
+Oasis ROSE Wallet <VERSION>
-ROSE Wallet <VERSION> Release Candidate
+ROSE Wallet <VERSION>
```

Change the description:

```diff
-_Note: This is an internal release candidate._
+_NOTE: These are developer builds. To download the **official builds**, go to [Chrome Web Store](https://chrome.google.com/webstore/detail/oasis-wallet/ppdadbejkmjnefldpcdjhnkpbjkikoip)._
+_NOTE: These are developer builds. To download the **official builds**, go to [Chrome Web Store](https://chrome.google.com/webstore/detail/rose-wallet/ppdadbejkmjnefldpcdjhnkpbjkikoip)._
```

Uncheck the pre-release box.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@oasisprotocol/oasis-rose-wallet-ext",
"name": "@oasisprotocol/rose-wallet-ext",
"version": "1.14.0",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"128": "img/oasis.png",
"512": "img/oasis.png"
},
"default_title": "Oasis ROSE Wallet",
"default_title": "ROSE Wallet",
"default_popup": "popup.html"
},
"permissions": [
Expand Down
2 changes: 1 addition & 1 deletion public/static/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Oasis ROSE Wallet</title>
<title>ROSE Wallet</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
2 changes: 1 addition & 1 deletion src/_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
6 changes: 3 additions & 3 deletions src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"accountImport": "Import",
"postSuccess": "Transaction Submitted",
"startHome": "Start",
"walletName": "Oasis ROSE Wallet",
"walletName": "ROSE Wallet",
"privateError": "Wrong private key",
"importRepeat": "Do not import repeatedly",
"confirmDeleteNode": "Delete confirmation",
Expand Down Expand Up @@ -238,15 +238,15 @@
"txError":"Abnormal transaction",
"userReject":"user reject",
"webApprove":"Approve",
"walletConnect":"Connect by Oasis ROSE Wallet",
"walletConnect":"Connect by ROSE Wallet",
"sign":"Signature",
"waitNonce":"Checking Nonce",
"connectFirst":"Please connect first",
"dappConnect":"Connected",
"dappDisconnect":"Disconnect",
"disconnectSuccess":"Disconnect Success",
"followConnect":"You have {{number}} accounts connected to the website.",
"needConnectTip":"Oasis ROSE Wallet is not connected to this website. To connect to this website please find the connect button in the website.",
"needConnectTip":"ROSE Wallet is not connected to this website. To connect to this website please find the connect button in the website.",
"selectFirst":"Please Select connect address",

"connectSuccess":"Connect Success",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
"dappDisconnect":"未连接",
"disconnectSuccess":"断开连接成功",
"followConnect":"您有 {{number}} 个账户连接到了该网站。",
"needConnectTip":"Oasis ROSE Wallet 没有连接到这个网站。要连接到此网站请在网站中找到连接按钮。",
"needConnectTip":"ROSE Wallet 没有连接到这个网站。要连接到此网站请在网站中找到连接按钮。",
"selectFirst":"请先选择需要连接的地址",
"connectSuccess":"连接成功",
"changeToAccount":"切换至该账户",
Expand Down

0 comments on commit bd68c38

Please sign in to comment.