Send notification on completed topup

minibits-cash · Sep 20, 2023 · 5169d52 · 5169d52
1 parent c753c76
commit 5169d52
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/models/Invoice.ts b/src/models/Invoice.ts
@@ -27,7 +27,7 @@ export const InvoiceModel = types
             const decoded = decodeInvoice(self.encodedInvoice)
             const {expiry, timestamp} = getInvoiceData(decoded)            
 
-            const expiresAt = addSeconds(new Date(timestamp * 1000), expiry as number)
+            const expiresAt = addSeconds(new Date(timestamp as number * 1000), expiry as number)
 
             log.trace(
                 `Invoice expiry is ${expiry}, setting expiresAt to ${expiresAt}`,

diff --git a/src/screens/TopupScreen.tsx b/src/screens/TopupScreen.tsx
@@ -184,7 +184,7 @@ export const TopupScreen: FC<WalletStackScreenProps<'Topup'>> = observer(
 
           setResultModalInfo({
             status: TransactionStatus.COMPLETED,
-            message: `Payment received! Your wallet has been credited with ${invoice.amount} sats.`,
+            message: `Your invoice has been paid and your wallet balance credited with ${invoice.amount} sats.`,
           })
 
           setTransactionStatus(TransactionStatus.COMPLETED)
@@ -725,7 +725,7 @@ export const TopupScreen: FC<WalletStackScreenProps<'Topup'>> = observer(
             ) : (
             <SendAsNostrDMBlock
                 toggleNostrDMModal={toggleNostrDMModal}
-                encodedTokenToSend={invoiceToPay as string}
+                encodedInvoiceToSend={invoiceToPay as string}
                 contactToSendFrom={contactToSendFrom as Contact}
                 contactToSendTo={contactToSendTo as Contact}
                 relaysToShareTo={relaysToShareTo}
@@ -917,7 +917,7 @@ const ShareAsQRCodeBlock = observer(function (props: {
 
 const SendAsNostrDMBlock = observer(function (props: {
     toggleNostrDMModal: any
-    encodedTokenToSend: string
+    encodedInvoiceToSend: string
     contactToSendFrom: Contact
     contactToSendTo: Contact
     relaysToShareTo: string[]
@@ -942,7 +942,7 @@ const SendAsNostrDMBlock = observer(function (props: {
           ]}>
           <Text
             selectable
-            text={props.encodedTokenToSend}
+            text={props.encodedInvoiceToSend}
             style={{color: tokenTextColor, paddingBottom: spacing.medium}}
             size="xxs"
           />
@@ -954,7 +954,7 @@ const SendAsNostrDMBlock = observer(function (props: {
         ) : (
             <View style={$buttonContainer}>            
                 <Button
-                    text="Send"
+                    text="Send request"
                     onPress={props.sendAsNostrDM}
                     style={{marginRight: spacing.medium}}
                     LeftAccessory={() => (
@@ -997,7 +997,7 @@ const SendAsNostrDMBlock = observer(function (props: {
             icon="faCheckCircle"
             iconColor={colors.palette.success200}
             title="Success!"
-            message="Coins have been succesfully sent."
+            message="Payment reuest has been succesfully sent."
         />
         <View style={$buttonContainer}>
             <Button

diff --git a/src/screens/WalletScreen.tsx b/src/screens/WalletScreen.tsx
@@ -59,6 +59,7 @@ import { NotificationService } from '../services/notificationService'
 import PagerView, { PagerViewOnPageScrollEventData } from 'react-native-pager-view'
 import { ExpandingDot, ScalingDot, SlidingBorder, SlidingDot } from 'react-native-animated-pagination-dots'
 import { PaymentRequest, PaymentRequestStatus } from '../models/PaymentRequest'
+import { Invoice } from '../models/Invoice'
 
 const AnimatedPagerView = Animated.createAnimatedComponent(PagerView)
 const deploymentKey = APP_ENV === Env.PROD ? CODEPUSH_PRODUCTION_DEPLOYMENT_KEY : CODEPUSH_STAGING_DEPLOYMENT_KEY
@@ -122,6 +123,7 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
 
         EventEmitter.on('receiveTokenCompleted', onReceiveTokenCompleted)
         EventEmitter.on('receivePaymentRequest', onReceivePaymentRequest)
+        EventEmitter.on('topupCompleted', onTopupCompleted)
 
         return () => {            
             EventEmitter.off('receiveTokenCompleted', onReceiveTokenCompleted)
@@ -197,6 +199,16 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
             result.picture,
         )     
     }
+
+
+    const onReceiveTopupCompleted = async (invoice: Invoice) => { // TODO make it ReceivedEventResult
+        log.trace('onReceiveTopupCompleted event handler trigerred', invoice)
+
+        await NotificationService.createLocalNotification(
+            `⚡ ${invoice.amount} sats received!`,
+            `Your invoice has been paid and your wallet balance credited with ${invoice.amount} sats.`,            
+        )     
+    }
 
 
     const onReceivePaymentRequest = async (result: ReceivedEventResult) => {