Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Satscard support #1282

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Navigation.ts
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@ import PointOfSaleRecon from './views/Settings/PointOfSaleRecon';
import PointOfSaleReconExport from './views/Settings/PointOfSaleReconExport';
import PaymentsSettings from './views/Settings/PaymentsSettings';
import InvoicesSettings from './views/Settings/InvoicesSettings';
import Satscard from './views/Settings/Satscard';

// Routing
import Routing from './views/Routing/Routing';
@@ -247,6 +248,9 @@ const AppScenes = {
PointOfSaleReconExport: {
screen: PointOfSaleReconExport
},
Satscard: {
screen: Satscard
},
PaymentsSettings: {
screen: PaymentsSettings
},
4 changes: 4 additions & 0 deletions assets/images/SVG/Satscard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions locales/en.json
Original file line number Diff line number Diff line change
@@ -53,6 +53,8 @@
"general.false": "False",
"general.force": "Force",
"general.proceed": "Proceed",
"general.id": "ID",
"general.version": "Version",
"general.fiatFetchError": "Error fetching exchange rates",
"components.CollapsedQr.show": "Show QR",
"components.CollapsedQr.hide": "Hide QR",
@@ -118,6 +120,15 @@
"views.Routing.RoutingEvent.title": "You received",
"views.Routing.SetFees": "Your node fees",
"views.Routing.channelFees": "Edit channel fees",
"views.Satscard.load": "Load Satscard",
"views.Satscard.unseal": "Unseal",
"views.Satscard.birthHeight": "Birth height",
"views.Satscard.totalSlots": "Total slots",
"views.Satscard.activeSlot": "Active slot",
"views.Satscard.slotStatus": "Slot status",
"views.Satscard.generateAddress": "Generate address",
"views.Satscard.tapsignerNotSupported": "Tapsigner not supported",
"views.Satscard.wait": "Wait and unlock rate-limited card",
"views.Settings.AddEditNode.certificateButton": "Certificate Install Instructions",
"views.Settings.AddEditNode.nodeConfig": "Node Configuration",
"views.Settings.AddEditNode.connectionStringClipboard": "Detected the following connection string in your clipboard",
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
"@react-native-picker/picker": "2.4.8",
"@react-navigation/bottom-tabs": "5.11.11",
"@react-navigation/native": "6.0.16",
"@remobile/react-native-qrcode-local-image": "github:BlueWallet/react-native-qrcode-local-image#b8baa79",
"@remobile/react-native-qrcode-local-image": "github:BlueWallet/react-native-qrcode-local-image#master",
"@tradle/react-native-http": "2.0.1",
"@types/react-native-snap-carousel": "3.8.5",
"assert": "1.5.0",
@@ -42,13 +42,15 @@
"browserify-zlib": "0.1.4",
"bs58check": "2.1.2",
"buffer": "5.6.0",
"cktap-protocol-react-native": "git+https://github.com/bithyve/cktap-protocol-react-native.git#main",
"console-browserify": "1.2.0",
"constants-browserify": "1.0.0",
"create-hash": "1.2.0",
"dateformat": "3.0.3",
"dns.js": "1.0.1",
"domain-browser": "1.2.0",
"elliptic": "6.5.4",
"eslint-plugin-ft-flow": "2.0.3",
"events": "1.1.1",
"fast-sha256": "1.3.0",
"hash.js": "1.1.7",
@@ -109,7 +111,8 @@
"url": "0.10.3",
"utf8": "3.0.0",
"util": "0.10.4",
"vm-browserify": "0.0.4"
"vm-browserify": "0.0.4",
"wif": "2.0.6"
},
"devDependencies": {
"@babel/core": "7.16.12",
547 changes: 547 additions & 0 deletions views/Settings/Satscard.tsx

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions views/Settings/Settings.tsx
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ import NodeOn from '../../assets/images/SVG/Node On.svg';
import Olympus from '../../assets/images/SVG/Olympus.svg';
import POS from '../../assets/images/SVG/POS.svg';
import ReceiveIcon from '../../assets/images/SVG/Receive.svg';
import Satscard from '../../assets/images/SVG/Satscard.svg';
import SendIcon from '../../assets/images/SVG/Send.svg';

import Header from '../../components/Header';
@@ -636,6 +637,39 @@ export default class Settings extends React.Component<
</View>
</TouchableOpacity>
</View>
<View
style={{
backgroundColor: themeColor('secondary'),
width: '90%',
borderRadius: 10,
alignSelf: 'center',
marginBottom: 15
}}
>
<TouchableOpacity
style={styles.columnField}
onPress={() => navigation.navigate('Satscard')}
>
<View style={{ marginLeft: 7, marginTop: -5 }}>
<Satscard
fill={themeColor('text')}
width={18}
heigh={18}
/>
</View>
<Text
style={{
...styles.columnText,
color: themeColor('text')
}}
>
Satscard
</Text>
<View style={styles.ForwardArrow}>
<ForwardIcon />
</View>
</TouchableOpacity>
</View>
{(showHiddenSettings || posEnabled) && (
<View
style={{
4,814 changes: 2,545 additions & 2,269 deletions yarn.lock

Large diffs are not rendered by default.