Skip to content
Open
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
2 changes: 1 addition & 1 deletion lib/Onyx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ function merge<TKey extends OnyxKey>(key: TKey, changes: OnyxMergeInput<TKey>):
OnyxUtils.sendActionToDevTools(OnyxUtils.METHOD.MERGE, key, changes, mergedValue);
});
} catch (error) {
Logger.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error}`);
Logger.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error instanceof Error ? error.toString() : String(error)}`);
return Promise.resolve();
}
});
Expand Down
2 changes: 1 addition & 1 deletion lib/OnyxConnectionManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class OnyxConnectionManager {
(callback as DefaultConnectCallback<OnyxKey>)(connection.cachedCallbackValue, connection.cachedCallbackKey as OnyxKey);
}
} catch (error) {
Logger.logAlert(`[ConnectionManager] Subscriber callback threw an error for key '${connection.onyxKey}': ${error}`);
Logger.logAlert(`[ConnectionManager] Subscriber callback threw an error for key '${connection.onyxKey}': ${String(error)}`);
}
}
}
Expand Down
10 changes: 7 additions & 3 deletions lib/OnyxUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ function resetDiskPressureLogThrottle(): void {
lastDiskPressureLogTime = 0;
}

function formatCaughtError(error: unknown): string {
return error instanceof Error ? error.toString() : String(error);
}

type OnyxMethod = ValueOf<typeof METHOD>;

/** Result of `prepareKeyValuePairsForStorage`: pairs to write and keys whose `null` value marks them for removal. */
Expand Down Expand Up @@ -598,7 +602,7 @@ function keysChanged<TKey extends CollectionKeyBase>(
lastConnectionCallbackData.set(subscriber.subscriptionID, {value: cachedCollection, matchedKey: subscriber.key});
subscriber.callback(cachedCollection, subscriber.key);
} catch (error) {
Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${error}`);
Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${formatCaughtError(error)}`);
}
}

Expand All @@ -621,7 +625,7 @@ function keysChanged<TKey extends CollectionKeyBase>(
matchedKey: subscriber.key,
});
} catch (error) {
Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${error}`);
Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${formatCaughtError(error)}`);
}
}
}
Expand Down Expand Up @@ -694,7 +698,7 @@ function keyChanged<TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>, can
});
continue;
} catch (error) {
Logger.logAlert(`[OnyxUtils.keyChanged] Subscriber callback threw an error for key '${key}': ${error}`);
Logger.logAlert(`[OnyxUtils.keyChanged] Subscriber callback threw an error for key '${key}': ${formatCaughtError(error)}`);
}

continue;
Expand Down
Loading