Skip to content

Commit

Permalink
Merge branch 'master' into shubham/Node_profile_photo
Browse files Browse the repository at this point in the history
  • Loading branch information
shubhamkmr04 committed Mar 15, 2024
2 parents 9e78d2c + 91f48cd commit c974bf4
Show file tree
Hide file tree
Showing 85 changed files with 3,160 additions and 2,383 deletions.
10 changes: 2 additions & 8 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,11 @@ body:
label: ZEUS version
description: What version of ZEUS were you running when the bug occurred?
options:
- v0.8.3
- v0.8.2
- v0.8.1
- v0.8.0
- v0.7.7
- v0.7.6
- v0.7.5
- v0.7.4
- v0.7.3
- v0.7.2
- v0.7.1
- v0.7.0
- Older (specify in comments)
- type: dropdown
id: interface
attributes:
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ android {
applicationId "app.zeusln.zeus"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 82
versionName "0.8.2-beta1"
versionCode 84
versionName "0.8.3-alpha"
multiDexEnabled true
missingDimensionStrategy 'react-native-camera', 'general'
}
Expand Down
14 changes: 7 additions & 7 deletions assets/images/SVG/DragDots.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion backends/CLightningREST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ export default class CLightningREST extends LND {
sendKeysend = (data: any) =>
this.postRequest('/v1/pay/keysend', {
pubkey: data.pubkey,
amount: Number(data.amt && data.amt * 1000)
amount: Number(data.amt && data.amt * 1000),
maxfeepercent: data.max_fee_percent
});
closeChannel = (urlParams?: Array<string>) =>
this.deleteRequest(
Expand Down
4 changes: 1 addition & 3 deletions backends/EmbeddedLND.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ export default class EmbeddedLND extends LND {
max_shard_amt: data?.max_shard_amt,
fee_limit_sat: data?.fee_limit_sat || 0,
outgoing_chan_id: data?.outgoing_chan_id,
last_hop_pubkey: data?.last_hop_pubkey
? Base64Utils.base64ToHex(data?.last_hop_pubkey)
: undefined,
last_hop_pubkey: data?.last_hop_pubkey,
message: data?.message
? Base64Utils.hexToBase64(Base64Utils.utf8ToHex(data?.message))
: undefined,
Expand Down
Loading

0 comments on commit c974bf4

Please sign in to comment.