Bug fixes

.eslintrc

@@ -14,7 +14,7 @@
       "templateStrings": true,
       "classes": true,
       "jsx": true
-    },
+    }
   },
 
   "extends": ["plugin:react/recommended"],

README.md

@@ -0,0 +1,70 @@
+# XDCPay Browser Extension
+
+## Introduction
+
+[Internal documentation](./docs#documentation)
+
+## Building locally
+
+ - Install [Node.js](https://nodejs.org/en/) version 14.17.3 and npm version 6.14.16
+   - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
+   - Select npm 6.14.16: ```npm install -g npm@6.14.16```
+ - Install dependencies: ```npm install```
+ - Install gulp globally with `npm install -g gulp-cli`.
+ - Build the project to the `./dist/` folder with `gulp build`.
+ - Optionally, to rebuild on file changes, run `gulp dev`.
+ - To package .zip files for distribution, run `gulp zip`, or run the full build & zip with `gulp dist`.
+
+ Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.
+
+## Contributing
+
+You can re-generate the docs locally by running `npm run doc`, and contributors can update the hosted docs by running `npm run publish-docs`.
+
+### Running Tests
+
+Requires `mocha` installed. Run `npm install -g mocha`.
+
+Then just run `npm test`.
+
+You can also test with a continuously watching process, via `npm run watch`.
+
+You can run the linter by itself with `gulp lint`.
+
+## Architecture
+
+[![Architecture Diagram](./docs/architecture.png)][1]
+
+## Development
+
+```bash
+npm install
+npm start
+```
+
+## Build for Publishing
+
+```bash
+npm run dist
+```
+
+#### Writing Browser Tests
+
+To write tests that will be run in the browser using QUnit, add your test files to `test/integration/lib`.
+
+## Other Docs
+
+- [How to add custom build to Chrome](./docs/add-to-chrome.md)
+- [How to add custom build to Firefox](./docs/add-to-firefox.md)
+- [How to develop a live-reloading UI](./docs/ui-dev-mode.md)
+- [How to develop an in-browser mocked UI](./docs/ui-mock-mode.md)
+- [How to live reload on local dependency changes](./docs/developing-on-deps.md)
+- [How to manage notices that appear when the app starts up](./docs/notices.md)
+- [How to use the TREZOR emulator](./docs/trezor-emulator.md)
+- [How to generate a visualization of this repository's development](./docs/development-visualization.md)
+
+[1]: http://www.nomnoml.com/#view/%5B%3Cactor%3Euser%5D%0A%0A%5Bmetamask-ui%7C%0A%20%20%20%5Btools%7C%0A%20%20%20%20%20react%0A%20%20%20%20%20redux%0A%20%20%20%20%20thunk%0A%20%20%20%20%20ethUtils%0A%20%20%20%20%20jazzicon%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20account-detail%0A%20%20%20%20%20accounts%0A%20%20%20%20%20locked-screen%0A%20%20%20%20%20restore-vault%0A%20%20%20%20%20identicon%0A%20%20%20%20%20config%0A%20%20%20%20%20info%0A%20%20%20%5D%0A%20%20%20%5Breducers%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20metamask%0A%20%20%20%20%20identities%0A%20%20%20%5D%0A%20%20%20%5Bactions%7C%0A%20%20%20%20%20%5BaccountManager%5D%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%5D%3A-%3E%5Bactions%5D%0A%20%20%20%5Bactions%5D%3A-%3E%5Breducers%5D%0A%20%20%20%5Breducers%5D%3A-%3E%5Bcomponents%5D%0A%5D%0A%0A%5Bweb%20dapp%7C%0A%20%20%5Bui%20code%5D%0A%20%20%5Bweb3%5D%0A%20%20%5Bmetamask-inpage%5D%0A%20%20%0A%20%20%5B%3Cactor%3Eui%20developer%5D%0A%20%20%5Bui%20developer%5D-%3E%5Bui%20code%5D%0A%20%20%5Bui%20code%5D%3C-%3E%5Bweb3%5D%0A%20%20%5Bweb3%5D%3C-%3E%5Bmetamask-inpage%5D%0A%5D%0A%0A%5Bmetamask-background%7C%0A%20%20%5Bprovider-engine%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bid%20store%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%3E%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%3C-%3E%5Bid%20store%5D%0A%20%20%5Bconfig%20manager%7C%0A%20%20%20%20%5Brpc%20configuration%5D%0A%20%20%20%20%5Bencrypted%20keys%5D%0A%20%20%20%20%5Bwallet%20nicknames%5D%0A%20%20%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%5Bconfig%20manager%5D%0A%20%20%5Bid%20store%5D%3C-%3E%5Bconfig%20manager%5D%0A%5D%0A%0A%5Buser%5D%3C-%3E%5Bmetamask-ui%5D%0A%0A%5Buser%5D%3C%3A--%3A%3E%5Bweb%20dapp%5D%0A%0A%5Bmetamask-contentscript%7C%0A%20%20%5Bplugin%20restart%20detector%5D%0A%20%20%5Brpc%20passthrough%5D%0A%5D%0A%0A%5Brpc%20%7C%0A%20%20%5Bethereum%20blockchain%20%7C%0A%20%20%20%20%5Bcontracts%5D%0A%20%20%20%20%5Baccounts%5D%0A%20%20%5D%0A%5D%0A%0A%5Bweb%20dapp%5D%3C%3A--%3A%3E%5Bmetamask-contentscript%5D%0A%5Bmetamask-contentscript%5D%3C-%3E%5Bmetamask-background%5D%0A%5Bmetamask-background%5D%3C-%3E%5Bmetamask-ui%5D%0A%5Bmetamask-background%5D%3C-%3E%5Brpc%5D%0A
+
+
+
+--------------------

app/_locales/en/messages.json

@@ -219,10 +219,10 @@
     "message": "Copy"
   },
   "copyAddress": {
-    "message": "Copy Address to clipboard"
+    "message": "Copy Address to Clipboard"
   },
   "copyToClipboard": {
-    "message": "Copy to clipboard"
+    "message": "Copy to Clipboard"
   },
   "copyButton": {
     "message": " Copy "
@@ -618,7 +618,7 @@
     "message": "Loose"
   },
   "loweCaseWords": {
-    "message": "seed words only have lowercase characters"
+    "message": "seed phrase only have lowercase characters"
   },
   "mainnet": {
     "message": "Main Ethereum Network"
@@ -633,7 +633,7 @@
     "message": "XDCPay is a secure identity vault for Ethereum."
   },
   "metamaskSeedWords": {
-    "message": "XDCPay Seed Words"
+    "message": "XDCPay Seed Phrase"
   },
   "metamaskVersion": {
     "message": "XDCPay Version"
@@ -882,7 +882,7 @@
     "message": "Restore"
   },
   "revealSeedWords": {
-    "message": "Reveal Seed Words"
+    "message": "Reveal Seed Phrase"
   },
   "revealSeedWordsTitle": {
     "message": "Seed Phrase"
@@ -891,7 +891,7 @@
     "message": "If you ever change browsers or move computers, you will need this seed phrase to access your accounts. Save them somewhere safe and secret."
   },
   "getYourSeedWords": {
-    "message": "Get your secret seed words by entering your password."
+    "message": "Get your secret seed phrase by entering your password."
   },
   "revealSeedWordsWarningTitle": {
     "message": "DO NOT share this phrase with anyone!"
@@ -947,7 +947,7 @@
     "description": "Account export process"
   },
   "saveSeedAsFile": {
-    "message": "Save Seed Words As File"
+    "message": "Save Seed Phrase As File"
   },
   "scanInstructions": {
     "message": "Place the QR code in front of your camera"
@@ -1424,10 +1424,10 @@
     "message": "Connected Sites"
   },
   "advancedGasControls": {
-    "message": "Advanced gas controls"
+    "message": "Advanced Gas Controls"
   },
   "advancedGasControlsDesc": {
-    "message": "Select this to show gas price and limit controls directly on the send and confirm screens."
+    "message": "Select this to show gas price and limit controls directly on the confirm screen."
   },
   "infoDesc": {
     "message": "The XDCPay is an extension for accessing XDC’s XDPoS enabled distributed applications or “Dapps” in your browser!"

app/_locales/ht/messages.json

@@ -186,7 +186,7 @@
         "message": "Kopye"
     },
     "copyAddress": {
-        "message": "Kopi adrès clipboard"
+        "message": "Kopi adrès Clipboard"
     },
     "copyToClipboard": {
         "message": "Kopi clipboard"

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "6.2.10",
+  "version": "6.3.0",
   "manifest_version": 2,
   "author": "XinFin Network",
   "description": "__MSG_appDescription__",

app/notification.html

@@ -9,7 +9,7 @@
       }
     </style>
   </head>
-  <body class="notification" style="height:600px;">
+  <body class="notification" style="height:1009px;">
     <div id="app-content"></div>
     <script src="./ui.js" type="text/javascript" charset="utf-8"></script>
   </body>

app/popup.html

@@ -1,12 +1,15 @@
 <!doctype html>
 <html style="width:357px; height:600px;">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
-    <title>XDCPay</title>
-  </head>
-  <body class="ff-body-style">
-    <div id="app-content"></div>
-    <script src="./ui.js" type="text/javascript" charset="utf-8"></script>
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
+  <title>XDCPay</title>
+</head>
+
+<body class="ff-body-style bodyStyle">
+  <div id="app-content"></div>
+  <script src="./ui.js" type="text/javascript" charset="utf-8"></script>
+</body>
+
+</html>

app/scripts/controllers/balance.js

@@ -56,6 +56,7 @@ class BalanceController {
     })
   }
 
+
   /**
    * Sets up listeners and subscriptions which should trigger an update of ethBalance. These updates include:
    * - when a transaction changes state to 'submitted', 'confirmed' or 'failed'

app/scripts/controllers/inboundtx.js

@@ -0,0 +1,53 @@
+const Web3 = require("web3");
+
+class Inboundtransaction {
+
+    fetchInbound = async (myaccount) => {
+        try {
+            const response = await fetch(`https://xdc.blocksscan.io/api/txs/listByAccount/${myaccount}?page=1&limit=20&tx_type=in`)
+            const json = await response.json()
+            return json.items;
+        } catch (error) {
+            return "no result found"
+        }
+    }
+
+    // startListener = async (myaccount, rpcurl) => {
+    //     var endBlockNumber, startBlockNumber, callback;
+
+    //     const web3 = new Web3(new Web3.providers.HttpProvider(rpcurl))
+    //     await this.inboundTransactions(web3).then(block => {
+    //         endBlockNumber = block.number
+    //     });
+    //     startBlockNumber = endBlockNumber - 4;
+    //     // console.log("Searching for transactions to/from account \"" + myaccount + "\" within blocks " + startBlockNumber + " and " + endBlockNumber);
+    //     for (var i = startBlockNumber; i <= endBlockNumber; i++) {
+    //         await this.blockResult(i, web3, myaccount).then(result => {
+    //             if (typeof result != "undefined") {
+    //                 callback = result;
+    //             }
+    //         })
+    //     }
+    //     return callback;
+    // };
+
+    // async inboundTransactions(web3) {
+    //     let block = await web3.eth.getBlock('latest')
+    //     return block;
+    // }
+
+    // async blockResult(i, web3, myaccount) {
+    //     var result;
+    //     var block = await web3.eth.getBlock(i, true);
+    //     if (block != null && block.transactions != null) {
+    //         block.transactions.forEach((e) => {
+    //             if (myaccount == e.to.toLowerCase()) {
+    //                 result = e;
+    //             }
+    //         })
+    //     }
+    //     return result;
+    // }
+}
+
+module.exports = Inboundtransaction

app/scripts/controllers/network/network.js

@@ -50,6 +50,7 @@ const testMode = (METAMASK_DEBUG || env === 'test')
 const defaultProviderConfig = {
   type: testMode ? XDC : XDC_TESTNET,
 }
+var url;
 
 module.exports = class NetworkController extends EventEmitter {
 
@@ -110,15 +111,15 @@ module.exports = class NetworkController extends EventEmitter {
     }
     const ethQuery = new EthQuery(this._provider)
     ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
-      if (err && type === XDC ) {
+      if (err && type === XDC) {
         network = XDC_CODE.toString()
-        this._configureStandardProvider({rpcUrl : XDC_RPC_FALLBACK_ENDPOINT})
+        this._configureStandardProvider({ rpcUrl: XDC_RPC_FALLBACK_ENDPOINT })
       }
       else if (err && type === XDC_TESTNET) {
         network = XDC_TESTNET_CODE.toString()
-        this._configureStandardProvider({rpcUrl : XDC_TESTNET_FALLBACK_ENDPOINT})
+        this._configureStandardProvider({ rpcUrl: XDC_TESTNET_FALLBACK_ENDPOINT })
       }
-      else if(err) return this.setNetworkState('loading')
+      else if (err) return this.setNetworkState('loading')
       const targetHost = parse(rpcTarget, true).host
       const classicHost = parse(ethNetProps.RPCEndpoints(CLASSIC_CODE)[0], true).host
       if (type === CLASSIC || targetHost === classicHost) {
@@ -129,7 +130,7 @@ module.exports = class NetworkController extends EventEmitter {
     })
   }
 
-  setRpcTarget (rpcTarget) {
+  setRpcTarget(rpcTarget) {
     const providerConfig = {
       type: 'rpc',
       rpcTarget,
@@ -224,10 +225,16 @@ module.exports = class NetworkController extends EventEmitter {
 
   _configureStandardProvider({ rpcUrl }) {
     log.info('NetworkController - configureStandardProvider', rpcUrl)
+    this.rpcUrlCall(rpcUrl);
     const networkClient = createJsonRpcClient({ rpcUrl })
     this._setNetworkClient(networkClient)
   }
-
+  rpcUrlCall(rpcUrl) {
+    if (rpcUrl != null) {
+      url = rpcUrl
+    }
+    return url;
+  }
   _setNetworkClient({ networkMiddleware, blockTracker }) {
     const metamaskMiddleware = createMetamaskMiddleware(this._baseProviderParams)
     const engine = new JsonRpcEngine()

app/scripts/controllers/preferences.js

@@ -466,7 +466,7 @@ class PreferencesController {
     if (remove && index !== -1) {
       rpcList.splice(index, 1)
     }
-    if (index == -1 && !remove && customRPCObject.rpcURL !== 'http://localhost:8545') {
+    if (index == -1 && !remove && customRPCObject.rpcURL !== ('https://localhost:8545' || 'http://localhost:8545')) {
       rpcList.push(customRPCObject)
     }
     return Promise.resolve(rpcList)

app/scripts/controllers/shapeshift.js

@@ -126,7 +126,7 @@ class ShapeshiftController {
     const index = shapeShiftTxList.indexOf(tx)
     if (index !== -1) {
       shapeShiftTxList[index] = tx
-      this.store.updateState({ shapeShiftTxList })
+      this.store.update({ shapeShiftTxList })
     }
   }