diff --git a/README.md b/README.md index 40e5b746e..69c6f7587 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Blixt Lightning Wallet -Blixt Wallet is an open source Lightning first Bitcoin Wallet for Android with focus on usability and user experience, +Blixt Wallet is an open source Lightning Bitcoin Wallet for Android with focus on usability and user experience, powered by lnd and Neutrino SPV.

@@ -21,23 +21,23 @@ powered by lnd and Neutrino SPV. - [x] Local channel backup - [x] Thor support/Partial [lnurl](https://github.com/btcontract/lnurl-rfc/blob/master/spec.md) support - [x] Channel backup to Google Drive -- [ ] [WebLN](https://webln.dev/) support +- [x] [WebLN](https://webln.dev/) browser - [ ] NFC - [ ] WatchTower - [ ] URL Payments - [ ] Pay to Username -## Known bugs +## Known Bugs The wallet uses lnd that is young and might have bugs. Check [lnd bug list here](https://github.com/lightningnetwork/lnd/issues?q=is%3Aissue+is%3Aopen+label%3Abug) ## Development -Do you like React Native, Java SE 8 or Lightning? Come and help out! +Do you like React Native, Java or Lightning? Come and help out! -## Build steps +## Build Steps -- Install Go, Node, Yarn, react-native CLI, Android Studio and Android SDK (using npm instead of yarn might work) +- Install [Node](https://nodejs.org), [Yarn](https://classic.yarnpkg.com/), [Android Studio + Android SDK (including NDK)](https://developer.android.com/studio/) - If needed, install an emulated android device inside Android Studio - (Optional) Build lnd for Android by following the steps in [build-android-aar.md](build-android-aar.md) - Install Node packages: `yarn` @@ -45,7 +45,7 @@ Do you like React Native, Java SE 8 or Lightning? Come and help out! - Run: `yarn start-metro` - Run: `yarn testnet-debug` -## Commit and code-style +## Commit and Code-Style Follow the code style of the file you are working in. For commits, make descriptive and atomic git commits. diff --git a/build-android-aar.md b/build-android-aar.md index d135d03a7..1362c0854 100644 --- a/build-android-aar.md +++ b/build-android-aar.md @@ -1,7 +1,8 @@ -Make sure Go and environment vars are set up before proceeding. +Make sure you have installed [Go](https://golang.org) before proceeding. * Get lnd: `go get -d github.com/lightningnetwork/lnd` * `cd src/github.com/lightningnetwork/lnd/` -* Get and init gomobile: `go get golang.org/x/mobile/cmd/gomobile` and `gomobile init` +* Get and init gomobile: `go get golang.org/x/tools/cmd/goimports`, `go get golang.org/x/tools/go/packages`, `go get golang.org/x/mobile/cmd/gomobile` and `gomobile init` +* Add router prefix by editing `mobile/gen_bindings.sh` on line 47 * Compile with `make android` -* Put Lndmobile.aar file inside android/lndmobile +* Put `mobile/build/android/Lndmobile.aar` file inside `android/lndmobile` diff --git a/native-base-theme/variables/commonColor.js b/native-base-theme/variables/commonColor.js index 7eb29b6a7..1cf136e8c 100644 --- a/native-base-theme/variables/commonColor.js +++ b/native-base-theme/variables/commonColor.js @@ -3,13 +3,14 @@ import color from 'color'; import { Platform, Dimensions, PixelRatio } from 'react-native'; + // https://coolors.co/151314-232323-bc6610-f2af13-e5eaea export const blixtTheme = { + dark: "#151314", + gray: "#232323", primary: "#bc6610", secondary: "#f2af13", - dark: "#151314", light: "#e5eaea", - gray: "#232323", lightGray: "#878787", red: "#d0311e", green: "#1c8c27", diff --git a/src/state/LNURL.ts b/src/state/LNURL.ts index b8e7cd16b..2f7fb4148 100644 --- a/src/state/LNURL.ts +++ b/src/state/LNURL.ts @@ -88,12 +88,10 @@ export const lnUrl: ILNUrlModel = { const localPubkey = getStoreState().lightning.nodeInfo!.identityPubkey; const [pubkey, host] = lnUrlObject.uri.split("@"); try { - const connectPeerResult = await connectPeer(pubkey, host); + await connectPeer(pubkey, host); } catch (e) {} const request = `${lnUrlObject.callback}?k1=${lnUrlObject.k1}&remoteid=${localPubkey}&private=1`; - log.v(request); const result = await fetch(request); - log.v(JSON.stringify(result)); const response: ILNUrlChannelRequestResponse = await result.json(); log.v(JSON.stringify(response)); diff --git a/src/windows/Settings/LightningNodeInfo.tsx b/src/windows/Settings/LightningNodeInfo.tsx index da058b8ac..52603a07e 100644 --- a/src/windows/Settings/LightningNodeInfo.tsx +++ b/src/windows/Settings/LightningNodeInfo.tsx @@ -68,6 +68,7 @@ export default () => { {nodeInfo.uris && nodeInfo.uris.length > 0 && } + feature.name).join(", ")} /> diff --git a/src/windows/Settings/Settings.tsx b/src/windows/Settings/Settings.tsx index 60108786b..f9cd06789 100644 --- a/src/windows/Settings/Settings.tsx +++ b/src/windows/Settings/Settings.tsx @@ -162,8 +162,12 @@ export default ({ navigation }: ISettingsProps) => { // Clipboard invoice check const clipboardInvoiceCheckEnabled = useStoreState((store) => store.settings.clipboardInvoiceCheckEnabled); const changeClipboardInvoiceCheckEnabled = useStoreActions((store) => store.settings.changeClipboardInvoiceCheckEnabled); + const checkInvoice = useStoreActions((store) => store.clipboardManager.checkInvoice); const onToggleClipBoardInvoiceCheck = async () => { await changeClipboardInvoiceCheckEnabled(!clipboardInvoiceCheckEnabled); + const clipboardText = await Clipboard.getString(); + await checkInvoice(clipboardText); + }; // Copy log @@ -516,11 +520,6 @@ export default ({ navigation }: ISettingsProps) => { Automatically open channels - {/* {}}> - - Backup channels to Google Drive - - */} {/*