diff options
| author | Hsuan Lee <boczeratul@gmail.com> | 2019-04-25 10:14:35 +0800 |
|---|---|---|
| committer | Hsuan Lee <boczeratul@gmail.com> | 2019-04-25 10:14:35 +0800 |
| commit | f8423f5a49fbc934109d53754ddd3ae22bd717d2 (patch) | |
| tree | 1302cb18dae3c94fa4b3e91b217cc572f730963f | |
| parent | 343a2671b3d392aee51d7d969763be637ffdd9ea (diff) | |
| download | dexon-wallet-f8423f5a49fbc934109d53754ddd3ae22bd717d2.tar.gz dexon-wallet-f8423f5a49fbc934109d53754ddd3ae22bd717d2.tar.zst dexon-wallet-f8423f5a49fbc934109d53754ddd3ae22bd717d2.zip | |
Update wording
27 files changed, 79 insertions, 79 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index f438a390..556c98a7 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -1,6 +1,6 @@ --- name: Bug Report -about: Using DekuSan, but it's not working as you expect? +about: Using DEXON Wallet, but it's not working as you expect? --- @@ -29,7 +29,7 @@ If applicable, add screenshots to help explain your problem. **Browser details (please complete the following information):** - OS: [e.g. OS X, Windows] - Browser [e.g. chrome, safari] - - DekuSan Version [e.g. 4.9.0] + - DEXON Wallet Version [e.g. 4.9.0] **Additional context** Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/support-request-or-question.md b/.github/ISSUE_TEMPLATE/support-request-or-question.md index 5a596f4a..547d27ef 100644 --- a/.github/ISSUE_TEMPLATE/support-request-or-question.md +++ b/.github/ISSUE_TEMPLATE/support-request-or-question.md @@ -1,6 +1,6 @@ --- name: Support Request or Question -about: Have a question about how to use DekuSan? +about: Have a question about how to use DEXON Wallet? --- @@ -1,4 +1,4 @@ -# DekuSan Browser Extension +# DEXON Wallet Browser Extension [](https://circleci.com/gh/dexon-foundation/dekusan) ## Introduction diff --git a/app/phishing.html b/app/phishing.html index 6f3a2c41..e1d99bcb 100644 --- a/app/phishing.html +++ b/app/phishing.html @@ -3,7 +3,7 @@ <html> <head> - <title>Phishing Detection - DekuSan</title> + <title>Phishing Detection - DEXON Wallet</title> <style> body { @@ -55,10 +55,10 @@ <img src="/images/dexon-wallet.svg" style="height:60px"> <h3>ATTENTION</h3> - <p>DekuSan believes this domain could currently compromise your security and has prevented you from interacting with it.</p> + <p>DEXON Wallet believes this domain could currently compromise your security and has prevented you from interacting with it.</p> <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">DEXON Phishing Detector</a>. This includes outright malicious websites and legitimate websites that have been compromised by a malicious actor.</p> <p id="esdbLink"></p> - <p>You can turn DekuSan off to interact with this site, but it is advised not to.</p> + <p>You can turn DEXON Wallet off to interact with this site, but it is advised not to.</p> <p> If you think this domain is incorrectly flagged or if a blocked legitimate website has resolved its security issues, <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>. diff --git a/app/scripts/README.md b/app/scripts/README.md index 60ba14ba..748ae797 100644 --- a/app/scripts/README.md +++ b/app/scripts/README.md @@ -1,4 +1,4 @@ -# Main DekuSan Code +# Main DEXON Wallet Code This folder contains the core-code. diff --git a/app/unsupport.html b/app/unsupport.html index 77418d25..eb421caf 100644 --- a/app/unsupport.html +++ b/app/unsupport.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> - <title>DekuSan</title> + <title>DEXON Wallet</title> </head> <style> *{ diff --git a/development/README.md b/development/README.md index 3c2f76cd..be91fb1d 100644 --- a/development/README.md +++ b/development/README.md @@ -1,5 +1,5 @@ # Development -Several files which are needed for developing on(!) DekuSan. +Several files which are needed for developing on(!) DEXON Wallet. Usually each files contains information about its scope / usage.
\ No newline at end of file diff --git a/development/index.html b/development/index.html index 67cda00c..e0c0dcc2 100644 --- a/development/index.html +++ b/development/index.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>DekuSan</title> + <title>DEXON Wallet</title> </head> <body> <script src="./bundle.js" type="text/javascript" charset="utf-8"></script> diff --git a/docs/QA_Guide.md b/docs/QA_Guide.md index 850e35f6..2ed80b9b 100644 --- a/docs/QA_Guide.md +++ b/docs/QA_Guide.md @@ -3,7 +3,7 @@ Steps to mark a full pass of QA complete. * Browsers: Opera, Chrome, Firefox, Edge. * OS: Ubuntu, Mac OSX, Windows -* Load older version of DekuSan and attempt to simulate updating the extension. +* Load older version of DEXON Wallet and attempt to simulate updating the extension. * Open Developer Console in background and popup, inspect errors. * Watch the state logs * Transactions (unapproved txs -> rejected/submitted -> confirmed) @@ -41,7 +41,7 @@ Steps to mark a full pass of QA complete. * hd keyring * imported keyring * Change network from mainnet → ropsten → rinkeby → localhost (ganache) -* Ganache set blocktime to simulate retryTx in DekuSan +* Ganache set blocktime to simulate retryTx in DEXON Wallet * Copy public key to clipboard * Export private key diff --git a/docs/bumping_version.md b/docs/bumping_version.md index 46319ef2..bed07f4f 100644 --- a/docs/bumping_version.md +++ b/docs/bumping_version.md @@ -1,10 +1,10 @@ -# How to Bump DekuSan's Version Automatically +# How to Bump DEXON Wallet's Version Automatically ``` npm run version:bump patch ``` -DekuSan publishes using a loose [semver](https://semver.org/) interpretation. We divide the three segments of our version into three types of version bump: +DEXON Wallet publishes using a loose [semver](https://semver.org/) interpretation. We divide the three segments of our version into three types of version bump: ## Major diff --git a/docs/development-visualization.md b/docs/development-visualization.md index c6483393..4a079613 100644 --- a/docs/development-visualization.md +++ b/docs/development-visualization.md @@ -27,7 +27,7 @@ gource \ --date-format "%b %d, %Y" \ --highlight-dirs \ --user-friction 0.1 \ - --title "DekuSan Development History" \ + --title "DEXON Wallet Development History" \ --output-ppm-stream - \ --output-framerate 30 \ | ffmpeg -y -r 30 -f image2pipe -vcodec ppm -i - -b 65536K metamask-dev-history.mp4 diff --git a/docs/extension_description/en.txt b/docs/extension_description/en.txt index 34b732a2..041ff09b 100644 --- a/docs/extension_description/en.txt +++ b/docs/extension_description/en.txt @@ -1,8 +1,8 @@ -DekuSan is an extension for accessing DEXON enabled distributed applications, or "Dapps" in your normal browser! +DEXON Wallet is an extension for accessing DEXON enabled distributed applications, or "Dapps" in your normal browser! The extension injects the DEXON web3 API into every website's javascript context, so that dapps can read from the blockchain. -DekuSan also lets the user create and manage their own identities, so when a Dapp wants to perform a transaction and write to the blockchain, the user gets a secure interface to review the transaction, before approving or rejecting it. +DEXON Wallet also lets the user create and manage their own identities, so when a Dapp wants to perform a transaction and write to the blockchain, the user gets a secure interface to review the transaction, before approving or rejecting it. -Because it adds functionality to the normal browser context, DekuSan requires the permission to read and write to any webpage. You can always "view the source" of DekuSan the way you do any extension, or view the source code on Github: -https://github.com/DekuSan/metamask-plugin
\ No newline at end of file +Because it adds functionality to the normal browser context, DEXON Wallet requires the permission to read and write to any webpage. You can always "view the source" of DEXON Wallet the way you do any extension, or view the source code on Github: +https://github.com/dexon-foundation/dekusan
\ No newline at end of file diff --git a/docs/porting_to_new_environment.md b/docs/porting_to_new_environment.md index 913a358f..c9f29d20 100644 --- a/docs/porting_to_new_environment.md +++ b/docs/porting_to_new_environment.md @@ -1,6 +1,6 @@ -# Guide to Porting DekuSan to a New Environment +# Guide to Porting DEXON Wallet to a New Environment -DekuSan has been under continuous development for nearly two years now, and we’ve gradually discovered some useful abstractions that have allowed us to grow more easily. A couple of those layers together allow DekuSan to be ported to new environments and contexts increasingly easily (although it still could be easier, and please let us know if you get stuck!) +DEXON Wallet has been under continuous development for nearly two years now, and we’ve gradually discovered some useful abstractions that have allowed us to grow more easily. A couple of those layers together allow DEXON Wallet to be ported to new environments and contexts increasingly easily (although it still could be easier, and please let us know if you get stuck!) Before we get started, it's worth becoming familiar with our basic architecture: @@ -10,11 +10,11 @@ The `metamask-background` describes the file at `app/scripts/background.js`, whi When a new site is visited, the WebExtension creates a new `ContentScript` in that page's context, which can be seen at `app/scripts/contentscript.js`. This script represents a per-page setup process, which creates the per-page `web3` api, connects it to the background script via the Port API (wrapped in a [stream abstraction](https://github.com/substack/stream-handbook)), and injected into the DOM before anything loads. -The most confusing part about porting DekuSan to a new platform is the way we provide the Web3 API over a series of streams between contexts. Once you understand how we create the [InpageProvider](../app/scripts/lib/inpage-provider.js) in the [inpage.js script](../app/scripts/inpage.js), you will be able to understand how the [port-stream](../app/scripts/lib/port-stream.js) is just a thin wrapper around the [postMessage API](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage), and a similar stream API can be wrapped around any communication channel to communicate with the `DekuSanController` via its `setupUntrustedCommunication(stream, domain)` method. +The most confusing part about porting DEXON Wallet to a new platform is the way we provide the Web3 API over a series of streams between contexts. Once you understand how we create the [InpageProvider](../app/scripts/lib/inpage-provider.js) in the [inpage.js script](../app/scripts/inpage.js), you will be able to understand how the [port-stream](../app/scripts/lib/port-stream.js) is just a thin wrapper around the [postMessage API](https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage), and a similar stream API can be wrapped around any communication channel to communicate with the `DekuSanController` via its `setupUntrustedCommunication(stream, domain)` method. ### The DekuSan Controller -The core functionality of DekuSan all lives in what we call [The DekuSan Controller](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/metamask-controller.js). Our goal for this file is for it to eventually be its own javascript module that can be imported into any JS-compatible context, allowing it to fully manage an app's relationship to DEXON. +The core functionality of DEXON Wallet all lives in what we call [The DekuSan Controller](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/metamask-controller.js). Our goal for this file is for it to eventually be its own javascript module that can be imported into any JS-compatible context, allowing it to fully manage an app's relationship to DEXON. #### Constructor @@ -36,13 +36,13 @@ An object that provides two simple methods, which can encrypt in any format you The `platform` object has a variety of options: -- reload (function) - Will be called when DekuSan would like to reload its own context. -- openWindow ({ url }) - Will be called when DekuSan would like to open a web page. It will be passed a single `options` object with a `url` key, with a string value. -- getVersion() - Should return the current DekuSan version, as described in the current `CHANGELOG.md` or `app/manifest.json`. +- reload (function) - Will be called when DEXON Wallet would like to reload its own context. +- openWindow ({ url }) - Will be called when DEXON Wallet would like to open a web page. It will be passed a single `options` object with a `url` key, with a string value. +- getVersion() - Should return the current DEXON Wallet version, as described in the current `CHANGELOG.md` or `app/manifest.json`. #### [metamask.getState()](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/metamask-controller.js#L241) -This method returns a javascript object representing the current DekuSan state. This includes things like known accounts, sent transactions, current exchange rates, and more! The controller is also an event emitter, so you can subscribe to state updates via `metamask.on('update', handleStateUpdate)`. State examples available [here](https://github.com/DekuSan/metamask-extension/tree/master/development/states) under the `metamask` key. (Warning: some are outdated) +This method returns a javascript object representing the current DEXON Wallet state. This includes things like known accounts, sent transactions, current exchange rates, and more! The controller is also an event emitter, so you can subscribe to state updates via `metamask.on('update', handleStateUpdate)`. State examples available [here](https://github.com/DekuSan/metamask-extension/tree/master/development/states) under the `metamask` key. (Warning: some are outdated) #### [metamask.getApi()](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/metamask-controller.js#L274-L335) @@ -50,7 +50,7 @@ Returns a JavaScript object filled with callback functions representing every op ### The UI -The DekuSan UI is essentially just a website that can be configured by passing it the API and state subscriptions from above. Anyone could make a UI that consumes these, effectively reskinning DekuSan. +The DEXON Wallet UI is essentially just a website that can be configured by passing it the API and state subscriptions from above. Anyone could make a UI that consumes these, effectively reskinning DEXON Wallet. You can see this in action in our file [ui/index.js](https://github.com/DekuSan/metamask-extension/blob/master/ui/index.js). There you can see an argument being passed in named `accountManager`, which is essentially a DekuSan controller (forgive its really outdated parameter name!). With access to that object, the UI is able to initialize a whole React/Redux app that relies on this API for its account/blockchain-related/persistent states. @@ -74,14 +74,14 @@ const controller = new MetamaskController({ ``` Since `background.js` is essentially the Extension setup file, we can see it doing all the things specific to the extension platform: - Defining how to open the UI for new messages, transactions, and even requests to unlock (reveal to the site) their account. -- Provide the instance's initial state, leaving DekuSan persistence to the platform. +- Provide the instance's initial state, leaving DEXON Wallet persistence to the platform. - Providing a `platform` object. This is becoming our catch-all adapter for platforms to define a few other platform-variant features we require, like opening a web link. (Soon we will be moving encryption out here too, since our browser-encryption isn't portable enough!) ## Ports, streams, and Web3! -Everything so far has been enough to create a DekuSan wallet on virtually any platform that runs JS, but DekuSan's most unique feature isn't being a wallet, it's providing an DEXON-enabled JavaScript context to websites. +Everything so far has been enough to create a DEXON Wallet on virtually any platform that runs JS, but DEXON Wallet's most unique feature isn't being a wallet, it's providing an DEXON-enabled JavaScript context to websites. -DekuSan has two kinds of [duplex stream APIs](https://github.com/substack/stream-handbook#duplex) that it exposes: +DEXON Wallet has two kinds of [duplex stream APIs](https://github.com/substack/stream-handbook#duplex) that it exposes: - [metamask.setupTrustedCommunication(connectionStream, originDomain)](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/metamask-controller.js#L352) - This stream is used to connect the user interface over a remote port, and may not be necessary for contexts where the interface and the metamask-controller share a process. - [metamask.setupUntrustedCommunication(connectionStream, originDomain)](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/metamask-controller.js#L337) - This method is used to connect a new web site's web3 API to DekuSan's blockchain connection. Additionally, the `originDomain` is used to block detected phishing sites. @@ -89,7 +89,7 @@ DekuSan has two kinds of [duplex stream APIs](https://github.com/substack/stream If you are making a DekuSan-powered browser for a new platform, one of the trickiest tasks will be injecting the Web3 API into websites that are visited. On WebExtensions, we actually have to pipe data through a total of three JS contexts just to let sites talk to our background process (site -> contentscript -> background). -To see how we do that, you can refer to the [inpage script](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/inpage.js) that we inject into every website. There you can see it creates a multiplex stream to the background, and uses it to initialize what we call the [inpage-provider](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/lib/inpage-provider.js), which you can see stubs a few methods out, but mostly just passes calls to `sendAsync` through the stream it's passed! That's really all the magic that's needed to create a web3-like API in a remote context, once you have a stream to DekuSan available. +To see how we do that, you can refer to the [inpage script](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/inpage.js) that we inject into every website. There you can see it creates a multiplex stream to the background, and uses it to initialize what we call the [inpage-provider](https://github.com/DekuSan/metamask-extension/blob/master/app/scripts/lib/inpage-provider.js), which you can see stubs a few methods out, but mostly just passes calls to `sendAsync` through the stream it's passed! That's really all the magic that's needed to create a web3-like API in a remote context, once you have a stream to DEXON Wallet available. In `inpage.js` you can see we create a `PortStream`, that's just a class we use to wrap WebExtension ports as streams, so we can reuse our favorite stream abstraction over the more irregular API surface of the WebExtension. In a new platform, you will probably need to construct this stream differently. The key is that you need to construct a stream that talks from the site context to the background. Once you have that set up, it works like magic! diff --git a/docs/privacy.md b/docs/privacy.md index c6ff6738..b58e6c7a 100644 --- a/docs/privacy.md +++ b/docs/privacy.md @@ -1 +1 @@ -# DekuSan Privacy Policy
\ No newline at end of file +# DEXON Wallet Privacy Policy
\ No newline at end of file diff --git a/docs/state_dump.md b/docs/state_dump.md index 4b6e5d2f..798fb996 100644 --- a/docs/state_dump.md +++ b/docs/state_dump.md @@ -2,11 +2,11 @@ Sometimes a UI bug is hard to reproduce, but we'd like to rapidly develop against the application state that caused the bug. -In this case, a DekuSan developer will sometimes ask a user with a bug to perform a "state dump", so we can use some internal tools to reproduce and fix the bug. +In this case, a DEXON Wallet developer will sometimes ask a user with a bug to perform a "state dump", so we can use some internal tools to reproduce and fix the bug. To take a state dump, follow these steps: -1. Get the DekuSan popup to the point where it shows the bug (the developer will probably specify exactly where). +1. Get the DEXON Wallet popup to the point where it shows the bug (the developer will probably specify exactly where). 2. Right click on the extension popup UI, and in the menu, click "Inspect". This will open the developer tools. 3. In case it isn't already selected, click the "Console" tab in the new Developer Tools window. 4. In the console, type this command exactly: `logState()`. This should print a bunch of JSON text into your console. diff --git a/docs/translating-guide.md b/docs/translating-guide.md index 0841c790..6b6fbd27 100644 --- a/docs/translating-guide.md +++ b/docs/translating-guide.md @@ -1,6 +1,6 @@ -# DekuSan Translation Guide +# DEXON Wallet Translation Guide -The DekuSan browser extension supports new translations added in the form of new locales files added in `app/_locales`. +The DEXON Wallet browser extension supports new translations added in the form of new locales files added in `app/_locales`. - [The MDN Guide to Internationalizing Extensions](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Internationalization) @@ -13,7 +13,7 @@ The DekuSan browser extension supports new translations added in the form of new - Add the language to the [locales index](https://github.com/DekuSan/metamask-extension/blob/master/app/_locales/index.json) `app/_locales/index.json` -That's it! When DekuSan is loaded on a computer with that language set as the system language, they will see your translation instead of the default one. +That's it! When DEXON Wallet is loaded on a computer with that language set as the system language, they will see your translation instead of the default one. ## Testing @@ -25,5 +25,5 @@ node development/verify-locale-strings.js $YOUR_LOCALE Where `$YOUR_LOCALE` is your locale string (example: `es`), i.e. the name of your language folder. -To verify that your translation works in the app, you will need to [build a local copy](https://github.com/DekuSan/metamask-extension#building-locally) of DekuSan. You will need to change your browser language, your operating system language, and restart your browser (sorry it's so much work!). +To verify that your translation works in the app, you will need to [build a local copy](https://github.com/DekuSan/metamask-extension#building-locally) of DEXON Wallet. You will need to change your browser language, your operating system language, and restart your browser (sorry it's so much work!). diff --git a/mascara/example/app/index.html b/mascara/example/app/index.html index 02317a87..2cc00f7d 100644 --- a/mascara/example/app/index.html +++ b/mascara/example/app/index.html @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <script src="http://localhost:9001/metamascara.js"></script> - <title>DekuSan ZeroClient Example</title> + <title>DEXON Wallet ZeroClient Example</title> </head> <body> diff --git a/mascara/proxy/index.html b/mascara/proxy/index.html index 8bf51cfe..6d765312 100644 --- a/mascara/proxy/index.html +++ b/mascara/proxy/index.html @@ -4,9 +4,9 @@ <head> <meta charset="utf-8"> - <title>DekuSan ZeroClient Iframe</title> - <meta name="description" content="DekuSan ZeroClient"> - <meta name="author" content="DekuSan"> + <title>DEXON Wallet ZeroClient Iframe</title> + <meta name="description" content="DEXON Wallet ZeroClient"> + <meta name="author" content="DEXON Wallet"> <!--[if lt IE 9]> <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> @@ -14,7 +14,7 @@ </head> <body> - Hello! I am the DekuSan iframe. + Hello! I am the DEXON Wallet iframe. <script src="./proxy.js"></script> </body> </html> diff --git a/mascara/src/app/buy-ether-widget/index.js b/mascara/src/app/buy-ether-widget/index.js index 86eb6467..850e363c 100644 --- a/mascara/src/app/buy-ether-widget/index.js +++ b/mascara/src/app/buy-ether-widget/index.js @@ -132,7 +132,7 @@ class BuyEtherWidget extends Component { <div className="buy-ether__action-content-wrapper"> <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} /> <div className="buy-ether__body-text">Deposit Ether directly into your account.</div> - <div className="buy-ether__small-body-text">(This is the account address that DekuSan created for you to recieve funds.)</div> + <div className="buy-ether__small-body-text">(This is the account address that DEXON Wallet created for you to recieve funds.)</div> <div className="buy-ether__buttons"> <button className="first-time-flow__button" diff --git a/mascara/src/app/first-time/buy-ether-screen.js b/mascara/src/app/first-time/buy-ether-screen.js index 85de0093..8bbc313d 100644 --- a/mascara/src/app/first-time/buy-ether-screen.js +++ b/mascara/src/app/first-time/buy-ether-screen.js @@ -127,7 +127,7 @@ class BuyEtherScreen extends Component { <div className="buy-ether__action-content-wrapper"> <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} /> <div className="buy-ether__body-text">Deposit Ether directly into your account.</div> - <div className="buy-ether__small-body-text">(This is the account address that DekuSan created for you to recieve funds.)</div> + <div className="buy-ether__small-body-text">(This is the account address that DEXON Wallet created for you to recieve funds.)</div> <div className="buy-ether__buttons"> <button className="first-time-flow__button" @@ -153,7 +153,7 @@ class BuyEtherScreen extends Component { <Identicon address={this.props.address} diameter={70} /> <div className="buy-ether__title">Deposit Ether</div> <div className="buy-ether__body-text"> - DekuSan works best if you have Ether in your account to pay for transaction gas fees and more. To get Ether, choose from one of these methods. + DEXON Wallet works best if you have Ether in your account to pay for transaction gas fees and more. To get Ether, choose from one of these methods. </div> <div className="buy-ether__content-wrapper"> <div className="buy-ether__content-headline-wrapper"> diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js index a0721c3d..815650eb 100644 --- a/mascara/src/app/first-time/create-password-screen.js +++ b/mascara/src/app/first-time/create-password-screen.js @@ -122,7 +122,7 @@ class CreatePasswordScreen extends Component { height="225" /> <div className="info"> - DekuSan is a secure identity vault for DEXON. + DEXON Wallet is a secure identity vault for DEXON. </div> <div className="info"> It allows you to hold ether & tokens, and interact with decentralized applications. diff --git a/notices/archive/notice_0.md b/notices/archive/notice_0.md index 44fb01f0..a4b96a1e 100644 --- a/notices/archive/notice_0.md +++ b/notices/archive/notice_0.md @@ -6,11 +6,11 @@ _Our Terms of Use have been updated as of September 5, 2016_ ## 1. Acceptance of Terms ## -DekuSan provides a platform for managing DEXON (or "DXN") accounts, and allowing ordinary websites to interact with the DEXON blockchain, while keeping the user in control over what transactions they approve, through our website located at[ ](http://dexonscan.app)[https://dexonscan.app/](https://dexonscan.app/) and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by DekuSan are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by DekuSan from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services. +DEXON Wallet provides a platform for managing DEXON (or "DXN") accounts, and allowing ordinary websites to interact with the DEXON blockchain, while keeping the user in control over what transactions they approve, through our website located at[ ](http://dexonscan.app)[https://dexonscan.app/](https://dexonscan.app/) and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by DEXON Wallet are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by DEXON Wallet from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services. ## 2. Modification of Terms of Use ## -Except for Section 13, providing for binding arbitration and waiver of class action rights, DekuSan reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified. +Except for Section 13, providing for binding arbitration and waiver of class action rights, DEXON Wallet reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified. @@ -18,17 +18,17 @@ Except for Section 13, providing for binding arbitration and waiver of class act You hereby represent and warrant that you are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations and warranties set forth in these Terms and to abide by and comply with these Terms. -DekuSan is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that DekuSan is not liable for your compliance with such laws. +DEXON Wallet is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that DEXON Wallet is not liable for your compliance with such laws. ## 4 Account Password and Security ## -When setting up an account within DekuSan, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. DekuSan encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for DekuSan that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify DekuSan of any unauthorized use of your account or breach of security. DekuSan cannot and will not be liable for any loss or damage arising from your failure to comply with this section. +When setting up an account within DEXON Wallet, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. DEXON Wallet encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for DEXON Wallet that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify DEXON Wallet of any unauthorized use of your account or breach of security. DEXON Wallet cannot and will not be liable for any loss or damage arising from your failure to comply with this section. ## 5. Representations, Warranties, and Risks ## ### 5.1. Warranty Disclaimer ### -You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that DekuSan has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release DekuSan from all liability for you having acquired or not acquired Content through the Service. DekuSan makes no representations concerning any Content contained in or accessed through the Service, and DekuSan will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service. +You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that DEXON Wallet has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release DEXON Wallet from all liability for you having acquired or not acquired Content through the Service. DEXON Wallet makes no representations concerning any Content contained in or accessed through the Service, and DEXON Wallet will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service. ### 5.2 Sophistication and Risk of Cryptographic Systems ### @@ -36,23 +36,23 @@ By utilizing the Service or interacting with the Content or platform in any way, ### 5.3 Risk of Regulatory Actions in One or More Jurisdictions ### -DekuSan and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of DekuSan to continue to develop, or which could impede or limit your ability to access or use the Service or DEXON blockchain. +DEXON Wallet and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of DEXON Wallet to continue to develop, or which could impede or limit your ability to access or use the Service or DEXON blockchain. ### 5.4 Risk of Weaknesses or Exploits in the Field of Cryptography ### -You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, DekuSan intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks. +You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, DEXON Wallet intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks. ### 5.5 Volatility of Crypto Currencies ### -You understand that DEXON and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the DEXON blockchain. You acknowledge these risks and represent that DekuSan cannot be held liable for such fluctuations or increased costs. +You understand that DEXON and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the DEXON blockchain. You acknowledge these risks and represent that DEXON Wallet cannot be held liable for such fluctuations or increased costs. ### 5.6 Application Security ### -You acknowledge that DEXON applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that DEXON applications can be written maliciously or negligently, that DekuSan cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by DekuSan in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content. +You acknowledge that DEXON applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that DEXON applications can be written maliciously or negligently, that DEXON Wallet cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by DEXON Wallet in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content. ## 6. Indemnity ## -You agree to release and to indemnify, defend and hold harmless DekuSan and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. DekuSan reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with DekuSan in the defense of such matter. +You agree to release and to indemnify, defend and hold harmless DEXON Wallet and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. DEXON Wallet reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with DEXON Wallet in the defense of such matter. ## 7. Limitation on liability ## @@ -62,15 +62,15 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMIT ## 8. Our Proprietary Rights ## -All title, ownership and intellectual property rights in and to the Service are owned by DekuSan or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by DekuSan, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. DekuSan issues a license for DekuSan, found [here](https://github.com/DekuSan/metamask-plugin/blob/master/LICENSE). For information on other licenses utilized in the development of DekuSan, please see our attribution page at: [https://metamask.io/attributions.html](https://metamask.io/attributions.html) +All title, ownership and intellectual property rights in and to the Service are owned by DEXON Wallet or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by DEXON Wallet, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. DEXON Wallet issues a license for DEXON Wallet, found [here](https://github.com/DEXON Wallet/metamask-plugin/blob/master/LICENSE). For information on other licenses utilized in the development of DEXON Wallet, please see our attribution page at: [https://metamask.io/attributions.html](https://metamask.io/attributions.html) ## 9. Links ## -The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because DekuSan has no control over such sites, applications and resources, you acknowledge and agree that DekuSan is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that DekuSan shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource. +The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because DEXON Wallet has no control over such sites, applications and resources, you acknowledge and agree that DEXON Wallet is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that DEXON Wallet shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource. ## 10. Termination and Suspension ## -DekuSan may terminate or suspend all or part of the Service and your DekuSan access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease. +DEXON Wallet may terminate or suspend all or part of the Service and your DEXON Wallet access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease. The following provisions of the Terms survive any termination of these Terms: INDEMNITY; WARRANTY DISCLAIMERS; LIMITATION ON LIABILITY; OUR PROPRIETARY RIGHTS; LINKS; TERMINATION; NO THIRD PARTY BENEFICIARIES; BINDING ARBITRATION AND CLASS ACTION WAIVER; GENERAL INFORMATION. @@ -80,7 +80,7 @@ You agree that, except as otherwise expressly provided in these Terms, there sha ## 12. Notice and Procedure For Making Claims of Copyright Infringement ## -If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide DekuSan’s Copyright Agent a written Notice containing the following information: +If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide DEXON Wallet’s Copyright Agent a written Notice containing the following information: · an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright or other intellectual property interest; @@ -94,7 +94,7 @@ If you believe that your copyright or the copyright of a person on whose behalf · a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright or intellectual property owner or authorized to act on the copyright or intellectual property owner's behalf. -DekuSan’s Copyright Agent can be reached at: +DEXON Wallet’s Copyright Agent can be reached at: Email: copyright [at] metamask [dot] io @@ -102,7 +102,7 @@ Mail: Attention: -DekuSan Copyright ℅ ConsenSys +DEXON Wallet Copyright ℅ ConsenSys 49 Bogart Street @@ -138,25 +138,25 @@ Notwithstanding the parties' decision to resolve all disputes through arbitratio ### 13.6 30-Day Right to Opt Out ### -You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: DekuSan ℅ COBINHOOD, 39F, Taipei 101, Taiwan and via email at support@dexon.org. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, DekuSan also will not be bound by them. +You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: DEXON Wallet ℅ COBINHOOD, 39F, Taipei 101, Taiwan and via email at support@dexon.org. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, DEXON Wallet also will not be bound by them. ### 13.7 Changes to This Section ### -DekuSan will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day. +DEXON Wallet will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day. -For any dispute not subject to arbitration you and DekuSan agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available. +For any dispute not subject to arbitration you and DEXON Wallet agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available. -The Terms and the relationship between you and DekuSan shall be governed by the laws of the State of New York without regard to conflict of law provisions. +The Terms and the relationship between you and DEXON Wallet shall be governed by the laws of the State of New York without regard to conflict of law provisions. ## 14. General Information ## ### 14.1 Entire Agreement ### -These Terms (and any additional terms, rules and conditions of participation that DekuSan may post on the Service) constitute the entire agreement between you and DekuSan with respect to the Service and supersedes any prior agreements, oral or written, between you and DekuSan. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict. +These Terms (and any additional terms, rules and conditions of participation that DEXON Wallet may post on the Service) constitute the entire agreement between you and DEXON Wallet with respect to the Service and supersedes any prior agreements, oral or written, between you and DEXON Wallet. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict. ### 14.2 Waiver and Severability of Terms ### -The failure of DekuSan to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect. +The failure of DEXON Wallet to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect. ### 14.3 Statute of Limitations ### diff --git a/notices/archive/notice_2.md b/notices/archive/notice_2.md index 07ce841c..a574f66c 100644 --- a/notices/archive/notice_2.md +++ b/notices/archive/notice_2.md @@ -1,6 +1,6 @@ -DekuSan is beta software. +DEXON Wallet is beta software. -When you log in to DekuSan, your current account's address is visible to every new site you visit. This can be used to look up your account balances of Ether and other tokens. +When you log in to DEXON Wallet, your current account's address is visible to every new site you visit. This can be used to look up your account balances of Ether and other tokens. -For your privacy, for now, please sign out of DekuSan when you're done using a site. +For your privacy, for now, please sign out of DEXON Wallet when you're done using a site. diff --git a/notices/archive/notice_3.md b/notices/archive/notice_3.md index 854c0a7a..0834e65d 100644 --- a/notices/archive/notice_3.md +++ b/notices/archive/notice_3.md @@ -1,6 +1,6 @@ Please take a moment to [back up your seed phrase again](https://support.metamask.io/kb/article/28-abbu-always-be-backed-up-how-to-make-sure-your-12-word-metamask-seed-phrase-is-backed-up). -DekuSan has become aware of a previous issue where a very small number of users were shown the wrong seed phrase to back up. The only way to protect yourself from this issue, is to back up your seed phrase again now. +DEXON Wallet has become aware of a previous issue where a very small number of users were shown the wrong seed phrase to back up. The only way to protect yourself from this issue, is to back up your seed phrase again now. You can follow the guide at this link: diff --git a/notices/archive/notice_4.md b/notices/archive/notice_4.md index e08bda72..95661f69 100644 --- a/notices/archive/notice_4.md +++ b/notices/archive/notice_4.md @@ -1,6 +1,6 @@ -Dear DekuSan Users, +Dear DEXON Wallet Users, -There have been several instances of high-profile legitimate websites such as BTC Manager and Games Workshop that have had their websites temporarily compromised. This involves showing a fake DekuSan window on the page asking for user's seed phrases. DekuSan will never open itself in this way and users are encouraged to report these instances immediately to either [our phishing blacklist](https://github.com/dexon-foundation/dekusan/issues) or our support email at [support@dexon.org](mailto:support@dexon.org). +There have been several instances of high-profile legitimate websites such as BTC Manager and Games Workshop that have had their websites temporarily compromised. This involves showing a fake DEXON Wallet window on the page asking for user's seed phrases. DEXON Wallet will never open itself in this way and users are encouraged to report these instances immediately to either [our phishing blacklist](https://github.com/dexon-foundation/dekusan/issues) or our support email at [support@dexon.org](mailto:support@dexon.org). Please read the full article on this ongoing issue at [https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168](https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168). diff --git a/test/unit/development/sample-manifest.json b/test/unit/development/sample-manifest.json index dd97c1b9..e5680776 100644 --- a/test/unit/development/sample-manifest.json +++ b/test/unit/development/sample-manifest.json @@ -37,7 +37,7 @@ "19": "images/icon-19.png", "38": "images/icon-38.png" }, - "default_title": "DekuSan", + "default_title": "DEXON Wallet", "default_popup": "popup.html" }, "content_scripts": [ diff --git a/ui/index.html b/ui/index.html index 53c594b3..7df16757 100644 --- a/ui/index.html +++ b/ui/index.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>DekuSan</title> + <title>DEXON Wallet</title> </head> <body> |