Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PWN-9344] Fix Crypto screen title and button icons #1495

Merged
merged 2 commits into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
"version" : "2.3.1"
"revision" : "c22f76b709dc4bb6d274398259e75c191e50998a",
"version" : "2.3.0"
}
},
{
Expand Down Expand Up @@ -365,8 +365,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : {
"revision" : "5f542894dd8efbd766d8adf73ef2f947b0cd5e21",
"version" : "2.56.0"
"revision" : "324bc65a28323660fad8a36a7a37f0c2c78eeb9a",
"version" : "2.55.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions p2p_wallet/Common/Models/WalletActionType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ enum WalletActionType {
var icon: UIImage {
switch self {
case .receive:
return .homeReceive
return .actionReceive
case .buy:
return .homeBuy
case .send:
return .homeSend
case .swap:
return .homeSwap
return .actionSwap
case .cashOut:
return .cashOut
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "swap.pdf",
"filename" : "actionReceive.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "receive.pdf",
"filename" : "actionSwap.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion p2p_wallet/Resources/Base.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,6 @@
"%@\nPlease log in with the correct %@ account." = "%@\nPlease log in with the correct %@ account.";
"You've used all 5 codes. Try again later. For help, contact support." = "You've used all 5 codes. Try again later. For help, contact support.";
"Crypto" = "Crypto";
"My Crypto" = "My Crypto";
"Incoming transfer" = "Incoming transfer";
"Welcome to your crypto portfolio. \nExplore over 800 tokens with zero fees." = "Welcome to your crypto portfolio. \nExplore over 800 tokens with zero fees.";
"Add Money" = "Add Money";
Expand All @@ -591,3 +590,4 @@
"1%% fee" = "1%% fee";
"4,5%% fees" = "4,5%% fees";
"withdraw" = "withdraw";
"My crypto" = "My crypto";
2 changes: 1 addition & 1 deletion p2p_wallet/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,6 @@
"%@\nPlease log in with the correct %@ account." = "%@\nPlease log in with the correct %@ account.";
"You've used all 5 codes. Try again later. For help, contact support." = "You've used all 5 codes. Try again later. For help, contact support.";
"Crypto" = "Crypto";
"My Crypto" = "My Crypto";
"Incoming transfer" = "Incoming transfer";
"Welcome to your crypto portfolio. \nExplore over 800 tokens with zero fees." = "Welcome to your crypto portfolio. \nExplore over 800 tokens with zero fees.";
"Add Money" = "Add Money";
Expand All @@ -589,3 +588,4 @@
"1%% fee" = "1%% fee";
"4,5%% fees" = "4,5%% fees";
"withdraw" = "withdraw";
"My crypto" = "My crypto";
2 changes: 1 addition & 1 deletion p2p_wallet/Resources/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,6 @@
"%@\nPlease log in with the correct %@ account." = "%@\nVeuillez vous connecter avec le bon compte %@.";
"You've used all 5 codes. Try again later. For help, contact support." = "Vous avez utilisé les 5 codes. Réessayez plus tard. Pour obtenir de l'aide, contactez l'assistance.";
"Crypto" = "Crypto";
"My Crypto" = "Ma crypto";
"Incoming transfer" = "Transfert entrant";
"Welcome to your crypto portfolio. \nExplore over 800 tokens with zero fees." = "Bienvenue dans votre portefeuille crypto. \nExplorez plus de 800 jetons sans frais.";
"Add Money" = "Ajouter de l'argent";
Expand All @@ -628,3 +627,4 @@
"1%% fee" = "1%% frais";
"4,5%% fees" = "4,5%% frais";
"withdraw" = "retirer";
"My crypto" = "Ma crypto";
2 changes: 1 addition & 1 deletion p2p_wallet/Resources/ru.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,6 @@
"%@\nPlease log in with the correct %@ account." = "%@\nПожалуйста, войдите в систему с правильной учетной записью %@.";
"You've used all 5 codes. Try again later. For help, contact support." = "Вы использовали все 5 кодов. Попробуйте позже. За помощью обращайтесь в службу поддержки.";
"Crypto" = "Крипто";
"My Crypto" = "Моя крипта";
"Incoming transfer" = "Входящий перевод";
"Welcome to your crypto portfolio. \nExplore over 800 tokens with zero fees." = "Добро пожаловать в ваш крипто-портфель. \nИсследуйте более 800 токенов без комиссии.";
"Add Money" = "Добавить деньги";
Expand All @@ -624,3 +623,4 @@
"1%% fee" = "1%% комиссия";
"4,5%% fees" = "4,5%% комиссии";
"withdraw" = "отзывать";
"My crypto" = "Моя крипта";
2 changes: 1 addition & 1 deletion p2p_wallet/Resources/vi.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,6 @@
"%@\nPlease log in with the correct %@ account." = "%@\nVui lòng đăng nhập bằng đúng tài khoản %@.";
"You've used all 5 codes. Try again later. For help, contact support." = "Bạn đã sử dụng tất cả 5 mã. Thử lại sau. Để được giúp đỡ, hãy liên hệ với bộ phận hỗ trợ.";
"Crypto" = "tiền điện tử";
"My Crypto" = "Tiền điện tử của tôi";
"Incoming transfer" = "chuyển đến";
"Welcome to your crypto portfolio. \nExplore over 800 tokens with zero fees." = "Chào mừng bạn đến với danh mục đầu tư tiền điện tử của bạn. \nKhám phá hơn 800 mã thông báo mà không mất phí.";
"Add Money" = "Thêm tiền";
Expand All @@ -632,3 +631,4 @@
"1%% fee" = "phí 1%%";
"4,5%% fees" = "4,5%% phí";
"withdraw" = "rút";
"My crypto" = "tiền điện tử của tôi";
Loading