mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-26 20:39:08 +01:00
4fa4930c8a
* When background port closes, UI should display a user friendly error. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove console.log Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> A couple of fixes 1. Use timeout in metaRPCClientFactory to check if UI can't communicate with bg 2. Refactor locale setup 3. Fixed wording/capitalization 4. Fix locales usage so that linting works 5. Refactor CSS Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> do not simulate errorwq Refactor loading css Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Remove the onDisconnect event handler in ui as this is handled in metarpcclientfactory Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Do not throw in bg Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Fix PR comments Remove unused message 'failedToLoadMessage' Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Move usage of locales to shared/** so that linter can see it. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Do not simulate error. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> metarpc can handle multiple requests, responseHandled should be a map. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> reload metamask button on critical error Use metamask state (if available) to the locale, else read locale files manually. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> use constant and numeric separator Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> refactor error utils remove error simulation Memoize setupLocale function Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> test cases Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Do not simulate error Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> 1. store should be metamask state 2. code refactorings. Tests: mock setupLocale Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Mock fetchLocale instead Test setup locale Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> UI/CSS changes. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> Do not simulate failure Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * spell MetaMask correctly Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Rename state to mockStore Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * we should clean up this.responseHandled[id] in the error case. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * Fixed PR comments. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com> * clean up response handled. Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>
56 lines
1.7 KiB
JavaScript
56 lines
1.7 KiB
JavaScript
import getFirstPreferredLangCode from '../../../app/scripts/lib/get-first-preferred-lang-code';
|
|
import { setupLocale } from '../..';
|
|
import switchDirection from './switch-direction';
|
|
|
|
const getLocaleContext = (currentLocaleMessages, enLocaleMessages) => {
|
|
return (key) => {
|
|
let message = currentLocaleMessages[key]?.message;
|
|
if (!message && enLocaleMessages[key]) {
|
|
message = enLocaleMessages[key].message;
|
|
}
|
|
return message;
|
|
};
|
|
};
|
|
|
|
export async function getErrorHtml(supportLink, metamaskState) {
|
|
let response, preferredLocale;
|
|
if (metamaskState?.currentLocale) {
|
|
preferredLocale = metamaskState.currentLocale;
|
|
response = await setupLocale(metamaskState.currentLocale);
|
|
} else {
|
|
preferredLocale = await getFirstPreferredLangCode();
|
|
response = await setupLocale(preferredLocale);
|
|
}
|
|
|
|
const textDirection = ['ar', 'dv', 'fa', 'he', 'ku'].includes(preferredLocale)
|
|
? 'rtl'
|
|
: 'auto';
|
|
|
|
switchDirection(textDirection);
|
|
const { currentLocaleMessages, enLocaleMessages } = response;
|
|
const t = getLocaleContext(currentLocaleMessages, enLocaleMessages);
|
|
|
|
return `
|
|
<div class="critical-error">
|
|
<div class="critical-error__alert">
|
|
<p class="critical-error__alert__message">
|
|
${t('troubleStarting')}
|
|
</p>
|
|
<button id='critical-error-button' class="critical-error__alert__button">
|
|
${t('restartMetamask')}
|
|
</button>
|
|
</div>
|
|
<p class="critical-error__paragraph">
|
|
${t('stillGettingMessage')}
|
|
<a
|
|
href=${supportLink}
|
|
class="critical-error__paragraph__link"
|
|
target="_blank"
|
|
rel="noopener noreferrer">
|
|
${t('sendBugReport')}
|
|
</a>
|
|
</p>
|
|
</div>
|
|
`;
|
|
}
|