Merge branch 'develop' into feat/add-disclaimer-to-access-key-image

bmc08gt · web-flow · commit 0565921bd344 · 2024-07-19T16:50:33.000-04:00
diff --git a/app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt b/app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt
@@ -232,6 +232,7 @@ private fun Items(items: List<GetKinItem>) {
 private fun GetKinItemRow(modifier: Modifier = Modifier, item: GetKinItem) {
     Row(
         modifier = modifier
+            .fillMaxWidth()
             .addIf(
                 item.isStrikeThrough.not(),
             ) {
@@ -280,8 +281,6 @@ private fun GetKinItemRow(modifier: Modifier = Modifier, item: GetKinItem) {
                     .size(CodeTheme.dimens.grid.x3)
                     .align(Alignment.CenterVertically),
             )
-        } else {
-            Spacer(modifier = Modifier.weight(1f))
         }
     }
 }
diff --git a/app/src/main/res/values-en-rGB/strings-localized.xml b/app/src/main/res/values-en-rGB/strings-localized.xml
@@ -4,8 +4,8 @@
   <string name="action_allowContacts">Allow Access to Contacts</string>
   <string name="action_allowPushNotifications">Allow Push Notifications</string>
   <string name="action_balance">Balance</string>
-  <string name="action_buyKin">Buy Kin</string>
-  <string name="action_buyMoreKin">Buy More Kin</string>
+  <string name="action_buyKin">Add Cash with a Debit Card</string>
+  <string name="action_buyMoreKin">Add Cash with a Debit Card</string>
   <string name="action_cancel">Cancel</string>
   <string name="action_cancelSend">Cancel Send</string>
   <string name="action_collectCash">Collect This Cash</string>
@@ -23,7 +23,7 @@
   <string name="action_enableFaceID">Enable Face ID</string>
   <string name="action_enableTouchID">Enable Touch ID</string>
   <string name="action_exit">Exit</string>
-  <string name="action_giveKin">Give Kin</string>
+  <string name="action_giveKin">Give Cash</string>
   <string name="action_invite">Invite</string>
   <string name="action_invites">Invites</string>
   <string name="action_joinWaitlist">Join the Waitlist</string>
@@ -68,10 +68,10 @@
   <string name="action_unsubscribe">Unsubscribe</string>
   <string name="action_update">Update</string>
   <string name="action_viewAccessKey">View Access Key</string>
-  <string name="action_withdrawKin">Withdraw Kin</string>
+  <string name="action_withdrawKin">Withdraw Cash</string>
   <string name="action_wroteThemDownInstead">Wrote the 12 Words Down Instead?</string>
   <string name="action_yes">Yes</string>
-  <string name="action_yesWithdrawConfirm">Yes, Withdraw Kin</string>
+  <string name="action_yesWithdrawConfirm">Yes, Withdraw Cash</string>
   <string name="action_yesWroteThemDown">Yes, I Wrote Them Down</string>
   <string name="core_and">and</string>
   <string name="core_kin">Kin</string>
@@ -322,9 +322,9 @@
   <string name="title_faq">FAQ</string>
   <string name="title_gaveKin">Gave</string>
   <string name="title_getFriendStartedOnCode">Get a Friend Started on Code</string>
-  <string name="title_getKin">Get Kin</string>
-  <string name="title_getMoreKin">Get more Kin</string>
-  <string name="title_giveKin">Give Kin</string>
+  <string name="title_getKin">Get Cash</string>
+  <string name="title_getMoreKin">Get more cash</string>
+  <string name="title_giveKin">Give Cash</string>
   <string name="title_insufficientFunds">Insufficient funds</string>
   <string name="title_inviteFriend">Invite a Friend</string>
   <string name="title_limitedTimeOffer">Limited Time Offer</string>
@@ -343,7 +343,7 @@
   <string name="title_recentCurrencies">Recent Currencies</string>
   <string name="title_referFriend">Refer a Friend and Get $5</string>
   <string name="title_referralBonus">Referral Bonus</string>
-  <string name="title_requestKin">Request Kin</string>
+  <string name="title_requestKin">Request Cash</string>
   <string name="title_requestTip">Request a Tip</string>
   <string name="title_requireFaceID">Require Face ID</string>
   <string name="title_requirePasscode">Require Passcode</string>
@@ -357,12 +357,12 @@
   <string name="title_spentKin">Spent</string>
   <string name="title_switchAccounts">Switch Accounts</string>
   <string name="title_termsOfService">Terms of Service</string>
-  <string name="title_tipKin">Tip Kin</string>
+  <string name="title_tipKin">Tip Cash</string>
   <string name="title_unknown">Unknown</string>
   <string name="title_updateRequired">Update Required</string>
   <string name="title_verifyPhoneNumber">Verify Phone Number</string>
   <string name="title_welcomeBonus">Welcome Bonus</string>
-  <string name="title_withdrawKin">Withdraw Kin</string>
+  <string name="title_withdrawKin">Withdraw Cash</string>
   <string name="title_withdrewKin">Withdrew</string>
   <string name="title_yourAccessKey">Your Access Key</string>
   <string name="tooltip_tapLogo">Tap the logo to share the app download link</string>
diff --git a/app/src/main/res/values/strings-localized.xml b/app/src/main/res/values/strings-localized.xml
@@ -4,8 +4,8 @@
   <string name="action_allowContacts">Allow Access to Contacts</string>
   <string name="action_allowPushNotifications">Allow Push Notifications</string>
   <string name="action_balance">Balance</string>
-  <string name="action_buyKin">Buy Kin</string>
-  <string name="action_buyMoreKin">Buy More Kin</string>
+  <string name="action_buyKin">Add Cash with a Debit Card</string>
+  <string name="action_buyMoreKin">Add Cash with a Debit Card</string>
   <string name="action_cancel">Cancel</string>
   <string name="action_cancelSend">Cancel Send</string>
   <string name="action_collectCash">Collect This Cash</string>
@@ -23,7 +23,7 @@
   <string name="action_enableFaceID">Enable Face ID</string>
   <string name="action_enableTouchID">Enable Touch ID</string>
   <string name="action_exit">Exit</string>
-  <string name="action_giveKin">Give Kin</string>
+  <string name="action_giveKin">Give Cash</string>
   <string name="action_invite">Invite</string>
   <string name="action_invites">Invites</string>
   <string name="action_joinWaitlist">Join the Waitlist</string>
@@ -68,10 +68,10 @@
   <string name="action_unsubscribe">Unsubscribe</string>
   <string name="action_update">Update</string>
   <string name="action_viewAccessKey">View Access Key</string>
-  <string name="action_withdrawKin">Withdraw Kin</string>
+  <string name="action_withdrawKin">Withdraw Cash</string>
   <string name="action_wroteThemDownInstead">Wrote the 12 Words Down Instead?</string>
   <string name="action_yes">Yes</string>
-  <string name="action_yesWithdrawConfirm">Yes, Withdraw Kin</string>
+  <string name="action_yesWithdrawConfirm">Yes, Withdraw Cash</string>
   <string name="action_yesWroteThemDown">Yes, I Wrote Them Down</string>
   <string name="core_and">and</string>
   <string name="core_kin">Kin</string>
@@ -203,7 +203,7 @@
   <string name="push_subtitle_referralBonus">You received %1$s of Kin for sending someone their first Kin.</string>
   <string name="push_subtitle_twitterAccountConnected">You can now request tips.</string>
   <string name="push_title_depositReceived">Deposit Received</string>
-  <string name="push_title_kinReturned">Kin Returned</string>
+  <string name="push_title_kinReturned">Cash Returned</string>
   <string name="push_title_newOnCode">New on Code</string>
   <string name="push_title_referralBonus">Referral Bonus Received</string>
   <string name="push_title_twitterAccountConnected">X Account Connected</string>
@@ -214,7 +214,7 @@
   <string name="subtitle_allowCameraAccess">Code enables you to receive Kin by pointing your camera at the digital bill on another user\'s phone</string>
   <string name="subtitle_allowCameraSettings">You need to turn on Camera in Settings to scan Codes</string>
   <string name="subtitle_authenticateToAccess">Authenticate to access Code.</string>
-  <string name="subtitle_buyKin">Buy Kin</string>
+  <string name="subtitle_buyKin">Add Cash with a Debit Card</string>
   <string name="subtitle_buyKinComingSoon">Buy Kin (Coming Soon)</string>
   <string name="subtitle_buySellDescription">Buying and selling Kin is currently a complex process. These processes will get simpler over time. If you want to learn how to buy and sell Kin today you can watch the walk through videos below.</string>
   <string name="subtitle_canOnlyGiveUpTo">You can only give up to %1$s</string>
@@ -322,9 +322,9 @@
   <string name="title_faq">FAQ</string>
   <string name="title_gaveKin">Gave</string>
   <string name="title_getFriendStartedOnCode">Get a Friend Started on Code</string>
-  <string name="title_getKin">Get Kin</string>
-  <string name="title_getMoreKin">Get More Kin</string>
-  <string name="title_giveKin">Give Kin</string>
+  <string name="title_getKin">Get Cash</string>
+  <string name="title_getMoreKin">Get More Cash</string>
+  <string name="title_giveKin">Give Cash</string>
   <string name="title_insufficientFunds">Insufficient Funds</string>
   <string name="title_inviteFriend">Invite a Friend</string>
   <string name="title_limitedTimeOffer">Limited Time Offer</string>
@@ -343,7 +343,7 @@
   <string name="title_recentCurrencies">Recent Currencies</string>
   <string name="title_referFriend">Refer a Friend, Get $5</string>
   <string name="title_referralBonus">Referral Bonus</string>
-  <string name="title_requestKin">Request Kin</string>
+  <string name="title_requestKin">Request Cash</string>
   <string name="title_requestTip">Request a Tip</string>
   <string name="title_requireFaceID">Require Face ID</string>
   <string name="title_requirePasscode">Require Passcode</string>
@@ -357,12 +357,12 @@
   <string name="title_spentKin">Spent</string>
   <string name="title_switchAccounts">Switch Accounts</string>
   <string name="title_termsOfService">Terms of Service</string>
-  <string name="title_tipKin">Tip Kin</string>
+  <string name="title_tipKin">Tip Cash</string>
   <string name="title_unknown">Unknown</string>
   <string name="title_updateRequired">Update Required</string>
   <string name="title_verifyPhoneNumber">Verify Phone Number</string>
   <string name="title_welcomeBonus">Welcome Bonus</string>
-  <string name="title_withdrawKin">Withdraw Kin</string>
+  <string name="title_withdrawKin">Withdraw Cash</string>
   <string name="title_withdrewKin">Withdrew</string>
   <string name="title_yourAccessKey">Your Access Key</string>
   <string name="tooltip_tapLogo">Tap the logo to share the app download link</string>

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ private fun Items(items: List<GetKinItem>) {`
`232`	`232`	`private fun GetKinItemRow(modifier: Modifier = Modifier, item: GetKinItem) {`
`233`	`233`	`Row(`
`234`	`234`	`modifier = modifier`
	`235`	`+ .fillMaxWidth()`
`235`	`236`	`.addIf(`
`236`	`237`	`item.isStrikeThrough.not(),`
`237`	`238`	`) {`
`@@ -280,8 +281,6 @@ private fun GetKinItemRow(modifier: Modifier = Modifier, item: GetKinItem) {`
`280`	`281`	`.size(CodeTheme.dimens.grid.x3)`
`281`	`282`	`.align(Alignment.CenterVertically),`
`282`	`283`	`)`
`283`		`- } else {`
`284`		`- Spacer(modifier = Modifier.weight(1f))`
`285`	`284`	`}`
`286`	`285`	`}`
`287`	`286`	`}`