Skip to content

Commit

Permalink
set editable=false in payment uri
Browse files Browse the repository at this point in the history
set editable=false in payment uri
plus fixed some uncaught default events in react-pos
  • Loading branch information
acidsploit authored Mar 13, 2018
1 parent eb91f4a commit 6588435
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 9 deletions.
8 changes: 4 additions & 4 deletions react/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"main.css": "static/css/main.c225d4a2.css",
"main.css.map": "static/css/main.c225d4a2.css.map",
"main.js": "static/js/main.cfd9beef.js",
"main.js.map": "static/js/main.cfd9beef.js.map"
"main.css": "static/css/main.681d9f5a.css",
"main.css.map": "static/css/main.681d9f5a.css.map",
"main.js": "static/js/main.f8130d6b.js",
"main.js.map": "static/js/main.f8130d6b.js.map"
}
2 changes: 1 addition & 1 deletion react/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>React PoS</title><link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css"><link href="./static/css/main.c225d4a2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script><div id="root"></div><script type="text/javascript" src="./static/js/main.cfd9beef.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>React PoS</title><link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css"><link href="./static/css/main.681d9f5a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script><div id="root"></div><script type="text/javascript" src="./static/js/main.f8130d6b.js"></script></body></html>
2 changes: 1 addition & 1 deletion react/service-worker.js

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

2 changes: 2 additions & 0 deletions react/static/css/main.681d9f5a.css

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

1 change: 1 addition & 0 deletions react/static/css/main.681d9f5a.css.map

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

2 changes: 2 additions & 0 deletions react/static/js/main.f8130d6b.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions react/static/js/main.f8130d6b.js.map

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions xpub.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
def find_data_dir():
lib_dir = os.path.dirname(os.path.abspath(__file__))
data_dir_locations = [
os.path.join(os.path.expanduser('~'), '.xpub'),
os.path.join(os.path.expanduser('~'), '.config', 'xpub'),
os.path.join(os.path.expanduser('~'), '.pyxpub'),
os.path.join(os.path.expanduser('~'), '.config', 'pyxpub'),
lib_dir,
os.getcwd()
]
Expand Down Expand Up @@ -198,7 +198,7 @@ def generate_payment(parameters, ip_addr):
_addr = get_address(ip_addr, _amount, _label)
_legacy = convert.to_legacy_address(_addr)
_qr += _addr + _qr_params
_uri = _addr + _uri_params
_uri = _addr + _uri_params + "&editable=false"

_payreq = {
"payment": {
Expand Down Expand Up @@ -241,6 +241,8 @@ def get_qr(parameters):
_label = parameters.label
_data += "?message=" + _label

_data += "&editable=false"

#print(_data)

qr = qrcode.QRCode(
Expand Down

0 comments on commit 6588435

Please sign in to comment.