diff --git a/app/LoadedApp/LoadedApp.tsx b/app/LoadedApp/LoadedApp.tsx index fc172bf32..97a8012ad 100644 --- a/app/LoadedApp/LoadedApp.tsx +++ b/app/LoadedApp/LoadedApp.tsx @@ -1649,8 +1649,8 @@ export class LoadedAppClass extends Component { setTimeout(() => { - reject(new Error('Promise changeserver Timeout 30 seconds')); - }, 30 * 1000); + reject(new Error('Promise changeserver Timeout 15 seconds')); + }, 15 * 1000); }); const resultStrServer: string = await Promise.race([resultStrServerPromise, timeoutServerPromise]); diff --git a/app/LoadingApp/LoadingApp.tsx b/app/LoadingApp/LoadingApp.tsx index 8c851d6bd..40d89268d 100644 --- a/app/LoadingApp/LoadingApp.tsx +++ b/app/LoadingApp/LoadingApp.tsx @@ -822,7 +822,7 @@ export class LoadingAppClass extends Component { const selectingServer = async (serverUris: ServerUrisType[]): Promise => { const servers: ServerUrisType[] = serverUris; - // 30 seconds max. - const timeoutPromise = new Promise(resolve => setTimeout(() => resolve(null), 30 * 1000)); + // 15 seconds max. + const timeoutPromise = new Promise(resolve => setTimeout(() => resolve(null), 15 * 1000)); const validServersPromises = servers.map( (server: ServerUrisType) => diff --git a/app/translations/en.json b/app/translations/en.json index 03c0d24cd..5ca348216 100644 --- a/app/translations/en.json +++ b/app/translations/en.json @@ -174,7 +174,7 @@ "zcash-url": "You already have an address in the send screen", "connection-error": "This option requires an internet connection to be executed.", "tryingnewserver": "Trying to connect to the new Server... Can take a few seconds.", - "tryingnewserver-error": "After 30 seconds the new server doesn't respond.", + "tryingnewserver-error": "After 15 seconds the new server doesn't respond.", "readingwallet": "Reading successfully the wallet with the server:", "restorewallet-title": "Advanced Option", "restorewallet-alert": "Confirm that you want to restore a new wallet using your seed phrase.", diff --git a/app/translations/es.json b/app/translations/es.json index e140ab79d..36df362f7 100644 --- a/app/translations/es.json +++ b/app/translations/es.json @@ -174,7 +174,7 @@ "zcash-url": "Ya tienes una dirección en la pantalla de envío", "connection-error": "Esta opción necesita conexión a internet para ser ejecutada.", "tryingnewserver": "Intentando conectar con el nuevo Servidor... Puede llevar varios segundos.", - "tryingnewserver-error": "Después de 30 segundos el nuevo Servidor no responde.", + "tryingnewserver-error": "Después de 15 segundos el nuevo Servidor no responde.", "readingwallet": "Leyendo satisfactoriamente el monedero activo usando el Servidor:", "restorewallet-title": "Opción Avanzada", "restorewallet-alert": "Confirmar que quiere restaurar un nuevo monedero usando su frase semilla.", diff --git a/app/translations/pt.json b/app/translations/pt.json index e9fa04ea9..e4713a176 100644 --- a/app/translations/pt.json +++ b/app/translations/pt.json @@ -174,7 +174,7 @@ "zcash-url": "Você já possui um endereço na tela de envio", "connection-error": "Esta opção requer uma conexão com a Internet para ser executada.", "tryingnewserver": "Tentando conectar-se ao novo servidor... Pode levar alguns segundos.", - "tryingnewserver-error": "Após 30 segundos o novo servidor não responde.", + "tryingnewserver-error": "Após 15 segundos o novo servidor não responde.", "readingwallet": "Lendo com sucesso a carteira atual com o servidor:", "restorewallet-title": "Opção Avançada", "restorewallet-alert": "Confirme que você deseja restaurar uma nova carteira usando as suas frases de recuperação.", diff --git a/app/translations/ru.json b/app/translations/ru.json index a90b17761..e2aeb4db2 100644 --- a/app/translations/ru.json +++ b/app/translations/ru.json @@ -174,7 +174,7 @@ "zcash-url": "У вас уже есть адрес на экране отправки", "connection-error": "Нет подключения к Интернету, Zingo не может работать надлежащим образом.", "tryingnewserver": "Попытка подключиться к новому серверу... Займёт несколько секунд.", - "tryingnewserver-error": "Новый сервер не ответил в течение 30 секунд.", + "tryingnewserver-error": "Новый сервер не ответил в течение 15 секунд.", "readingwallet": "Успешное соединение с этим сервером:", "restorewallet-title": "Расширенные настройки", "restorewallet-alert": "Подтвердите, что вы хотите восстановить новый кошелек с помощью вашей начальной фразы.", diff --git a/app/translations/tr.json b/app/translations/tr.json index 55716a9d4..24b19fef3 100644 --- a/app/translations/tr.json +++ b/app/translations/tr.json @@ -174,7 +174,7 @@ "zcash-url": "Gönderme ekranında zaten bir adresiniz var", "connection-error": "Bu seçenek yalnızca internet bağlantısı olduğunda çalıştırılabilir.", "tryingnewserver": "Yeni sunucuya bağlanılmaya çalışılıyor... Bu işlem birkaç saniye sürebilir.", - "tryingnewserver-error": "Yeni sunucu 30 saniye içinde yanıt vermedi.", + "tryingnewserver-error": "Yeni sunucu 15 saniye içinde yanıt vermedi.", "readingwallet": "Cüzdan sunucuyla başarıyla okundu:", "restorewallet-title": "Gelişmiş Seçenekler", "restorewallet-alert": "Yeni bir cüzdanı kurtarma ifadenizle geri yüklemek üzeresiniz. Devam etmek istiyor musunuz?", diff --git a/app/uris/checkServerURI.ts b/app/uris/checkServerURI.ts index b26bc6f6d..a672e177b 100644 --- a/app/uris/checkServerURI.ts +++ b/app/uris/checkServerURI.ts @@ -15,8 +15,8 @@ const checkServerURI = async (uri: string, oldUri: string): Promise { setTimeout(() => { - reject(new Error('Promise changeserver Timeout 30 seconds')); - }, 30 * 1000); + reject(new Error('Promise changeserver Timeout 15 seconds')); + }, 15 * 1000); }); const resultStrServer: string = await Promise.race([resultStrServerPromise, timeoutServerPromise]); @@ -35,8 +35,8 @@ const checkServerURI = async (uri: string, oldUri: string): Promise { setTimeout(() => { - reject(new Error('Promise info Timeout 30 seconds')); - }, 30 * 1000); + reject(new Error('Promise info Timeout 15 seconds')); + }, 15 * 1000); }); const infoStr: string = await Promise.race([infoStrPromise, timeoutInfoPromise]); @@ -65,8 +65,8 @@ const checkServerURI = async (uri: string, oldUri: string): Promise { setTimeout(() => { - reject(new Error('Promise info Timeout 30 seconds')); - }, 30 * 1000); + reject(new Error('Promise info Timeout 15 seconds')); + }, 15 * 1000); }); const balanceStr: string = await Promise.race([balanceStrPromise, timeoutInfoPromise]); diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx index dc05ad0de..4866c1e28 100644 --- a/components/Header/Header.tsx +++ b/components/Header/Header.tsx @@ -278,7 +278,7 @@ const Header: React.FunctionComponent = ({ }; const inter = setInterval(() => { showIt(); - }, 30 * 1000); + }, 29 * 1000); return () => clearInterval(inter); }, []); diff --git a/components/Messages/components/MessageList.tsx b/components/Messages/components/MessageList.tsx index ccbaea533..97c6d2b22 100644 --- a/components/Messages/components/MessageList.tsx +++ b/components/Messages/components/MessageList.tsx @@ -424,7 +424,7 @@ const MessageList: React.FunctionComponent = ({ fasterServer = server; // likely here there is a internet conection problem // all of the servers return an error because they are unreachable probably. - // the 30 seconds timout was fired. + // the 15 seconds timout was fired. } console.log(serverChecked); console.log(fasterServer); diff --git a/components/Send/Send.tsx b/components/Send/Send.tsx index fd794ddf9..6c6ae9b50 100644 --- a/components/Send/Send.tsx +++ b/components/Send/Send.tsx @@ -731,7 +731,7 @@ const Send: React.FunctionComponent = ({ fasterServer = server; // likely here there is a internet conection problem // all of the servers return an error because they are unreachable probably. - // the 30 seconds timout was fired. + // the 15 seconds timout was fired. } console.log(serverChecked); console.log(fasterServer); diff --git a/components/Settings/Settings.tsx b/components/Settings/Settings.tsx index d2fb2b347..20ef05826 100644 --- a/components/Settings/Settings.tsx +++ b/components/Settings/Settings.tsx @@ -473,7 +473,7 @@ const Settings: React.FunctionComponent = ({ } const { result, timeout, newChainName } = await checkServerURI(serverUriParsed, serverContext.uri); if (!result) { - // if the server checking takes more then 30 seconds. + // if the server checking takes more then 15 seconds. if (timeout === true) { addLastSnackbar({ message: translate('loadedapp.tryingnewserver-error') as string, screenName: [screenName] }); } else {