Skip to content

Commit

Permalink
chore: cherry-pick #9946 (#9959)
Browse files Browse the repository at this point in the history
This PR cherry-picks #9946

Co-authored-by: Wietze Bronkema <11412480+wtzb@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
  • Loading branch information
3 people authored Jun 12, 2024
1 parent c3292f5 commit b1de3ab
Show file tree
Hide file tree
Showing 27 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ contact_links:
url: https://community.metamask.io/c/feature-requests-ideas/
about: Request new features and vote on the ones that are important to you
- name: Get support or ask a question
url: https://metamask.zendesk.com/hc/en-us
url: https://support.metamask.io
about: Use the MetaMask support system to get help and ask questions
2 changes: 1 addition & 1 deletion app/components/UI/ProtectYourWalletModal/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class ProtectYourWalletModal extends PureComponent {
this.props.navigation.navigate('Webview', {
screen: 'SimpleWebview',
params: {
url: 'https://metamask.zendesk.com/hc/en-us/articles/360015489591-Basic-Safety-Tips',
url: 'https://support.metamask.io/privacy-and-security/basic-safety-and-security-tips-for-metamask/',
title: strings('protect_wallet_modal.title'),
},
});
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/Ramp/components/RegionAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ interface Props {
}

const SUPPORT_URL =
'https://metamask.zendesk.com/hc/en-us/articles/4863623238683-My-country-region-isn-t-supported-for-MetaMask-on-ramps';
'https://support.metamask.io/metamask-portfolio/buy/my-country-region-isnt-supported-for-buying-crypto/';

const RegionAlert: React.FC<Props> = ({
isVisible,
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/AccountBackupStep1B/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ const AccountBackupStep1B = (props) => {
props.navigation.navigate('Webview', {
screen: 'SimpleWebview',
params: {
url: 'https://metamask.zendesk.com/hc/en-us/articles/360015489591-Basic-Safety-Tips',
url: 'https://support.metamask.io/privacy-and-security/basic-safety-and-security-tips-for-metamask/',
title: strings('drawer.metamask_support'),
},
});
Expand Down
4 changes: 2 additions & 2 deletions app/components/Views/ChoosePassword/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,8 @@ class ChoosePassword extends PureComponent {
this.props.navigation.push('Webview', {
screen: 'SimpleWebview',
params: {
url: 'https://metamask.zendesk.com/hc/en-us/articles/360039616872-How-can-I-reset-my-password-',
title: 'metamask.zendesk.com',
url: 'https://support.metamask.io/managing-my-wallet/resetting-deleting-and-restoring/how-can-i-reset-my-password/',
title: 'support.metamask.io',
},
});
};
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/ErrorBoundary/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class ErrorBoundary extends Component {
};

openTicket = () => {
const url = 'https://metamask.zendesk.com/hc/en-us';
const url = 'https://support.metamask.io';
Linking.openURL(url);
};

Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/ImportPrivateKey/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const ImportPrivateKey = () => {
navigation.navigate('Webview', {
screen: 'SimpleWebview',
params: {
url: 'https://metamask.zendesk.com/hc/en-us/articles/360015289932-What-are-imported-accounts-',
url: 'https://support.metamask.io/managing-my-wallet/accounts-and-addresses/what-are-imported-accounts-/',
title: strings('drawer.metamask_support'),
},
});
Expand Down
4 changes: 2 additions & 2 deletions app/components/Views/ResetPassword/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ class ResetPassword extends PureComponent {
this.props.navigation.push('Webview', {
screen: 'SimpleWebview',
params: {
url: 'https://metamask.zendesk.com/hc/en-us/articles/360039616872-How-can-I-reset-my-password-',
title: 'metamask.zendesk.com',
url: 'https://support.metamask.io/managing-my-wallet/resetting-deleting-and-restoring/how-can-i-reset-my-password/',
title: 'support.metamask.io',
},
});
};
Expand Down
4 changes: 2 additions & 2 deletions app/components/Views/Settings/AppInformation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export default class AppInformation extends PureComponent {
};

onSupportCenter = () => {
const url = 'https://metamask.zendesk.com/hc/en-us';
const url = 'https://support.metamask.io';
this.goTo(url, strings('drawer.metamask_support'));
};

Expand All @@ -166,7 +166,7 @@ export default class AppInformation extends PureComponent {
};

onContactUs = () => {
const url = 'https://metamask.zendesk.com/hc/en-us';
const url = 'https://support.metamask.io';
this.goTo(url, strings('drawer.metamask_support'));
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ class SignatureRequest extends PureComponent {
this.props.navigation.navigate('Webview', {
screen: 'SimpleWebview',
params: {
url: 'https://metamask.zendesk.com/hc/en-us/articles/360015488751',
title: 'metamask.zendesk.com',
url: 'https://support.metamask.io',
title: 'support.metamask.io',
},
});
};
Expand Down
18 changes: 9 additions & 9 deletions app/constants/urls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ import AppConstants from '../core/AppConstants';

// Support
export const SRP_GUIDE_URL =
'https://metamask.zendesk.com/hc/en-us/articles/4404722782107-User-guide-Secret-Recovery-Phrase-password-and-private-keys';
'https://support.metamask.io/getting-started/user-guide-secret-recovery-phrase-password-and-private-keys/';
export const NON_CUSTODIAL_WALLET_URL =
'https://metamask.zendesk.com/hc/en-us/articles/360059952212-MetaMask-is-a-non-custodial-wallet';
'https://support.metamask.io/getting-started/metamask-is-a-self-custodial-wallet/';
export const KEEP_SRP_SAFE_URL =
'https://metamask.zendesk.com/hc/en-us/articles/4407169552667-Scammers-and-Phishers-Rugpulls-and-airdrop-scams';
'https://support.metamask.io/privacy-and-security/staying-safe-in-web3/scammers-and-phishers-rugpulls-and-airdrop-scams/';
export const LEARN_MORE_URL =
'https://metamask.zendesk.com/hc/en-us/articles/360015489591-Basic-Safety-and-Security-Tips-for-MetaMask';
'https://support.metamask.io/privacy-and-security/basic-safety-and-security-tips-for-metamask/';
export const WHY_TRANSACTION_TAKE_TIME_URL =
'https://community.metamask.io/t/what-is-gas-why-do-transactions-take-so-long/3172';

export const TOKEN_APPROVAL_SPENDING_CAP = `https://support.metamask.io/hc/en-us/articles/6055177143579-How-to-customize-token-approvals-with-a-spending-cap`;
export const TOKEN_APPROVAL_SPENDING_CAP = `https://support.metamask.io/privacy-and-security/how-to-customize-token-approvals-with-a-spending-cap/`;
export const CONNECTING_TO_A_DECEPTIVE_SITE =
'https://support.metamask.io/hc/en-us/articles/4428045875483--Deceptive-site-ahead-when-trying-to-connect-to-a-site';
'https://support.metamask.io/troubleshooting/deceptive-site-ahead-when-trying-to-connect-to-a-site/';

export const CONNECTING_TO_DEPRECATED_NETWORK =
'https://support.metamask.io/hc/en-us/articles/360059213492-ETH-on-Sepolia-and-Goerli-networks-testnets';
'https://support.metamask.io/networks-and-sidechains/eth-on-testnets/';

export const HOWTO_MANAGE_METAMETRICS =
'https://support.metamask.io/privacy-and-security/how-to-manage-your-metametrics-settings/';
'https://support.metamask.io/privacy-and-security/how-to-manage-your-metametrics-settings';

// Policies
export const CONSENSYS_PRIVACY_POLICY = 'https://consensys.net/privacy-policy/';
Expand Down Expand Up @@ -76,7 +76,7 @@ export const LINEA_FAUCET = 'https://www.infura.io/faucet/linea';

// Add custom network
export const ADD_CUSTOM_NETWORK_ARTCILE =
'https://support.metamask.io/hc/en-us/articles/360057142392-Verifying-custom-network-information';
'https://support.metamask.io/networks-and-sidechains/managing-networks/verifying-custom-network-information/';

export const LEDGER_SUPPORT_LINK =
'https://support.ledger.com/hc/en-us/articles/360009576554-Ethereum-ETH-?docs=true';
Expand Down
18 changes: 9 additions & 9 deletions app/core/AppConstants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,18 @@ export default {
DATA_RETENTION_UPDATE:
'https://consensys.net/blog/news/consensys-data-retention-update/',
CONNECTIVITY_ISSUES:
'https://metamask.zendesk.com/hc/en-us/articles/360059386712',
NFT: 'https://metamask.zendesk.com/hc/en-us/articles/360058238591-NFT-tokens-in-MetaMask-wallet',
'https://support.metamask.io/troubleshooting/why-infura-cannot-serve-certain-areas/',
NFT: 'https://support.metamask.io/nfts/nft-tokens-in-your-metamask-wallet/',
SECURITY:
'https://metamask.zendesk.com/hc/en-us/articles/360015489591-Basic-Safety-and-Security-Tips-for-MetaMask',
'https://support.metamask.io/privacy-and-security/basic-safety-and-security-tips-for-metamask/',
TOKEN_BALANCE:
'https://metamask.zendesk.com/hc/en-us/articles/360028059272-What-to-do-when-your-balance-of-ETH-and-or-ERC20-tokens-is-incorrect-inaccurate',
'https://support.metamask.io/troubleshooting/what-to-do-when-your-balance-of-tokens-is-incorrect/',
WHY_TRANSACTION_TAKE_TIME:
'https://community.metamask.io/t/what-is-gas-why-do-transactions-take-so-long/3172',
WHAT_IS_ETH_SIGN_AND_WHY_IS_IT_A_RISK:
'https://support.metamask.io/hc/articles/14764161421467',
'https://support.metamask.io/privacy-and-security/what-is-eth_sign-and-why-is-it-a-risk/',
TESTNET_ETH_SCAMS:
'https://support.metamask.io/hc/en-us/articles/11836891903003-Testnet-ETH-scams',
'https://support.metamask.io/privacy-and-security/staying-safe-in-web3/testnet-eth-scams/',
WHAT_IS_SRP:
'https://community.metamask.io/t/what-is-a-secret-recovery-phrase-and-how-to-keep-your-crypto-wallet-secure/3440',
PRIVACY_POLICY_2024: 'https://consensys.io/privacy-policy',
Expand Down Expand Up @@ -149,11 +149,11 @@ export default {
},
REVIEW_PROMPT: {
HIGH_GAS_FEES:
'https://metamask.zendesk.com/hc/en-us/articles/360058751211-Why-my-gas-fees-are-so-high',
'https://support.metamask.io/transactions-and-gas/gas-fees/why-are-my-gas-fees-so-high/',
MISSING_TOKENS:
'https://metamask.zendesk.com/hc/en-us/articles/360015489031-How-to-add-unlisted-tokens-custom-tokens-in-MetaMask',
'https://support.metamask.io/managing-my-tokens/custom-tokens/how-to-display-tokens-in-metamask/',
SWAP_ISSUES:
'https://metamask.zendesk.com/hc/en-us/articles/360060329612-Error-fetching-quote',
'https://support.metamask.io/token-swaps/error-fetching-quote/',
SUPPORT: 'https://support.metamask.io',
},
BUNDLE_IDS: {
Expand Down
6 changes: 3 additions & 3 deletions locales/languages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1613,11 +1613,11 @@
"approve": "Genehmigen",
"edit_network_details": "Netzwerkdetails bearbeiten",
"malicious_network_warning": "Ein betrügerischer Netzwerkanbieter kann bezüglich des Status der Blockchain täuschen und Ihre Netzwerkaktivitäten aufzeichnen. Fügen Sie nur vertrauenswürdige benutzerdefinierte Netzwerke hinzu.",
"security_link": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"security_link": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"network_warning_title": "Netzwerkinformationen",
"network_warning_desc": "Diese Netzwerkverbindung ist von Dritten abhängig. Diese Verbindung kann unzuverlässig sein oder es Dritten ermöglichen, Aktivitäten zu verfolgen.",
"learn_more": "Mehr erfahren",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4417500466971",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/the-risks-of-connecting-to-an-unknown-network/",
"switch_network": "Zu Netzwerk wechseln",
"switch": "Wechseln",
"new_network": "Neues Netzwerk hinzugefügt",
Expand Down Expand Up @@ -2765,7 +2765,7 @@
"error_title": "Hoppla! Etwas ist schiefgelaufen.",
"error_message": "Beim Laden der Netzwerkinformationen ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.",
"private_network_third_description": "Bitte geben Sie einen Namen für dieses Netzwerk ein, damit es leicht identifiziert werden kann.",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"enable_token_detection": "Automatische Token-Erkennung einschalten",
"token_detection_mainnet_title": "Die Token-Erkennung ist aktiviert, sodass viele Tokens automatisch in Ihrer Wallet auftauchen werden.",
"token_detection_mainnet_link": "Sie können Tokens auch manuell hinzufügen.",
Expand Down
6 changes: 3 additions & 3 deletions locales/languages/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -1613,11 +1613,11 @@
"approve": "Έγκριση",
"edit_network_details": "Επεξεργασία λεπτομερειών δικτύου",
"malicious_network_warning": "Ένας κακόβουλος πάροχος δικτύου μπορεί να πει ψέματα για την κατάσταση του blockchain και να καταγράψει τη δραστηριότητα του δικτύου σας. Να προσθέτετε μόνο προσαρμοσμένα δίκτυα που εμπιστεύεστε.",
"security_link": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"security_link": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"network_warning_title": "Πληροφορίες Δικτύου",
"network_warning_desc": "Αυτή η σύνδεση δικτύου βασίζεται σε τρίτους. H σύνδεση ενδέχεται να είναι λιγότερο αξιόπιστη ή να επιτρέπει σε τρίτους να παρακολουθούν τη δραστηριότητα.",
"learn_more": "Μάθετε περισσότερα",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4417500466971",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/the-risks-of-connecting-to-an-unknown-network/",
"switch_network": "Εναλλαγή σε δίκτυο",
"switch": "Αλλαγή",
"new_network": "Προστέθηκε νέο δίκτυο",
Expand Down Expand Up @@ -2765,7 +2765,7 @@
"error_title": "Ωχ! Κάτι πήγε στραβά.",
"error_message": "Προέκυψε κάποιο σφάλμα κατά τη φόρτωση των πληροφοριών δικτύου. Προσπαθήστε ξανά αργότερα.",
"private_network_third_description": "Εισάγετε ένα όνομα για αυτό το δίκτυο, ώστε να είναι εύκολη η αναγνώρισή του.",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"enable_token_detection": "Ενεργοποίηση αυτόματου εντοπισμού token",
"token_detection_mainnet_title": "Ο εντοπισμός token είναι ενεργοποιημένος και πολλά tokens θα εμφανιστούν αυτόματα στο πορτοφόλι σας.",
"token_detection_mainnet_link": "Μπορείτε επίσης να προσθέσετε χειροκίνητα τα tokens.",
Expand Down
6 changes: 3 additions & 3 deletions locales/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1620,11 +1620,11 @@
"approve": "Approve",
"edit_network_details": "Edit network details",
"malicious_network_warning": "A malicious network provider can lie about the state of the blockchain and record your network activity. Only add custom networks you trust.",
"security_link": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"security_link": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"network_warning_title": "Network Information",
"network_warning_desc": "This network connection relies on third parties. This connection may be less reliable or enable third-parties to track activity.",
"learn_more": "Learn more",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4417500466971",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/the-risks-of-connecting-to-an-unknown-network/",
"switch_network": "Switch to network",
"switch": "Switch",
"new_network": "New network added",
Expand Down Expand Up @@ -2772,7 +2772,7 @@
"error_title": "Oops! Something went wrong.",
"error_message": "There was an error loading the network information. Please try again later.",
"private_network_third_description": "Please enter a name for this network to make it easy to identify.",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"enable_token_detection": "Enable auto token detection",
"token_detection_mainnet_title": "Token detection is enabled so tokens will automatically show up in your wallet.",
"token_detection_mainnet_link": "You can also add tokens manually.",
Expand Down
6 changes: 3 additions & 3 deletions locales/languages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1613,11 +1613,11 @@
"approve": "Aprobar",
"edit_network_details": "Editar detalles de la red",
"malicious_network_warning": "Un proveedor de red malintencionado puede mentir sobre el estado de la cadena de bloques y registrar su actividad de red. Agregue solo redes personalizadas de confianza.",
"security_link": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"security_link": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"network_warning_title": "Información de red",
"network_warning_desc": "Esta conexión de red depende de terceros. Esta conexión puede ser menos confiable o permite que terceros rastreen la actividad.",
"learn_more": "Más información",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4417500466971",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/the-risks-of-connecting-to-an-unknown-network/",
"switch_network": "Cambiar de red",
"switch": "Cambiar",
"new_network": "Nueva red agregada",
Expand Down Expand Up @@ -2765,7 +2765,7 @@
"error_title": "¡Uy! Algo salió mal.",
"error_message": "Hubo un error al cargar la información de la red. Inténtelo de nuevo más tarde.",
"private_network_third_description": "Ingrese un nombre para esta red para que sea fácil de identificar.",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"enable_token_detection": "Habilitar la detección automática de tokens",
"token_detection_mainnet_title": "La detección de tokens está habilitada, por lo que muchos aparecerán automáticamente en su monedero.",
"token_detection_mainnet_link": "También puede agregar los tokens manualmente.",
Expand Down
6 changes: 3 additions & 3 deletions locales/languages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1613,11 +1613,11 @@
"approve": "Approuver",
"edit_network_details": "Modifier les détails du réseau",
"malicious_network_warning": "Un fournisseur de réseau malveillant peut mentir quant à l’état de la blockchain et enregistrer votre activité sur le réseau. N’ajoutez que des réseaux personnalisés auxquels vous faites confiance.",
"security_link": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"security_link": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"network_warning_title": "Informations sur le réseau",
"network_warning_desc": "Cette connexion réseau est assurée par des tiers. Elle peut être moins fiable ou permettre à des tiers de suivre l’activité des utilisateurs.",
"learn_more": "En savoir plus",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4417500466971",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/the-risks-of-connecting-to-an-unknown-network/",
"switch_network": "Changer de réseau",
"switch": "Changer",
"new_network": "Nouveau réseau ajouté",
Expand Down Expand Up @@ -2765,7 +2765,7 @@
"error_title": "Oups ! Une erreur s’est produite.",
"error_message": "Une erreur de chargement des informations du réseau s’est produite. Veuillez réessayer plus tard.",
"private_network_third_description": "Veuillez saisir un nom pour ce réseau afin de faciliter son identification.",
"learn_more_url": "https://metamask.zendesk.com/hc/en-us/articles/4404424659995",
"learn_more_url": "https://support.metamask.io/networks-and-sidechains/managing-networks/user-guide-custom-networks-and-sidechains/",
"enable_token_detection": "Activer la détection automatique des jetons",
"token_detection_mainnet_title": "La détection des jetons est activée, ce qui signifie que les jetons apparaîtront automatiquement dans votre portefeuille.",
"token_detection_mainnet_link": "Vous pouvez également ajouter des jetons manuellement.",
Expand Down
Loading

0 comments on commit b1de3ab

Please sign in to comment.