Rebase and address comments

helium · Oct 17, 2024 · ff00328 · ff00328
1 parent 5def081
commit ff00328
Show file tree

Hide file tree

Showing 17 changed files with 138 additions and 879 deletions.
diff --git a/ios/HeliumWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/HeliumWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,4 @@
 {
-  "originHash" : "e70d3525c8e2819a8b34f22909815dab5c700c25a06c32388f3930f7b3627768",
   "pins" : [
     {
       "identity" : "maplibre-gl-native-distribution",
@@ -9,7 +8,25 @@
         "revision" : "ffda61e298c1490d4860d5184e80d618aaadc089",
         "version" : "5.13.0"
       }
+    },
+    {
+      "identity" : "swiftui-charts",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/spacenation/swiftui-charts",
+      "state" : {
+        "revision" : "b044e7eb04d0026490eecb115f4fc07197dad942",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "swiftui-shapes",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/spacenation/swiftui-shapes.git",
+      "state" : {
+        "revision" : "c58b15c37eae9bd20525c6daa93a06a689ca75cb",
+        "version" : "1.1.0"
+      }
     }
   ],
-  "version" : 3
+  "version" : 2
 }
diff --git a/package.json b/package.json
@@ -70,6 +70,7 @@
     "@metaplex-foundation/js": "^0.19.5",
     "@metaplex-foundation/mpl-bubblegum": "0.6.0",
     "@metaplex-foundation/mpl-token-metadata": "2.10.0",
+    "@ngraveio/bc-ur": "^1.1.13",
     "@novalabsxyz/mobile-theme": "2.0.0-y.25",
     "@onsol/tldparser": "^0.5.3",
     "@react-native-async-storage/async-storage": "1.18.1",

diff --git a/src/components/DynamicQrScanner.tsx b/src/components/DynamicQrScanner.tsx
@@ -6,6 +6,7 @@ import { useNavigation } from '@react-navigation/native'
 import { useAsync } from 'react-async-hook'
 import { useTranslation } from 'react-i18next'
 import useAlert from '@hooks/useAlert'
+import { useColors } from '@theme/themeHooks'
 import { CameraScannerLayout } from './CameraScannerLayout'
 import Box from './Box'
 import BackScreen from './BackScreen'
@@ -20,6 +21,7 @@ const DynamicQrScanner = ({ onBarCodeScanned, progress }: Props) => {
   const [hasPermission, setHasPermission] = useState<boolean>()
   const navigation = useNavigation()
   const { showOKCancelAlert } = useAlert()
+  const colors = useColors()
   const { t } = useTranslation()
 
   useEffect(() => {
@@ -60,7 +62,7 @@ const DynamicQrScanner = ({ onBarCodeScanned, progress }: Props) => {
   }
 
   return (
-    <BackScreen padding="none">
+    <BackScreen padding="none" edges={[]}>
       {/* if permission is not granted, show a black screen and notice alert modal */}
       {hasPermission !== true && <Box />}
 
@@ -69,7 +71,10 @@ const DynamicQrScanner = ({ onBarCodeScanned, progress }: Props) => {
           <CameraView
             onBarcodeScanned={handleBarCodeScanned}
             barcodeScannerSettings={{ barcodeTypes: ['qr'] }}
-            style={StyleSheet.absoluteFillObject}
+            style={{
+              ...StyleSheet.absoluteFillObject,
+              backgroundColor: colors.primaryBackground,
+            }}
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             ratio="16:9"
@@ -84,9 +89,15 @@ const DynamicQrScanner = ({ onBarCodeScanned, progress }: Props) => {
             position="absolute"
             bottom="10%"
             alignSelf="center"
-            paddingHorizontal="s"
+            paddingHorizontal="1"
           >
-            <Text variant="subtitle3" marginTop="xxxl" textAlign="center">
+            <Text
+              marginHorizontal="xl"
+              variant="textMdSemibold"
+              marginTop="6xl"
+              textAlign="center"
+              color="primaryText"
+            >
               {t('keystone.payment.scanTxQrcodeScreenSubtitle3')}
             </Text>
           </Box>

diff --git a/src/components/BalanceText.tsx → src/components/TotalFiatBalance.tsx b/src/components/BalanceText.tsx → src/components/TotalFiatBalance.tsx
@@ -7,7 +7,7 @@ import { useTheme } from '@shopify/restyle'
 import Box from './Box'
 import Text from './Text'
 
-const BalanceText = () => {
+const TotalFiatBalance = () => {
   const { total: amount } = useBalance()
   const { colors } = useTheme()
 
@@ -150,4 +150,4 @@ const BalanceText = () => {
 //   )
 // }
 
-export default memo(BalanceText)
+export default memo(TotalFiatBalance)