Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions app/LoadedApp/LoadedApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1649,8 +1649,8 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
const resultStrServerPromise = await RPCModule.changeServerProcess(this.state.newServer.uri);
const timeoutServerPromise = new Promise((_, reject) => {
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]);
Expand Down
2 changes: 1 addition & 1 deletion app/LoadingApp/LoadingApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
fasterServer = actualServer;
// likely here there is a internet/wifi 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.
someServerIsWorking = false;
}
//console.log(server);
Expand Down
4 changes: 2 additions & 2 deletions app/selectingServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const calculateLatency = async (server: ServerUrisType, _index: number) => {
const selectingServer = async (serverUris: ServerUrisType[]): Promise<ServerUrisType | null> => {
const servers: ServerUrisType[] = serverUris;

// 30 seconds max.
const timeoutPromise = new Promise<null>(resolve => setTimeout(() => resolve(null), 30 * 1000));
// 15 seconds max.
const timeoutPromise = new Promise<null>(resolve => setTimeout(() => resolve(null), 15 * 1000));

const validServersPromises = servers.map(
(server: ServerUrisType) =>
Expand Down
2 changes: 1 addition & 1 deletion app/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion app/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion app/translations/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion app/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"zcash-url": "У вас уже есть адрес на экране отправки",
"connection-error": "Нет подключения к Интернету, Zingo не может работать надлежащим образом.",
"tryingnewserver": "Попытка подключиться к новому серверу... Займёт несколько секунд.",
"tryingnewserver-error": "Новый сервер не ответил в течение 30 секунд.",
"tryingnewserver-error": "Новый сервер не ответил в течение 15 секунд.",
"readingwallet": "Успешное соединение с этим сервером:",
"restorewallet-title": "Расширенные настройки",
"restorewallet-alert": "Подтвердите, что вы хотите восстановить новый кошелек с помощью вашей начальной фразы.",
Expand Down
2 changes: 1 addition & 1 deletion app/translations/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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?",
Expand Down
12 changes: 6 additions & 6 deletions app/uris/checkServerURI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ const checkServerURI = async (uri: string, oldUri: string): Promise<checkServerU
const resultStrServerPromise = await RPCModule.changeServerProcess(uri);
const timeoutServerPromise = new Promise((_, reject) => {
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]);
Expand All @@ -35,8 +35,8 @@ const checkServerURI = async (uri: string, oldUri: string): Promise<checkServerU
const infoStrPromise = await RPCModule.infoServerInfo();
const timeoutInfoPromise = new Promise((resolve, reject) => {
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]);
Expand Down Expand Up @@ -65,8 +65,8 @@ const checkServerURI = async (uri: string, oldUri: string): Promise<checkServerU
const balanceStrPromise = await RPCModule.getBalanceInfo();
const timeoutInfoPromise = new Promise((resolve, reject) => {
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]);
Expand Down
2 changes: 1 addition & 1 deletion components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ const Header: React.FunctionComponent<HeaderProps> = ({
};
const inter = setInterval(() => {
showIt();
}, 30 * 1000);
}, 29 * 1000);

return () => clearInterval(inter);
}, []);
Expand Down
2 changes: 1 addition & 1 deletion components/Messages/components/MessageList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ const MessageList: React.FunctionComponent<MessageListProps> = ({
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);
Expand Down
2 changes: 1 addition & 1 deletion components/Send/Send.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ const Send: React.FunctionComponent<SendProps> = ({
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);
Expand Down
2 changes: 1 addition & 1 deletion components/Settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ const Settings: React.FunctionComponent<SettingsProps> = ({
}
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 {
Expand Down