Skip to content

Commit 3127634

Browse files
authored
Merge pull request #5897 from EdgeApp/jon/gift-card-pending-ui
Improve pending gift card UI
2 parents 4222161 + 587f70b commit 3127634

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

src/components/cards/GiftCardDisplayCard.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export const GiftCardDisplayCard: React.FC<Props> = props => {
138138

139139
{status === 'pending' ? (
140140
<EdgeText style={styles.pendingText}>
141-
{lstrings.fragment_wallet_unconfirmed}
141+
{lstrings.gift_card_pending}
142142
</EdgeText>
143143
) : status === 'available' && redemptionUrl != null ? (
144144
<EdgeTouchableOpacity
@@ -244,7 +244,6 @@ const getStyles = cacheStyles((theme: Theme) => ({
244244
...theme.embossedTextShadow
245245
},
246246
pendingText: {
247-
color: theme.deactivatedText,
248247
fontSize: theme.rem(0.875),
249248
fontFamily: theme.fontFaceMedium,
250249
...theme.embossedTextShadow

src/components/scenes/GiftCardPurchaseScene.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import {
5151
} from '../modals/WalletListModal'
5252
import { showHtmlModal } from '../modals/WebViewModal'
5353
import { ShimmerCard } from '../progress-indicators/ShimmerCard'
54-
import { Airship, showError } from '../services/AirshipInstance'
54+
import { Airship, showError, showToast } from '../services/AirshipInstance'
5555
import { cacheStyles, type Theme, useTheme } from '../services/ThemeContext'
5656
import { EdgeText, Paragraph } from '../themed/EdgeText'
5757
import { FilledTextInput } from '../themed/FilledTextInput'
@@ -481,6 +481,9 @@ export const GiftCardPurchaseScene: React.FC<Props> = props => {
481481
fiatCurrency: brand.currency
482482
})
483483

484+
// Show toast
485+
showToast(lstrings.gift_card_pending_toast)
486+
484487
// Navigate to gift card list to see the pending order
485488
navigation.navigate('giftCardList')
486489
}

src/locales/en_US.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,6 +1909,9 @@ const strings = {
19091909
gift_card_redeemed_cards: 'Redeemed Cards',
19101910
gift_card_unmark_as_redeemed: 'Unmark as Redeemed',
19111911
gift_card_active_cards: 'Active Cards',
1912+
gift_card_pending: 'Pending Delivery, Please Wait...',
1913+
gift_card_pending_toast:
1914+
'Your gift card is being delivered. Please wait for a few minutes for it to arrive.',
19121915

19131916
// #endregion
19141917

src/locales/strings/enUS.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,6 +1481,8 @@
14811481
"gift_card_redeemed_cards": "Redeemed Cards",
14821482
"gift_card_unmark_as_redeemed": "Unmark as Redeemed",
14831483
"gift_card_active_cards": "Active Cards",
1484+
"gift_card_pending": "Pending Delivery, Please Wait...",
1485+
"gift_card_pending_toast": "Your gift card is being delivered. Please wait for a few minutes for it to arrive.",
14841486
"backup_account": "Back Up Account",
14851487
"backup_delete_confirm_message": "Are you sure you want to delete this account without backing up first? You will NOT be able to recover wallets and transactions for this account!",
14861488
"backup_info_message": "Create a username and password to create a full account and secure your funds. No personal information is required",

0 commit comments

Comments
 (0)