Skip to content

Commit

Permalink
Merge pull request masari-project#14 from krypt0x/master
Browse files Browse the repository at this point in the history
v1.1.1
  • Loading branch information
krypt0x authored Feb 10, 2022
2 parents f04a4e9 + 4775cc1 commit 3da001b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ConcealWallet",
"version": "1.1.0",
"name": "ConcealWebWallet",
"version": "1.1.1",
"description": "Fully client-side web-wallet for Conceal Network",
"main": "index.js",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ global.config = {
nodeList: [
"https://ccxapi.conceal.network/daemon/"
],
nodeUrl: "https://ccxapi.conceal.network/daemon/",
nodeUrl: "",
mainnetExplorerUrl: "https://explorer.conceal.network/",
mainnetExplorerUrlHash: "https://explorer.conceal.network/index.html?hash={ID}#blockchain_transaction",
mainnetExplorerUrlBlock: "https://explorer.conceal.network/index.html?hash={ID}#blockchain_block",
Expand All @@ -28,7 +28,7 @@ global.config = {
coinFee: new JSBigInt('1000'),
feePerKB: new JSBigInt('1000'), //for testnet its not used, as fee is dynamic.
dustThreshold: new JSBigInt('10'),//used for choosing outputs/change - we decompose all the way down if the receiver wants now regardless of threshold
defaultMixin: 0, // default value mixin
defaultMixin: 5, // default value mixin

idleTimeout: 30,
idleWarningDuration: 20,
Expand Down
4 changes: 2 additions & 2 deletions src/pages/send.ts
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ class SendView extends DestructableView {

let promise = Promise.resolve();
if (
destinationAddress === 'ccx7NzuofXxcypov8Yqm2A118xT17HereBFjp3RScjzM7wncf8BRcnHZbACy63sWD71L7NmkJRgQKXFE3weCfAh31RAVFHgttf' ||
destinationAddress === 'ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj' ||
destinationAddress === 'ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj' ||
destinationAddress === 'ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj'
destinationAddress === 'ccx7YZ4RC97fqMh1bmzrFtDoSSiEgvEYzhaLE53SR9bh4QrDBUhGUH3TCmXqv8MTLjJDtnCeeaT5bLC2ZSzp3ZmQ19DoiPLLXS'
) {
promise = swal({
type: 'success',
Expand Down

0 comments on commit 3da001b

Please sign in to comment.