CR: update

Emurgo · May 29, 2024 · 6fb424c · 6fb424c
1 parent d525844
commit 6fb424c
Show file tree

Hide file tree

Showing 22 changed files with 217 additions and 216 deletions.
diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
@@ -821,7 +821,7 @@ SPEC CHECKSUMS:
   amplitude-react-native: 1ea3d5e1f80ccc357dd178c55c29e51c89f1cd11
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
   EXBarCodeScanner: 8e23fae8d267dbef9f04817833a494200f1fce35
   EXCamera: 0fbfa338a3776af2722d626a3437abe33f708aad
@@ -838,7 +838,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 12ea01e587c9594e7b144e1bfc86ac4d9ac28fde
   FBReactNativeSpec: faca7d16c37626ca5780a87adef703817722fe61
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88
   libaom: 144606b1da4b5915a1054383c3a4459ccdb3c661
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7

diff --git a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
@@ -16,7 +16,7 @@ export type AmountItemProps = {
   wallet: YoroiWallet
   amount: Balance.Amount
   style?: ViewProps['style']
-  isPrivacyOff?: boolean
+  isPrivacyActive?: boolean
   status?: string
   inWallet?: boolean
   variant?: 'swap'
@@ -25,7 +25,7 @@ export type AmountItemProps = {
 }
 
 export const AmountItem = ({
-  isPrivacyOff,
+  isPrivacyActive,
   wallet,
   style,
   amount,
@@ -84,7 +84,7 @@ export const AmountItem = ({
             {priceImpactRisk === 'high' && <Icon.Warning size={24} color={priceImpactRiskTextColor} />}
 
             <Text style={[styles.quantity, {color: priceImpactRiskTextColor}]}>
-              {isPrivacyOff ? '**.*******' : formattedQuantity}
+              {isPrivacyActive ? '**.*******' : formattedQuantity}
             </Text>
           </View>
         )}

diff --git a/apps/wallet-mobile/src/components/HideableText/HideableText.tsx b/apps/wallet-mobile/src/components/HideableText/HideableText.tsx
@@ -9,8 +9,8 @@ type Props = TextProps & {
 }
 
 export const HideableText = ({text, ...props}: Props) => {
-  const {isPrivacyOn} = usePrivacyMode()
-  const children = isPrivacyOn ? text : text?.replaceAll(/./g, '\u25CF')
+  const {isPrivacyActive} = usePrivacyMode()
+  const children = !isPrivacyActive ? text : text?.replaceAll(/./g, '\u25CF')
 
   return <Text {...props}>{children}</Text>
 }
diff --git a/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
@@ -43,17 +43,17 @@ export const PairedBalance = React.forwardRef<ResetErrorRef, Props>(({amount, te
 const Price = ({amount, textStyle, ignorePrivacy}: Props) => {
   const styles = useStyles()
   const wallet = useSelectedWallet()
-  const {isPrivacyOn, privacyPlaceholder} = usePrivacyMode()
+  const {isPrivacyActive, privacyPlaceholder} = usePrivacyMode()
   const {currency, config} = useCurrencyContext()
   const rate = useExchangeRate({wallet, to: currency})
 
   const price = React.useMemo(() => {
     if (rate == null) return `... ${currency}`
 
-    return isPrivacyOn || !ignorePrivacy
+    return !isPrivacyActive || ignorePrivacy === true
       ? `${amountBreakdown(amount).bn.times(rate).toFormat(config.decimals)} ${currency}`
       : `${privacyPlaceholder} ${currency}`
-  }, [amount, config.decimals, currency, ignorePrivacy, isPrivacyOn, privacyPlaceholder, rate])
+  }, [amount, config.decimals, currency, ignorePrivacy, isPrivacyActive, privacyPlaceholder, rate])
 
   return (
     <Text style={[styles.pairedBalanceText, textStyle]} testID="pairedTotalText">

diff --git a/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx b/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx
@@ -33,15 +33,15 @@ export const TokenAmountItem = ({
   orderType,
 }: TokenAmountItemProps) => {
   const {styles, colors} = useStyles()
-  const {privacyPlaceholder, isPrivacyOn} = usePrivacyMode()
+  const {privacyPlaceholder, isPrivacyActive} = usePrivacyMode()
   const priceImpactRiskTheme = usePriceImpactRiskTheme(priceImpactRisk ?? 'none')
 
   const {info} = amount
   const isPrimary = isPrimaryToken(info)
   const detail = isPrimary ? info.description : info.fingerprint
   const name = infoExtractName(info)
 
-  const formattedQuantity = isPrivacyOn || !ignorePrivacy ? amountFormatter()(amount) : privacyPlaceholder
+  const formattedQuantity = !isPrivacyActive && ignorePrivacy == true ? amountFormatter()(amount) : privacyPlaceholder
 
   const showSwapDetails = !isPrimary && variant === 'swap'
   const priceImpactRiskTextColor = orderType === 'market' ? priceImpactRiskTheme.text : colors.text

diff --git a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx b/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx
@@ -26,7 +26,7 @@ export const ApplicationSettingsScreen = () => {
   const {languageCode, supportedLanguages} = useLanguage()
   const language = supportedLanguages.find((lang) => lang.code === languageCode) ?? defaultLanguage
 
-  const {isTogglePrivacyModeLoading, isPrivacyOff} = usePrivacyMode()
+  const {isTogglePrivacyModeLoading, isPrivacyActive} = usePrivacyMode()
   const {currency} = useCurrencyContext()
   const {enabled: crashReportEnabled} = useCrashReports()
 
@@ -119,7 +119,7 @@ export const ApplicationSettingsScreen = () => {
             label={strings.privacyMode}
             info={strings.privacyModeInfo}
           >
-            <PrivacyModeSwitch isPrivacyOff={isPrivacyOff} />
+            <PrivacyModeSwitch isPrivacyActive={isPrivacyActive} />
           </SettingsItem>
 
           <SettingsItem
@@ -164,9 +164,9 @@ export const ApplicationSettingsScreen = () => {
 }
 
 // to avoid switch jumps
-const PrivacyModeSwitch = ({isPrivacyOff}: {isPrivacyOff: boolean}) => {
+const PrivacyModeSwitch = ({isPrivacyActive}: {isPrivacyActive: boolean}) => {
   const {setPrivacyModeOn, setPrivacyModeOff, isTogglePrivacyModeLoading} = usePrivacyMode()
-  const [isLocalPrivacyOff, setIsLocalPrivacyOff] = React.useState(isPrivacyOff)
+  const [isLocalPrivacyActive, setIsLocalPrivacyOff] = React.useState(isPrivacyActive)
 
   const onTogglePrivacyMode = () => {
     setIsLocalPrivacyOff((prevState) => {
@@ -182,7 +182,7 @@ const PrivacyModeSwitch = ({isPrivacyOff}: {isPrivacyOff: boolean}) => {
 
   return (
     <SettingsSwitch
-      value={isLocalPrivacyOff}
+      value={isLocalPrivacyActive}
       onValueChange={onTogglePrivacyMode}
       disabled={isTogglePrivacyModeLoading}
     />

diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx b/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx
@@ -187,14 +187,14 @@ type ActionableAmountProps = {
 }
 const ActionableAmount = ({amount, onRemove, wallet, collateralId, disabled}: ActionableAmountProps) => {
   const {styles} = useStyles()
-  const {isPrivacyOff} = usePrivacyMode()
+  const {isPrivacyActive} = usePrivacyMode()
 
   const handleRemove = () => onRemove()
 
   return (
     <View style={styles.amountItem} testID="amountItem">
       <Left>
-        <AmountItem amount={amount} wallet={wallet} isPrivacyOff={isPrivacyOff} />
+        <AmountItem amount={amount} wallet={wallet} isPrivacyActive={isPrivacyActive} />
       </Left>
 
       {collateralId !== '' && (

diff --git a/apps/wallet-mobile/src/features/Settings/PrivacyMode/PrivacyMode.tsx b/apps/wallet-mobile/src/features/Settings/PrivacyMode/PrivacyMode.tsx
@@ -62,8 +62,7 @@ export const usePrivacyMode = () => {
   const writePrivacyMode = useWritePrivacyMode()
 
   return {
-    isPrivacyOff: privacyMode === 'HIDDEN',
-    isPrivacyOn: privacyMode === 'SHOWN',
+    isPrivacyActive: privacyMode === 'HIDDEN',
     privacyMode,
     togglePrivacyMode,
     isTogglePrivacyModeLoading,

diff --git a/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx b/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
@@ -25,7 +25,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
   const styles = useStyles()
   const strings = useStrings()
   const wallet = useSelectedWallet()
-  const {isPrivacyOn} = usePrivacyMode()
+  const {isPrivacyActive} = usePrivacyMode()
 
   return (
     <View style={styles.wrapper}>
@@ -40,7 +40,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
               <Text style={styles.label}>{strings.availableFunds}:</Text>
 
               <Text bold style={styles.value} testID="userSummaryAvailableFundsText">
-                {isPrivacyOn
+                {!isPrivacyActive
                   ? totalAdaSum != null
                     ? formatAdaWithText(asQuantity(totalAdaSum), wallet.primaryToken)
                     : '-'
@@ -58,7 +58,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
               <Text style={styles.label}>{strings.rewardsLabel}:</Text>
 
               <Text bold style={styles.value} testID="userSummaryRewardsText">
-                {isPrivacyOn
+                {!isPrivacyActive
                   ? totalRewards != null
                     ? formatAdaWithText(asQuantity(totalRewards), wallet.primaryToken)
                     : '-'
@@ -88,7 +88,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
               <Text style={styles.label}>{strings.delegatedLabel}:</Text>
 
               <Text bold style={styles.value} testID="userSummaryDelegatedText">
-                {isPrivacyOn
+                {!isPrivacyActive
                   ? totalDelegated != null
                     ? formatAdaWithText(asQuantity(totalDelegated), wallet.primaryToken)
                     : '-'

diff --git a/apps/wallet-mobile/src/legacy/TxHistory/AssetList/AssetList.tsx b/apps/wallet-mobile/src/legacy/TxHistory/AssetList/AssetList.tsx
@@ -65,10 +65,10 @@ type ExplorableAssetItemProps = AmountItemProps & {
 }
 const ExplorableAssetItem = ({wallet, amount, onPress}: ExplorableAssetItemProps) => {
   const styles = useStyles()
-  const {isPrivacyOff} = usePrivacyMode()
+  const {isPrivacyActive} = usePrivacyMode()
   return (
     <TouchableOpacity style={styles.button} onPress={onPress} testID="assetSelectorItem">
-      <AmountItem isPrivacyOff={isPrivacyOff} wallet={wallet} amount={amount} />
+      <AmountItem isPrivacyActive={isPrivacyActive} wallet={wallet} amount={amount} />
     </TouchableOpacity>
   )
 }

diff --git a/apps/wallet-mobile/src/legacy/TxHistory/BalanceBanner.tsx b/apps/wallet-mobile/src/legacy/TxHistory/BalanceBanner.tsx
@@ -42,15 +42,17 @@ export const BalanceBanner = React.forwardRef<ResetErrorRef>((_, ref) => {
 
 type BalanceProps = {amount: Portfolio.Token.Amount; ignorePrivacy?: boolean}
 const Balance = ({amount, ignorePrivacy}: BalanceProps) => {
-  const {isPrivacyOn, privacyPlaceholder} = usePrivacyMode()
+  const {isPrivacyActive, privacyPlaceholder} = usePrivacyMode()
   const styles = useStyles()
 
+  console.log('ignorePrivacy', ignorePrivacy)
+
   const balance = React.useMemo(
     () =>
-      isPrivacyOn || !ignorePrivacy
+      !isPrivacyActive || ignorePrivacy === true
         ? amountFormatter({template: '{{value}} {{ticker}}'})(amount)
         : amountFormatter({template: `${privacyPlaceholder} {{ticker}}`})(amount),
-    [amount, ignorePrivacy, isPrivacyOn, privacyPlaceholder],
+    [amount, ignorePrivacy, isPrivacyActive, privacyPlaceholder],
   )
 
   return (

diff --git a/apps/wallet-mobile/src/legacy/TxHistory/LockedDeposit.tsx b/apps/wallet-mobile/src/legacy/TxHistory/LockedDeposit.tsx
@@ -12,12 +12,12 @@ import globalMessages from '../../kernel/i18n/global-messages'
 
 export const LockedDeposit = ({ignorePrivacy = false}: {ignorePrivacy?: boolean}) => {
   const wallet = useSelectedWallet()
-  const {isPrivacyOn, privacyPlaceholder} = usePrivacyMode()
+  const {isPrivacyActive, privacyPlaceholder} = usePrivacyMode()
   const {lockedAsStorageCost} = usePortfolioPrimaryBreakdown({wallet})
 
   const amount = React.useMemo(
     () =>
-      isPrivacyOn || !ignorePrivacy
+      !isPrivacyActive || !ignorePrivacy
         ? amountFormatter({template: '{{value}} {{ticker}}'})({
             quantity: lockedAsStorageCost,
             info: wallet.portfolioPrimaryTokenInfo,
@@ -26,7 +26,7 @@ export const LockedDeposit = ({ignorePrivacy = false}: {ignorePrivacy?: boolean}
             quantity: 0n,
             info: wallet.portfolioPrimaryTokenInfo,
           }),
-    [ignorePrivacy, isPrivacyOn, lockedAsStorageCost, privacyPlaceholder, wallet.portfolioPrimaryTokenInfo],
+    [ignorePrivacy, isPrivacyActive, lockedAsStorageCost, privacyPlaceholder, wallet.portfolioPrimaryTokenInfo],
   )
 
   return <FormattedAmount amount={amount} />

diff --git a/apps/wallet-mobile/src/legacy/TxHistory/TxDetails/AssetList.tsx b/apps/wallet-mobile/src/legacy/TxHistory/TxDetails/AssetList.tsx
@@ -56,7 +56,7 @@ type AssetRowProps = {
 const AssetRow = ({styles, entry, backColor, onSelect}: AssetRowProps) => {
   const intl = useIntl()
   const wallet = useSelectedWallet()
-  const {isPrivacyOn, privacyPlaceholder} = usePrivacyMode()
+  const {isPrivacyActive, privacyPlaceholder} = usePrivacyMode()
   const tokenInfo = useTokenInfo({wallet, tokenId: entry.identifier})
   const isPrimary = tokenInfo.id === wallet.primaryTokenInfo.id
   const primaryTicker = wallet.primaryTokenInfo.ticker
@@ -75,7 +75,7 @@ const AssetRow = ({styles, entry, backColor, onSelect}: AssetRowProps) => {
 
       <View style={styles.assetBalanceView}>
         <Text style={styles.assetBalance}>
-          {isPrivacyOn ? privacyPlaceholder : formatTokenAmount(asQuantity(entry.amount), tokenInfo)}
+          {isPrivacyActive ? privacyPlaceholder : formatTokenAmount(asQuantity(entry.amount), tokenInfo)}
         </Text>
       </View>
     </>

diff --git a/apps/wallet-mobile/src/legacy/TxHistory/TxDetails/TxDetails.tsx b/apps/wallet-mobile/src/legacy/TxHistory/TxDetails/TxDetails.tsx
@@ -197,10 +197,10 @@ const Label = ({children}: {children: string}) => {
 const AdaAmount = ({amount}: {amount: BigNumber}) => {
   const wallet = useSelectedWallet()
   const {styles} = useStyles()
-  const {isPrivacyOn, privacyPlaceholder} = usePrivacyMode()
+  const {isPrivacyActive, privacyPlaceholder} = usePrivacyMode()
   const amountStyle = amount.gte(0) ? styles.positiveAmount : styles.negativeAmount
 
-  if (isPrivacyOn) {
+  if (isPrivacyActive) {
     return <Text style={amountStyle}>{privacyPlaceholder}</Text>
   }
 

diff --git a/apps/wallet-mobile/src/legacy/TxHistory/TxHistoryList/TxHistoryListItem.tsx b/apps/wallet-mobile/src/legacy/TxHistory/TxHistoryList/TxHistoryListItem.tsx
@@ -115,7 +115,7 @@ const Middle = ({style, ...props}: ViewProps) => (
 const Right = ({style, ...props}: ViewProps) => <View style={[style, {padding: 4}]} {...props} />
 const Amount = ({wallet, transaction}: {wallet: YoroiWallet; transaction: TransactionInfo}) => {
   const {styles} = useStyles()
-  const {isPrivacyOn, privacyPlaceholder} = usePrivacyMode()
+  const {isPrivacyActive, privacyPlaceholder} = usePrivacyMode()
   const amountAsMT = MultiToken.fromArray(transaction.amount)
   const amount: BigNumber = amountAsMT.getDefault()
   const fee = transaction.fee ? transaction.fee[0] : null
@@ -129,10 +129,10 @@ const Amount = ({wallet, transaction}: {wallet: YoroiWallet; transaction: Transa
   return (
     <View style={styles.amount} testID="transactionAmount">
       <Text style={style} secondary={transaction.assurance === 'PENDING'}>
-        <Text>{isPrivacyOn && formatTokenInteger(asQuantity(amount), wallet.primaryToken)}</Text>
+        <Text>{!isPrivacyActive && formatTokenInteger(asQuantity(amount), wallet.primaryToken)}</Text>
 
         <Text small>
-          {isPrivacyOn ? formatTokenFractional(asQuantity(amount), wallet.primaryToken) : privacyPlaceholder}
+          {!isPrivacyActive ? formatTokenFractional(asQuantity(amount), wallet.primaryToken) : privacyPlaceholder}
         </Text>
       </Text>
 

diff --git a/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json b/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 74,
       "column": 22,
-      "index": 2557
+      "index": 2578
     },
     "end": {
       "line": 77,
       "column": 3,
-      "index": 2689
+      "index": 2710
     }
   }
 ]