laantungir/minibits_wallet
1
0
Fork 0
mirror of https://github.com/minibits-cash/minibits_wallet.git synced 2026-08-12 09:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UI scales, try to obtain device token when loading Settings

Browse Source
This commit is contained in:
minibits-cash
2024-09-28 16:38:35 +02:00
parent f7fa5d8a24
commit d7b433c30c
22 changed files with 165 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build.gradle
+1 -1
View File
@@ -96,7 +96,7 @@ android {
applicationId "com.minibits_wallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 58002
versionCode 58003
versionName "0.1.9"
}
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "minibits_wallet",
"version": "0.1.9-beta.2",
"version": "0.1.9-beta.3",
"private": true,
"scripts": {
"android:clean": "cd android && ./gradlew clean",
src/components/Button.tsx
+4 -4
View File
@@ -7,7 +7,7 @@ import {
TextStyle,
ViewStyle,
} from "react-native"
import {moderateScale, moderateVerticalScale, scale, verticalScale} from '@gocodingnow/rn-size-matters'
import {moderateScale, scale, verticalScale} from '@gocodingnow/rn-size-matters'
import { colors, spacing, typography, useThemeColor } from "../theme"
import { Text, TextProps } from "./Text"
@@ -146,7 +146,7 @@ export function Button(props: ButtonProps) {
const $baseViewStyle: ViewStyle = {
minHeight: moderateVerticalScale(50),
minHeight: verticalScale(50),
borderRadius: spacing.extraSmall,
justifyContent: "center",
alignItems: "center",
@@ -158,8 +158,8 @@ const $baseViewStyle: ViewStyle = {
}
const $baseTextStyle: TextStyle = {
fontSize: moderateVerticalScale(16),
lineHeight: moderateVerticalScale(20),
fontSize: verticalScale(16),
lineHeight: verticalScale(20),
fontFamily: typography.primary?.light,
textAlign: "center",
flexShrink: 1,
src/components/Header.tsx
+1 -1
View File
@@ -18,7 +18,7 @@ import { displayName as appName } from '../../app.json'
import { ExtendedEdge, useSafeAreaInsetsStyle } from "../utils/useSafeAreaInsetsStyle"
import { Icon, IconTypes } from "./Icon"
import { Text, TextProps } from "./Text"
import { moderateVerticalScale } from "@gocodingnow/rn-size-matters"
import { verticalScale } from "@gocodingnow/rn-size-matters"
export interface HeaderProps {
/**
src/components/Text.tsx
+8 -8
View File
@@ -1,4 +1,4 @@
import { moderateVerticalScale } from "@gocodingnow/rn-size-matters"
import { verticalScale } from "@gocodingnow/rn-size-matters"
import { I18nOptions } from "i18n-js"
import React from "react"
import { StyleProp, Text as RNText, TextProps as RNTextProps, TextStyle } from "react-native"
@@ -76,13 +76,13 @@ export function Text(props: TextProps) {
}
export const $sizeStyles = {
xxl: { fontSize: moderateVerticalScale(36), lineHeight: moderateVerticalScale(44) } as TextStyle,
xl: { fontSize: moderateVerticalScale(24), lineHeight: moderateVerticalScale(34) } as TextStyle,
lg: { fontSize: moderateVerticalScale(20), lineHeight: moderateVerticalScale(32) } as TextStyle,
md: { fontSize: moderateVerticalScale(18), lineHeight: moderateVerticalScale(26) } as TextStyle,
sm: { fontSize: moderateVerticalScale(16), lineHeight: moderateVerticalScale(24) } as TextStyle,
xs: { fontSize: moderateVerticalScale(14), lineHeight: moderateVerticalScale(21) } as TextStyle,
xxs: { fontSize: moderateVerticalScale(12), lineHeight: moderateVerticalScale(18) } as TextStyle,
xxl: { fontSize: verticalScale(36), lineHeight: verticalScale(44) } as TextStyle,
xl: { fontSize: verticalScale(24), lineHeight: verticalScale(34) } as TextStyle,
lg: { fontSize: verticalScale(20), lineHeight: verticalScale(32) } as TextStyle,
md: { fontSize: verticalScale(18), lineHeight: verticalScale(26) } as TextStyle,
sm: { fontSize: verticalScale(16), lineHeight: verticalScale(24) } as TextStyle,
xs: { fontSize: verticalScale(14), lineHeight: verticalScale(21) } as TextStyle,
xxs: { fontSize: verticalScale(12), lineHeight: verticalScale(18) } as TextStyle,
}
src/screens/ContactDetailScreen.tsx
+5 -5
View File
@@ -11,7 +11,7 @@ import Clipboard from '@react-native-clipboard/clipboard'
import { ContactType } from '../models/Contact'
import { NostrClient, log } from '../services'
import { getImageSource } from '../utils/utils'
import { moderateVerticalScale, verticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { ReceiveOption } from './ReceiveOptionsScreen'
import { SendOption } from './SendOptionsScreen'
import { IncomingDataType, IncomingParser } from '../services/incomingParser'
@@ -270,7 +270,7 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
<Button
tx="payCommon.requestPayment"
style={{marginLeft: spacing.small, alignSelf: 'center', minHeight: verticalScale(20)}}
textStyle={{fontSize: moderateVerticalScale(14), lineHeight: moderateVerticalScale(16)}}
textStyle={{fontSize: verticalScale(14), lineHeight: verticalScale(16)}}
onPress={gotoTopup}
preset='tertiary'
/>
@@ -279,7 +279,7 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
<Button
tx="payCommon.payToAddress"
style={{marginLeft: spacing.small, alignSelf: 'center', minHeight: verticalScale(20)}}
textStyle={{fontSize: moderateVerticalScale(14), lineHeight: moderateVerticalScale(16)}}
textStyle={{fontSize: verticalScale(14), lineHeight: verticalScale(16)}}
onPress={gotoTransfer}
preset='tertiary'
/>
@@ -475,8 +475,8 @@ const $buttonScan: ViewStyle = {
}
const $buttonSend: ViewStyle = {
borderRadius: moderateVerticalScale(60 / 2),
height: moderateVerticalScale(60),
borderRadius: verticalScale(60 / 2),
height: verticalScale(60),
minWidth: verticalScale(140),
}
src/screens/Contacts/PrivateContacts.tsx
+4 -4
View File
@@ -1,7 +1,7 @@
import {observer} from 'mobx-react-lite'
import React, {useEffect, useRef, useState} from 'react'
import {FlatList, TextInput, TextStyle, View, ViewStyle} from 'react-native'
import {moderateVerticalScale, verticalScale} from '@gocodingnow/rn-size-matters'
import {verticalScale} from '@gocodingnow/rn-size-matters'
import {colors, spacing, useThemeColor} from '../../theme'
import {BottomModal, Button, Card, ErrorModal, Icon, InfoModal, ListItem, Loading, Screen, Text} from '../../components'
import {useStores} from '../../models'
@@ -424,7 +424,7 @@ const $contactInput: TextStyle = {
// borderRadius: 0,
// borderBottomRightRadius: spacing.extraSmall,
// borderTopLeftRadius: spacing.extraSmall,
fontSize: moderateVerticalScale(16),
fontSize: verticalScale(16),
padding: spacing.small,
alignSelf: 'stretch',
textAlignVertical: 'top',
@@ -461,7 +461,7 @@ const $bottomContainer: ViewStyle = {
}
const $buttonNew: ViewStyle = {
borderRadius: moderateVerticalScale(60 / 2),
height: moderateVerticalScale(60),
borderRadius: verticalScale(60 / 2),
height: verticalScale(60),
minWidth: verticalScale(120),
}
src/screens/LightningPayScreen.tsx
+3 -3
View File
@@ -20,7 +20,7 @@ import { CurrencyCode, MintUnit } from '../services/wallet/currency'
import { useStores } from '../models'
import { Mint } from '../models/Mint'
import { MintHeader } from './Mints/MintHeader'
import { moderateVerticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import useIsInternetReachable from '../utils/useIsInternetReachable'
import { translate } from '../i18n'
@@ -262,8 +262,8 @@ export const LightningPayScreen: FC<WalletStackScreenProps<'LightningPay'>> = fu
preset='secondary'
onPress={gotoSend}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.tiny,
alignSelf: 'center',
marginTop: spacing.medium
src/screens/NwcScreen.tsx
+4 -4
View File
@@ -10,7 +10,7 @@ import {useHeader} from '../utils/useHeader'
import {useStores} from '../models'
import AppError, { Err } from '../utils/AppError'
import { log } from '../services'
import { moderateVerticalScale, verticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { NwcConnection } from '../models/NwcStore'
import { QRCodeBlock } from './Wallet/QRCode'
import { CollapsibleText } from '../components/CollapsibleText'
@@ -175,7 +175,7 @@ export const NwcScreen: FC<NwcScreenProps> = observer(
const screenBg = useThemeColor('background')
const mainButtonIcon = useThemeColor('button')
const labelText = useThemeColor('textDim')
const $subText = {color: useThemeColor('textDim'), fontSize: moderateVerticalScale(14)}
const $subText = {color: useThemeColor('textDim'), fontSize: verticalScale(14)}
const headerTitle = useThemeColor('headerTitle')
return (
@@ -466,8 +466,8 @@ const $buttonContainer: ViewStyle = {
}
const $buttonNew: ViewStyle = {
borderRadius: moderateVerticalScale(60 / 2),
height: moderateVerticalScale(60),
borderRadius: verticalScale(60 / 2),
height: verticalScale(60),
minWidth: verticalScale(120),
}
src/screens/ReceiveScreen.tsx
+2 -2
View File
@@ -28,7 +28,7 @@ import {CashuUtils, TokenV3} from '../services/cashu/cashuUtils'
import {ResultModalInfo} from './Wallet/ResultModalInfo'
import {MintListItem} from './Mints/MintListItem'
import useIsInternetReachable from '../utils/useIsInternetReachable'
import { moderateVerticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { CurrencyCode, MintUnit, formatCurrency, getCurrency } from "../services/wallet/currency"
import { MintHeader } from './Mints/MintHeader'
import { round, toNumber } from '../utils/number'
@@ -508,7 +508,7 @@ const $amountInput: TextStyle = {
borderRadius: spacing.small,
margin: 0,
padding: 0,
fontSize: moderateVerticalScale(48),
fontSize: verticalScale(48),
fontFamily: typography.primary?.medium,
textAlign: 'center',
color: 'white',
src/screens/RelaysScreen.tsx
+3 -3
View File
@@ -11,7 +11,7 @@ import {useStores} from '../models'
import { Relay } from '../models/Relay'
import AppError, { Err } from '../utils/AppError'
import { log, WalletTask } from '../services'
import { moderateVerticalScale, verticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { translate } from '../i18n'
import { NotificationService } from '../services/notificationService'
@@ -371,8 +371,8 @@ const $buttonContainer: ViewStyle = {
}
const $buttonNew: ViewStyle = {
borderRadius: moderateVerticalScale(60 / 2),
height: moderateVerticalScale(60),
borderRadius: verticalScale(60 / 2),
height: verticalScale(60),
minWidth: verticalScale(120),
}
src/screens/SendScreen.tsx
+6 -7
View File
@@ -52,9 +52,8 @@ import useIsInternetReachable from '../utils/useIsInternetReachable'
import { Proof } from '../models/Proof'
import { Contact, ContactType } from '../models/Contact'
import { getImageSource, infoMessage } from '../utils/utils'
import { NotificationService } from '../services/notificationService'
import { SendOption } from './SendOptionsScreen'
import { moderateVerticalScale, verticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { MintUnit, formatCurrency, getCurrency } from "../services/wallet/currency"
import { MintHeader } from './Mints/MintHeader'
import { MintBalanceSelector } from './Mints/MintBalanceSelector'
@@ -933,8 +932,8 @@ const SelectProofsBlock = observer(function (props: {
preset='secondary'
onPress={props.toggleNostrDMModal}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
}}
LeftAccessory={() => (
<Icon
@@ -950,8 +949,8 @@ const SelectProofsBlock = observer(function (props: {
preset='secondary'
onPress={props.gotoContacts}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
}}
LeftAccessory={() => (
<Icon
@@ -1153,7 +1152,7 @@ const $amountInput: TextStyle = {
borderRadius: spacing.small,
margin: 0,
padding: 0,
fontSize: moderateVerticalScale(48),
fontSize: verticalScale(48),
fontFamily: typography.primary?.medium,
textAlign: 'center',
color: 'white',
src/screens/SettingsScreen.tsx
+6
View File
@@ -78,6 +78,12 @@ export const SettingsScreen: FC<SettingsScreenProps> = observer(
const getNotificationPermission = async () => {
try {
const enabled = await NotificationService.areNotificationsEnabled()
if(enabled) {
await messaging().registerDeviceForRemoteMessages()
const deviceToken = await messaging().getToken()
}
setAreNotificationsEnabled(enabled)
} catch (e: any) {
log.info(e.name, e.message)
src/screens/TokenReceiveScreen.tsx
+3 -3
View File
@@ -20,7 +20,7 @@ import { CurrencyCode, MintUnit } from '../services/wallet/currency'
import { useStores } from '../models'
import { Mint } from '../models/Mint'
import { MintHeader } from './Mints/MintHeader'
import { moderateVerticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { translate } from '../i18n'
@@ -244,8 +244,8 @@ export const TokenReceiveScreen: FC<WalletStackScreenProps<'TokenReceive'>> = fu
preset='secondary'
onPress={gotoTopup}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.tiny,
alignSelf: 'center',
marginTop: spacing.medium
src/screens/TopupScreen.tsx
+1 -2
View File
@@ -52,7 +52,6 @@ import {LNURLWithdrawParams} from 'js-lnurl'
import {round, roundDown, roundUp, toNumber} from '../utils/number'
import {LnurlClient, LnurlWithdrawResult} from '../services/lnurlService'
import {
moderateVerticalScale,
verticalScale,
} from '@gocodingnow/rn-size-matters'
import {
@@ -1289,7 +1288,7 @@ const $amountInput: TextStyle = {
borderRadius: spacing.small,
margin: 0,
padding: 0,
fontSize: moderateVerticalScale(48),
fontSize: verticalScale(48),
fontFamily: typography.primary?.medium,
textAlign: 'center',
color: 'white',
src/screens/TranDetailScreen.tsx
+6 -6
View File
@@ -49,7 +49,7 @@ import useIsInternetReachable from '../utils/useIsInternetReachable'
import { ResultModalInfo } from './Wallet/ResultModalInfo'
import { CashuUtils, TokenV3 } from '../services/cashu/cashuUtils'
import { Mint, MintStatus } from '../models/Mint'
import { moderateVerticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { CurrencySign } from './Wallet/CurrencySign'
import { MintUnit, formatCurrency, getCurrency } from "../services/wallet/currency"
import { PaymentRequest } from '../models/PaymentRequest'
@@ -771,9 +771,9 @@ const ReceiveInfoBlock = function (props: {
<Image
style={
{
width: moderateVerticalScale(40),
height: moderateVerticalScale(40),
borderRadius: moderateVerticalScale(40) / 2,
width: verticalScale(40),
height: verticalScale(40),
borderRadius: verticalScale(40) / 2,
}
}
source={{uri: profilePicture}}
@@ -1956,8 +1956,8 @@ const $contentContainer: TextStyle = {
}
const $tranAmount: TextStyle = {
fontSize: moderateVerticalScale(48),
lineHeight: moderateVerticalScale(48),
fontSize: verticalScale(48),
lineHeight: verticalScale(48),
marginLeft: -20,
}
src/screens/Transactions/TransactionListItem.tsx
+6 -6
View File
@@ -13,7 +13,7 @@ import useIsInternetReachable from '../../utils/useIsInternetReachable'
import {translate} from '../../i18n'
import { CurrencyAmount } from '../Wallet/CurrencyAmount'
import { NostrProfile } from '../../services'
import { moderateScale, moderateVerticalScale } from '@gocodingnow/rn-size-matters'
import { moderateScale, verticalScale } from '@gocodingnow/rn-size-matters'
export interface TransactionListProps {
transaction: Transaction
@@ -83,7 +83,7 @@ export const TransactionListItem = observer(function (
addSuffix: true,
})
let timeAgo = ''
if (isTimeAgoVisible) timeAgo = `${distance} · `
if (isTimeAgoVisible) timeAgo = `${distance.slice(0, 20)} · `
switch (tx.status) {
case TransactionStatus.COMPLETED:
@@ -160,9 +160,9 @@ export const TransactionListItem = observer(function (
<Image
style={
{
width: moderateVerticalScale(34),
height: moderateVerticalScale(34),
borderRadius: moderateVerticalScale(34) / 2,
width: verticalScale(34),
height: verticalScale(34),
borderRadius: verticalScale(34) / 2,
}
}
source={{uri: profile.picture}}
@@ -258,7 +258,7 @@ const $item: ViewStyle = {
const $mintText: TextStyle = {
overflow: 'hidden',
fontSize: moderateVerticalScale(14),
fontSize: verticalScale(14),
}
const $txContainer: ViewStyle = {
src/screens/TransferScreen.tsx
+2 -2
View File
@@ -39,7 +39,7 @@ import { DecodedLightningInvoice, LightningUtils } from '../services/lightning/l
import { SendOption } from './SendOptionsScreen'
import { round, roundDown, roundUp, toNumber } from '../utils/number'
import { LnurlClient, LNURLPayParams } from '../services/lnurlService'
import { moderateVerticalScale } from '@gocodingnow/rn-size-matters'
import { verticalScale } from '@gocodingnow/rn-size-matters'
import { CurrencyCode, MintUnit, getCurrency } from "../services/wallet/currency"
import { FeeBadge } from './Wallet/FeeBadge'
import { MeltQuoteResponse } from '@cashu/cashu-ts'
@@ -926,7 +926,7 @@ const $headerContainer: TextStyle = {
borderRadius: spacing.small,
margin: 0,
padding: 0,
fontSize: moderateVerticalScale(48),
fontSize: verticalScale(48),
fontFamily: typography.primary?.medium,
textAlign: 'center',
color: 'white',
src/screens/Wallet/CurrencySign.tsx
+4 -4
View File
@@ -35,11 +35,11 @@ export const CurrencySign = function(props: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
}, props.containerStyle || {}]}
}, containerStyle || {}]}
>
<SvgXml
width={props.size && spacing[props.size] * 1.5 || spacing.small * 1.5}
height={props.size && spacing[props.size] * 1.5 || spacing.small * 1.5}
width={size && spacing[size] * 1.5 || spacing.small * 1.5}
height={size && spacing[size] * 1.5 || spacing.small * 1.5}
style={{marginRight: spacing.tiny}}
xml={Currencies[code]?.icon || null}
/>
@@ -51,7 +51,7 @@ export const CurrencySign = function(props: {
fontFamily: typography.primary?.light,
lineHeight: props.size && spacing[props.size] * 1.5 || spacing.small * 1.5
}, props.textStyle || {}]}
}, textStyle || {}]}
/>
</View>
)
src/screens/Wallet/QRCode.tsx
+7 -7
View File
@@ -4,7 +4,7 @@ import { infoMessage } from "../../utils/utils"
import { Button, Card, Icon, ListItem } from "../../components"
import QRCode from "react-native-qrcode-svg"
import Clipboard from "@react-native-clipboard/clipboard"
import { moderateVerticalScale } from "@gocodingnow/rn-size-matters"
import { verticalScale } from "@gocodingnow/rn-size-matters"
import { colors, spacing } from "../../theme"
import { useEffect, useState } from "react"
import { translate } from "../../i18n"
@@ -137,8 +137,8 @@ export const QRCodeBlock = function (props: {
textStyle={{color: colors.light.text, fontSize: 14}}
style={{
minWidth: 60,
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -150,8 +150,8 @@ export const QRCodeBlock = function (props: {
textStyle={{color: colors.light.text, fontSize: 14}}
style={{
minWidth: 60,
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -165,8 +165,8 @@ export const QRCodeBlock = function (props: {
pressedStyle={{backgroundColor: colors.light.buttonTertiaryPressed}}
style={{
minWidth: 60,
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
src/screens/WalletScreen.tsx
+67 -79
View File
@@ -15,9 +15,8 @@ import {
LayoutAnimation,
} from 'react-native'
import codePush, { RemotePackage } from 'react-native-code-push'
import {moderateScale, moderateVerticalScale, verticalScale} from '@gocodingnow/rn-size-matters'
import {moderateScale, verticalScale} from '@gocodingnow/rn-size-matters'
import { SvgXml } from 'react-native-svg'
import {getUnixTime} from 'date-fns'
import { debounce } from "lodash"
import {useThemeColor, spacing, colors, typography} from '../theme'
import {
@@ -472,7 +471,7 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
}
/>
}
style={[$card, {paddingTop: spacing.extraSmall}]}
style={[$card, {paddingVertical: spacing.extraSmall}]}
/>
) : (
<Card
@@ -522,7 +521,7 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
const renderTabBar = (props: any) => {
return(
<View style={{backgroundColor: headerBg, marginTop: -spacing.small}}>
<View style={{backgroundColor: headerBg, marginTop: -spacing.medium}}>
<View style={{width: routes.length * tabWidth, alignSelf: 'center', backgroundColor: headerBg}}>
<TabBar
{...props}
@@ -592,41 +591,41 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
// style={{borderWidth: 1, borderColor: 'red'}}
/>
)}
<View style={[$bottomContainer, {minHeight: spacing.screenHeight * 0.26}]}>
{isNwcVisible && (
<View style={{flex : 1, justifyContent: 'flex-start', marginBottom: spacing.medium}}>
<FlatList
data={nwcCardsData}
horizontal={true}
renderItem={({item, index}) => {
return (
<Card
HeadingComponent={<Text text={item.name} size='xs'/>}
ContentComponent={
<>
<Text text='Spent today' size='xxs' preset='formHelper' style={{color: label, overflow: 'hidden'}}/>
<CurrencyAmount
amount={210}
currencyCode={CurrencyCode.SAT}
containerStyle={{marginLeft: -spacing.tiny, marginTop: spacing.small}}
size='medium'
/>
</>
}
style={{
width: spacing.screenWidth * 0.28,
marginRight: spacing.small,
}}
/>
)}
}
style={{
{isNwcVisible && (
<View style={$nwcContainer}>
<FlatList
data={nwcCardsData}
horizontal={true}
renderItem={({item, index}) => {
return (
<Card
HeadingComponent={<Text text={item.name} size='xs'/>}
ContentComponent={
<>
<Text text='Spent today' size='xxs' preset='formHelper' style={{color: label, overflow: 'hidden'}}/>
<CurrencyAmount
amount={item.dailyLimit - item.remainingDailyLimit}
currencyCode={CurrencyCode.SAT}
containerStyle={{marginLeft: -spacing.tiny, marginTop: spacing.small}}
size='medium'
/>
</>
}
style={{
width: spacing.screenWidth * 0.28,
marginRight: spacing.small,
}}
/>
)}
}
style={{
}}
/>
</View>
)}
}}
/>
</View>
)}
<View style={[$bottomContainer]}>
<View style={$buttonContainer}>
<Button
LeftAccessory={() => (
@@ -790,12 +789,12 @@ const UnitBalanceBlock = observer(function (props: {
amountStyle={[$unitBalance, {color: balanceColor}]}
containerStyle={{marginTop: spacing.medium}}
/>
<View style={{height: moderateVerticalScale(40)}}>
<View style={{height: verticalScale(40)}}>
{walletStore.exchangeRate && userSettingsStore.exchangeCurrency && (
<CurrencyAmount
amount={getConvertedBalance() ?? 0}
currencyCode={unitBalance.unit === 'sat' ? userSettingsStore.exchangeCurrency : CurrencyCode.SAT}
symbolStyle={{color: convertedBalanceColor, marginTop: spacing.tiny, fontSize: moderateVerticalScale(10)}}
symbolStyle={{color: convertedBalanceColor, marginTop: spacing.tiny, fontSize: verticalScale(10)}}
amountStyle={{color: convertedBalanceColor}}
size='small'
/>
@@ -954,8 +953,8 @@ const MintsByUnitList = observer(function (props: {
textStyle={{fontSize: 14, color}}
onPress={() => props.onTopup(mintsByUnitCurrent!.unit, mint.mintUrl)}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -972,8 +971,8 @@ const MintsByUnitList = observer(function (props: {
preset='secondary'
onPress={() => props.onLightningPay(mintsByUnitCurrent!.unit, mint.mintUrl)}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -993,8 +992,8 @@ const MintsByUnitList = observer(function (props: {
preset='secondary'
onPress={() => props.onMintInfo(mint.mintUrl)}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -1060,12 +1059,12 @@ const $card: ViewStyle = {
const $cardHeading: TextStyle = {
fontFamily: typography.primary?.medium,
fontSize: moderateVerticalScale(18),
fontSize: verticalScale(18),
}
const $unitBalance: TextStyle = {
fontSize: moderateVerticalScale(48),
lineHeight: moderateVerticalScale(48)
fontSize: verticalScale(48),
lineHeight: verticalScale(48)
}
const $promoIconContainer: ViewStyle = {
@@ -1083,61 +1082,50 @@ const $item: ViewStyle = {
marginHorizontal: spacing.micro,
}
const $mintText: TextStyle = {
overflow: 'hidden',
fontSize: 14,
}
const $balanceContainer: ViewStyle = {
justifyContent: 'center',
alignSelf: 'center',
marginRight: spacing.extraSmall,
}
const $balance: TextStyle = {
fontSize: verticalScale(20),
fontFamily: typography.primary?.medium,
const $nwcContainer: ViewStyle = {
justifyContent: 'flex-start',
paddingHorizontal: spacing.extraSmall,
}
const $bottomContainer: ViewStyle = {
justifyContent: 'flex-end',
paddingHorizontal: spacing.extraSmall,
// alignSelf: 'stretch',
// opacity: 0,
marginTop: spacing.large,
marginBottom: 0
}
const $buttonContainer: ViewStyle = {
flexDirection: 'row',
// marginBottom: spacing.tiny,
justifyContent: 'center',
alignItems: 'center',
alignItems: 'center',
}
const $buttonSend: ViewStyle = {
borderTopLeftRadius: moderateVerticalScale(60 / 2),
borderBottomLeftRadius: moderateVerticalScale(60 / 2),
borderTopLeftRadius: verticalScale(60 / 2),
borderBottomLeftRadius: verticalScale(60 / 2),
borderTopRightRadius: 0,
borderBottomRightRadius: 0,
width: moderateVerticalScale(130),
height: moderateVerticalScale(55),
marginRight: moderateVerticalScale(-25),
width: verticalScale(130),
height: verticalScale(55),
marginRight: verticalScale(-25),
}
const $buttonScan: ViewStyle = {
borderRadius: moderateVerticalScale(70 / 2),
width: moderateVerticalScale(70),
height: moderateVerticalScale(70),
borderRadius: verticalScale(70 / 2),
width: verticalScale(70),
height: verticalScale(70),
zIndex: 99,
}
const $buttonReceive: ViewStyle = {
borderTopLeftRadius: 0,
borderBottomLeftRadius: 0,
borderTopRightRadius: moderateVerticalScale(30),
borderBottomRightRadius: moderateVerticalScale(30),
width: moderateVerticalScale(130),
height: moderateVerticalScale(55),
marginLeft: moderateVerticalScale(-15),
borderTopRightRadius: verticalScale(30),
borderBottomRightRadius: verticalScale(30),
width: verticalScale(130),
height: verticalScale(55),
marginLeft: verticalScale(-15),
}
const $bottomModal: ViewStyle = {
src/screens/WalletScreenBC.tsx
+21 -21
View File
@@ -16,7 +16,7 @@ import {
ScrollView
} from 'react-native'
import codePush, { RemotePackage } from 'react-native-code-push'
import {moderateVerticalScale, verticalScale} from '@gocodingnow/rn-size-matters'
import {verticalScale, verticalScale} from '@gocodingnow/rn-size-matters'
import { SvgXml } from 'react-native-svg'
import {getUnixTime} from 'date-fns'
import PagerView, { PagerViewOnPageScrollEventData } from 'react-native-pager-view'
@@ -853,8 +853,8 @@ const MintsByUnitListItem = observer(function (props: {
textStyle={{fontSize: 14, color}}
onPress={() => gotoTopup(mintsByUnit.unit, mint.mintUrl)}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -871,8 +871,8 @@ const MintsByUnitListItem = observer(function (props: {
preset='secondary'
onPress={() => gotoLightningPay(mintsByUnit.unit, mint.mintUrl)}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -892,8 +892,8 @@ const MintsByUnitListItem = observer(function (props: {
preset='secondary'
onPress={() => gotoMintInfo(mint.mintUrl)}
style={{
minHeight: moderateVerticalScale(40),
paddingVertical: moderateVerticalScale(spacing.tiny),
minHeight: verticalScale(40),
paddingVertical: verticalScale(spacing.tiny),
marginRight: spacing.small
}}
/>
@@ -953,12 +953,12 @@ const $card: ViewStyle = {
const $cardHeading: TextStyle = {
fontFamily: typography.primary?.medium,
fontSize: moderateVerticalScale(18),
fontSize: verticalScale(18),
}
const $unitBalance: TextStyle = {
fontSize: moderateVerticalScale(48),
lineHeight: moderateVerticalScale(48)
fontSize: verticalScale(48),
lineHeight: verticalScale(48)
}
const $promoIconContainer: ViewStyle = {
@@ -1008,29 +1008,29 @@ const $buttonContainer: ViewStyle = {
}
const $buttonTopup: ViewStyle = {
borderTopLeftRadius: moderateVerticalScale(60 / 2),
borderBottomLeftRadius: moderateVerticalScale(60 / 2),
borderTopLeftRadius: verticalScale(60 / 2),
borderBottomLeftRadius: verticalScale(60 / 2),
borderTopRightRadius: 0,
borderBottomRightRadius: 0,
width: moderateVerticalScale(150),
height: moderateVerticalScale(60),
width: verticalScale(150),
height: verticalScale(60),
marginRight: -25,
}
const $buttonScan: ViewStyle = {
borderRadius: moderateVerticalScale(70 / 2),
width: moderateVerticalScale(70),
height: moderateVerticalScale(70),
borderRadius: verticalScale(70 / 2),
width: verticalScale(70),
height: verticalScale(70),
zIndex: 99,
}
const $buttonPay: ViewStyle = {
borderTopLeftRadius: 0,
borderBottomLeftRadius: 0,
borderTopRightRadius: moderateVerticalScale(30),
borderBottomRightRadius: moderateVerticalScale(30),
width: moderateVerticalScale(150),
height: moderateVerticalScale(60),
borderTopRightRadius: verticalScale(30),
borderBottomRightRadius: verticalScale(30),
width: verticalScale(150),
height: verticalScale(60),
marginLeft: -25,
}