Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Fix #7219, Fix #7221: Adjust copy Rewards settings & Rewards internals #7342

Merged
merged 1 commit into from
Apr 27, 2023
Merged

Fix #7219, Fix #7221: Adjust copy Rewards settings & Rewards internals #7342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Sources/Brave/Frontend/Settings/BraveRewardsSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ class BraveRewardsSettingsViewController: TableViewController {
self.rewards.isEnabled = isOn
}),
cellClass: MultilineSubtitleCell.self)
],
footer: .title(Strings.Rewards.settingsFooterMessage)
]
)
]

Expand Down
6 changes: 3 additions & 3 deletions Sources/Brave/Frontend/Settings/Rewards Internals/RewardsInternalsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ struct RewardsInternalsBasicInfoGenerator: RewardsInternalsFileGenerator {
}

let data: [String: Any] = [
"Wallet Info": [
"Rewards Profile Info": [
"Key Info Seed": "\(info.isKeyInfoSeedValid ? "Valid" : "Invalid")",
"Wallet Payment ID": info.paymentId,
"Wallet Creation Date": builder.dateFormatter.string(from: Date(timeIntervalSince1970: TimeInterval(info.bootStamp))),
"Rewards Payment ID": info.paymentId,
"Rewards Profile Creation Date": builder.dateFormatter.string(from: Date(timeIntervalSince1970: TimeInterval(info.bootStamp))),
],
"Device Info": [
"DeviceCheck Status": DCDevice.current.isSupported ? "Supported" : "Not supported",
Expand Down
14 changes: 5 additions & 9 deletions Sources/BraveStrings/BraveStrings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3623,14 +3623,14 @@ extension Strings {
extension Strings {
public struct RewardsInternals {
public static let title = NSLocalizedString("RewardsInternalsTitle", tableName: "BraveShared", bundle: .module, value: "Rewards Internals", comment: "'Rewards' as in 'Brave Rewards'")
public static let walletInfoHeader = NSLocalizedString("RewardsInternalsWalletInfoHeader", tableName: "BraveShared", bundle: .module, value: "Wallet Info", comment: "")
public static let walletInfoHeader = NSLocalizedString("RewardsInternalsWalletInfoHeader", tableName: "BraveShared", bundle: .module, value: "Rewards Profile Info", comment: "")
public static let legacyWalletInfoHeader = NSLocalizedString("RewardsInternalsLegacyWalletInfoHeader", tableName: "BraveShared", bundle: .module, value: "Legacy Wallet Info", comment: "")
public static let legacyWalletHasTransferrableBalance = NSLocalizedString("RewardsInternalsLegacyWalletHasTransferrableBalance", tableName: "BraveShared", bundle: .module, value: "Has Transferrable Balance", comment: "")
public static let keyInfoSeed = NSLocalizedString("RewardsInternalsKeyInfoSeed", tableName: "BraveShared", bundle: .module, value: "Key Info Seed", comment: "")
public static let valid = NSLocalizedString("RewardsInternalsValid", tableName: "BraveShared", bundle: .module, value: "Valid", comment: "")
public static let invalid = NSLocalizedString("RewardsInternalsInvalid", tableName: "BraveShared", bundle: .module, value: "Invalid", comment: "")
public static let walletPaymentID = NSLocalizedString("RewardsInternalsWalletPaymentID", tableName: "BraveShared", bundle: .module, value: "Wallet Payment ID", comment: "")
public static let walletCreationDate = NSLocalizedString("RewardsInternalsWalletCreationDate", tableName: "BraveShared", bundle: .module, value: "Wallet Creation Date", comment: "")
public static let walletPaymentID = NSLocalizedString("RewardsInternalsWalletPaymentID", tableName: "BraveShared", bundle: .module, value: "Rewards Payment ID", comment: "")
public static let walletCreationDate = NSLocalizedString("RewardsInternalsWalletCreationDate", tableName: "BraveShared", bundle: .module, value: "Rewards Profile Creation Date", comment: "")
public static let deviceInfoHeader = NSLocalizedString("RewardsInternalsDeviceInfoHeader", tableName: "BraveShared", bundle: .module, value: "Device Info", comment: "")
public static let status = NSLocalizedString("RewardsInternalsStatus", tableName: "BraveShared", bundle: .module, value: "Status", comment: "")
public static let supported = NSLocalizedString("RewardsInternalsSupported", tableName: "BraveShared", bundle: .module, value: "Supported", comment: "")
Expand Down Expand Up @@ -3688,14 +3688,14 @@ extension Strings {
public static let shareInternalsTitle = NSLocalizedString("RewardsInternalsShareInternalsTitle", tableName: "BraveShared", bundle: .module, value: "Share Rewards Internals", comment: "'Rewards' as in 'Brave Rewards'")
public static let share = NSLocalizedString("RewardsInternalsShare", tableName: "BraveShared", bundle: .module, value: "Share", comment: "")
public static let sharableBasicTitle = NSLocalizedString("RewardsInternalsSharableBasicTitle", tableName: "BraveShared", bundle: .module, value: "Basic Info", comment: "")
public static let sharableBasicDescription = NSLocalizedString("RewardsInternalsSharableBasicDescription", tableName: "BraveShared", bundle: .module, value: "Wallet, device & balance info (always shared)", comment: "")
public static let sharableBasicDescription = NSLocalizedString("RewardsInternalsSharableBasicDescription", tableName: "BraveShared", bundle: .module, value: "Rewards profile, device & balance info (always shared)", comment: "")
public static let sharableLogsDescription = NSLocalizedString("RewardsInternalsSharableLogsDescription", tableName: "BraveShared", bundle: .module, value: "Rewards specific logging", comment: "")
public static let sharablePromotionsDescription = NSLocalizedString("RewardsInternalsSharablePromotionsDescription", tableName: "BraveShared", bundle: .module, value: "Any BAT promotions you have claimed or have pending from Ads or Grants", comment: "")
public static let sharableContributionsDescription = NSLocalizedString("RewardsInternalsSharableContributionsDescription", tableName: "BraveShared", bundle: .module, value: "Any contributions made to publishers through tipping or auto-contribute", comment: "")
public static let sharableDatabaseTitle = NSLocalizedString("RewardsInternalsSharableDatabaseTitle", tableName: "BraveShared", bundle: .module, value: "Rewards Database", comment: "")
public static let sharableDatabaseDescription = NSLocalizedString("RewardsInternalsSharableDatabaseDescription", tableName: "BraveShared", bundle: .module, value: "The internal data store", comment: "")
public static let sharingWarningTitle = NSLocalizedString("RewardsInternalsSharingWarningTitle", tableName: "BraveShared", bundle: .module, value: "Warning", comment: "")
public static let sharingWarningMessage = NSLocalizedString("RewardsInternalsSharingWarningMessage", tableName: "BraveShared", bundle: .module, value: "Data on this page may be sensitive. Treat them as you would your wallet private keys. Be careful who you share them with.", comment: "")
public static let sharingWarningMessage = NSLocalizedString("RewardsInternalsSharingWarningMessage", tableName: "BraveShared", bundle: .module, value: "Data on these pages may be sensitive. Be careful who you share them with.", comment: "")
}
}

Expand Down Expand Up @@ -3738,10 +3738,6 @@ extension Strings {
value: "Support content creators and publishers automatically by enabling Brave Private Ads. Brave Private Ads are privacy-respecting ads that give back to content creators.",
comment: ""
)
public static let settingsFooterMessage = NSLocalizedString("rewards.settingsFooterMessage", tableName: "BraveShared", bundle: .module,
value: "Brave Rewards payouts are temporarily unavailable on this device. Transfer your existing wallet funds to a desktop wallet to keep your tokens.",
comment: ""
)
public static let onProviderText = NSLocalizedString("OnProviderText", tableName: "BraveShared", bundle: .module, value: "on %@", comment: "This is a suffix statement. example: SomeChannel on Twitter")
public static let transferNoLongerAvailableWarningMessage = NSLocalizedString("rewards.transferNoLongerAvailableWarningMessage", tableName: "BraveShared", bundle: .module,
value: "Please use the wallet transfer by March 13, 2021. Wallet transfer will no longer be available after March 13.",
Expand Down