Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions apps/flipcash/core/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -549,8 +549,8 @@
<string name="title_addMoney">Add Money</string>
<string name="subtitle_addMoney">Add money to your account</string>

<string name="title_scanTipCard">Scan a Tip Card</string>
<string name="subtitle_scanTipCard">Give your first tip</string>
<string name="title_scanTipCard">Scan a Profile Card</string>
<string name="subtitle_scanTipCard">Send your first message</string>


<!-- Copy matches iOS's "Finish Your Profile" display-name step. -->
Expand Down Expand Up @@ -1238,7 +1238,7 @@
<!-- A tapped `flipcash.com/{username}` link that resolves to nothing. -->
<string name="error_title_usernameNotFound">No Such Account</string>
<string name="error_description_usernameNotFound">Nobody has claimed \@%1$s</string>
<string name="error_title_tipCardUnavailable">Couldn\'t Open Tip Card</string>
<string name="error_title_tipCardUnavailable">Couldn\'t Open Profile Card</string>
<string name="error_description_tipCardUnavailable">Please check your connection and try again</string>
<!-- A tapped `flipcash.com/{username}` or `flipcash.com/{uuid}` link whose profile couldn't be fetched. -->
<string name="error_title_profileUnavailable">Couldn\'t Open Profile</string>
Expand All @@ -1257,13 +1257,13 @@
<string name="error_description_coverNotAllowed">This image isn\'t allowed as a cover. Please try a different image. If you think it was rejected in error please DM @flipcash on X</string>
<string name="placeholder_profileDisplayName">Your Name</string>
<string name="subtitle_profileImageRecommended">500x500 Recommended</string>
<string name="title_myTipCard">My Tip Card</string>
<string name="title_myTipCard">My Profile Card</string>
<string name="title_shareProfile">Chat with %1$s on Flipcash</string>
<string name="subtitle_myTipCard">Share Your Tip Card to Get Tipped</string>
<string name="action_showTipCard">Show My Tip Card</string>
<string name="subtitle_myTipCard">Share Your Profile Card to Get Tipped</string>
<string name="action_showTipCard">Show My Profile Card</string>
<string name="action_sendToStartChatting">Send %1$s to Start Chatting</string>
<string name="action_swipeToTip">Swipe to Tip</string>
<string name="label_viaTipCard">via Tip Card</string>
<string name="label_viaTipCard">via Profile Card</string>

<!-- Minimum-to-chat entry (nodes 9541:10951, 9553:113170, 10074:18892). Backed by the
profile's min_dm_chat_init_fee: paying is what opens a DM, so this is the price of
Expand Down Expand Up @@ -1343,7 +1343,7 @@
<string name="action_showProfileCard">Show Profile Card</string>
<string name="action_copyLink">Copy Link</string>
<string name="action_download">Download</string>
<string name="title_clipboardLabelTipCardLink">Tip Card Link</string>
<string name="title_clipboardLabelTipCardLink">Profile Card Link</string>
<string name="title_clipboardLabelGroupInviteLink">Group Invite Link</string>
<string name="title_downloadTipCardAs">Download As</string>
<string name="label_exportPng">PNG</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ internal class WalletViewModel @Inject constructor(
// `isTipMilestoneResolved` rather than by withholding the emission: the other
// milestone and the action tiles are answerable from local state immediately, and
// holding them back put the chat backfill on the critical path for the whole tab.
// "Scan a Tip Card" is still never drawn as outstanding to someone who already did it
// "Scan a Profile Card" is still never drawn as outstanding to someone who already did it
// — [State.isNewUserTutorialComplete] reads complete until this resolves.
Event.OnOnboardingItemsUpdated(
items = listOf(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fun ScannableRenderer(
// bottom modal; ignored by bill types that always center.
contentAlignment: Alignment = Alignment.Center,
// Explicit tip-card width. Null lets the card size itself off the available canvas (the
// scanner/camera); the "My Tip Card" screen pins a fixed, device-independent width. Ignored by
// scanner/camera); the "My Profile Card" screen pins a fixed, device-independent width. Ignored by
// non-tip-card scannables.
tipCardWidth: Dp? = null,
) {
Expand Down
4 changes: 2 additions & 2 deletions maestro/tipping_setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ tags:

# The display name is captured during onboarding, so tip setup lands directly on the
# Tips list — no name step here. Open the tip card from the list.
- tapOn: "Show My Tip Card"
- tapOn: "Show My Profile Card"

# The tip card renders with the display name set during onboarding.
- extendedWaitUntil: { visible: { id: tip_card_screen }, timeout: 8000 }
- assertVisible: "My Tip Card"
- assertVisible: "My Profile Card"
- assertVisible: "Tip Test User"
18 changes: 9 additions & 9 deletions ui/resources/src/main/res/values/strings-localized.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<string name="action_shareAsURL">Share as a URL</string>
<string name="action_shareDownloadLink">Share Download Link</string>
<string name="action_shareVideo">Share This Video</string>
<string name="action_showMyTipCard">Show My Tip Card</string>
<string name="action_showMyTipCard">Show My Profile Card</string>
<string name="action_startCamera">Start Camera</string>
<string name="action_subscribe">Subscribe</string>
<string name="action_swipeToLogin">Swipe to Login</string>
Expand Down Expand Up @@ -110,7 +110,7 @@
<string name="error_description_insuffiecientKin">To learn how to get more Kin go to the FAQ in Settings.</string>
<string name="error_description_invalidInviteCode">Please enter a different Invite Code and try again.</string>
<string name="error_description_invalidInvitePhone">Please enter a valid phone number and try again.</string>
<string name="error_description_invalidTipCard">This is an invalid Tip Card.</string>
<string name="error_description_invalidTipCard">This is an invalid Profile Card.</string>
<string name="error_description_invalidVerificationCode">Please enter a valid code and try again.</string>
<string name="error_description_invitationFailed">Sorry, we experienced a network issue. Please try inviting your friend again.</string>
<string name="error_description_linkExpired">This Kin was automatically returned to the sender because it wasn\'t collected within 24 hours. Please ask them to send the Kin again.</string>
Expand All @@ -122,7 +122,7 @@
<string name="error_description_purchaseTooLarge">The maximum you can purchase is %1$s. Please enter a smaller amount.</string>
<string name="error_description_purchaseTooSmall">The minimum you can purchase is %1$s. Please enter a larger amount.</string>
<string name="error_description_timelockUnlocked">Your Access Key has initiated an unlock. As a result, you will no longer be able to use this Access Key in Code.</string>
<string name="error_description_tipCardNotActivated">Send a tweet to this person to activate their Tip Card.</string>
<string name="error_description_tipCardNotActivated">Send a tweet to this person to activate their Profile Card.</string>
<string name="error_description_tipTooLarge">The maximum you can tip is %1$s. Please enter a smaller amount.</string>
<string name="error_description_tipTooSmall">The minimum you can tip is %1$s. Please enter a larger amount.</string>
<string name="error_description_tooManyAccounts">You can only create so many new accounts each day.</string>
Expand All @@ -148,7 +148,7 @@
<string name="error_title_insuffiecientKin">Insufficient Kin</string>
<string name="error_title_invalidInviteCode">Invite Code Invalid or Expired</string>
<string name="error_title_invalidInvitePhone">Invalid Phone Number</string>
<string name="error_title_invalidTipCard">Invalid Tip Card</string>
<string name="error_title_invalidTipCard">Invalid Profile Card</string>
<string name="error_title_invalidVerificationCode">Invalid Code</string>
<string name="error_title_invitationFailed">Invitation Failed</string>
<string name="error_title_linkExpired">Link Expired</string>
Expand All @@ -160,7 +160,7 @@
<string name="error_title_purchaseTooLarge">Purchase Too Large</string>
<string name="error_title_purchaseTooSmall">Purchase Too Small</string>
<string name="error_title_timelockUnlocked">Access Key No Longer Usable in Code</string>
<string name="error_title_tipCardNotActivated">Tip Card Not Activated Yet</string>
<string name="error_title_tipCardNotActivated">Profile Card Not Activated Yet</string>
<string name="error_title_tipTooLarge">Tip Too Large</string>
<string name="error_title_tipTooSmall">Tip Too Small</string>
<string name="error_title_tooManyAccounts">Too many accounts created</string>
Expand Down Expand Up @@ -295,9 +295,9 @@
<string name="subtitle_someoneSendYouCash">Someone sent you cash</string>
<string name="subtitle_someoneTippedYou">Someone tipped you</string>
<string name="subtitle_startCameraToScan">You need to start your camera to scan Codes</string>
<string name="subtitle_tipCardForX">Your Tip Card lets you to receive tips from Code users all over the world. To access your Tip Card connect your X identity.</string>
<string name="subtitle_tipCardTwitterDescription">Your Tip Card lets you receive tips from Code users all over the world. To access your Tip Card post to X.</string>
<string name="subtitle_tipCardXDescription">Your Tip Card lets you receive tips from Code users all over the world. To access your Tip Card message @getcode on X.</string>
<string name="subtitle_tipCardForX">Your Profile Card lets you to receive tips from Code users all over the world. To access your Profile Card connect your X identity.</string>
<string name="subtitle_tipCardTwitterDescription">Your Profile Card lets you receive tips from Code users all over the world. To access your Profile Card post to X.</string>
<string name="subtitle_tipCardXDescription">Your Profile Card lets you receive tips from Code users all over the world. To access your Profile Card message @getcode on X.</string>
<string name="subtitle_turnOnNotifications">Allow Code to send you notifications when you receive Tips from other Code users.</string>
<string name="subtitle_typeDelete">Type \"%1$s\"</string>
<string name="subtitle_updateRequiredDescription">We\'ve made some changes to improve the experience. You\'ll need to update the app to keep using Code.</string>
Expand Down Expand Up @@ -382,7 +382,7 @@
<string name="title_spentKin">Spent</string>
<string name="title_switchAccounts">Switch Accounts</string>
<string name="title_termsOfService">Terms of Service</string>
<string name="title_tipCard">Tip Card</string>
<string name="title_tipCard">Profile Card</string>
<string name="title_tipKin">Tip Kin</string>
<string name="title_turnOnNotifications">Turn On Notifications for Code</string>
<string name="title_unknown">Unknown</string>
Expand Down
Loading