allow scaning of pda addresses

src/features/addressBook/AddressQrScanner.tsx

@@ -7,7 +7,7 @@ import QrScanner from '@components/QrScanner'
 import { HomeNavigationProp } from '../home/homeTypes'
 import { useAppStorage } from '../../storage/AppStorageProvider'
 import { parsePaymentLink } from '../../utils/linking'
-import { solAddressIsValid } from '../../utils/accountUtils'
+import { isValidPublicKey, solAddressIsValid } from '../../utils/accountUtils'
 
 const AddressQrScanner = () => {
   const { triggerNotification } = useHaptic()
@@ -19,7 +19,7 @@ const AddressQrScanner = () => {
   const handleBarCodeScanned = useCallback(
     async (data: string) => {
       // scanned qr is an address string
-      if (solAddressIsValid(data)) {
+      if (solAddressIsValid(data) || isValidPublicKey(data)) {
         setScannedAddress(data)
         triggerNotification('success')
         navigation.goBack()

src/features/payment/PaymentScreen.tsx

@@ -62,6 +62,7 @@ import { useBalance } from '../../utils/Balance'
 import {
   accountNetType,
   formatAccountAlias,
+  isValidPublicKey,
   solAddressIsValid,
 } from '../../utils/accountUtils'
 import { SendDetails } from '../../utils/linking'
@@ -230,9 +231,9 @@ const PaymentScreen = () => {
     }
 
     if (
-      paymentsArr.find((p) => {
-        return !solAddressIsValid(p.payee)
-      })
+      paymentsArr.find(
+        (p) => !(solAddressIsValid(p.payee) || isValidPublicKey(p.payee)),
+      )
     ) {
       console.error('Invalid address found in deep link')
       return
@@ -418,7 +419,9 @@ const PaymentScreen = () => {
     const paymentsValid =
       paymentState.payments.length &&
       paymentState.payments.every((p) => {
-        const addressValid = !!(p.address && solAddressIsValid(p.address))
+        const addressValid =
+          !!(p.address && solAddressIsValid(p.address)) ||
+          !!(p.address && isValidPublicKey(p.address))
 
         const paymentValid = p.amount && p.amount?.gt(new BN(0))
         return addressValid && paymentValid && !p.hasError

src/utils/accountUtils.ts

@@ -1,5 +1,5 @@
 import Address, { NetTypes as NetType, utils } from '@helium/address'
-import { PublicKey } from '@solana/web3.js'
+import { PUBLIC_KEY_LENGTH, PublicKey } from '@solana/web3.js'
 import Bcrypt from 'bcrypt-react-native'
 import BigNumber from 'bignumber.js'
 import bs58 from 'bs58'
@@ -29,6 +29,15 @@ export const heliumAddressToSolAddress = (heliumAddress: string) => {
   }
 }
 
+export const isValidPublicKey = (address: string) => {
+  try {
+    const pubKey = new PublicKey(address)
+    return pubKey.toBuffer().length === PUBLIC_KEY_LENGTH
+  } catch {
+    return false
+  }
+}
+
 export const solAddressIsValid = (address: string) => {
   try {
     const pubKey = new PublicKey(address)

src/utils/linking.ts

@@ -8,6 +8,7 @@ import queryString from 'query-string'
 import { BurnRouteParam, PaymentRouteParam } from '../features/home/homeTypes'
 import { RootStackParamList } from '../navigation/rootTypes'
 import { useAccountStorage } from '../storage/AccountStorageProvider'
+import { isValidPublicKey } from './accountUtils'
 
 export const APP_LINK_SCHEME = Linking.createURL('')
 export const PAYMENT_PATH = 'payment'
@@ -108,7 +109,7 @@ export const parseDelegate = (qrContent: string) => {
 export const parsePaymentLink = (
   urlOrAddress: string,
 ): PaymentRouteParam | undefined => {
-  if (Address.isValid(urlOrAddress)) {
+  if (Address.isValid(urlOrAddress) || isValidPublicKey(urlOrAddress)) {
     const url = makePayRequestLink({ payee: urlOrAddress })
     return queryString.parseUrl(url).query
   }