#635 Fix two minor bugs (saleor#639)

- [x] (intermediate value)(intermediate value)(intermediate value) is
not iterable
- [x] Cannot destructure property 'errors' of 's' as it is null.

Fixes #635

Author: typeofweb

packages/checkout-storefront/src/lib/utils/url.ts

@@ -43,11 +43,13 @@ export const getRawQueryParams = () =>
 export const getQueryParams = (): QueryParams => {
   const params = getRawQueryParams();
 
-  if (typeof params.locale !== "string") {
+  const locale = params.locale || defaultParams.locale;
+
+  if (locale !== params.locale) {
     replaceUrl({ query: { locale: DEFAULT_LOCALE } });
   }
 
-  return Object.entries(params).reduce((result, entry) => {
+  return Object.entries({ ...params, locale }).reduce((result, entry) => {
     const [paramName, paramValue] = entry as [UnmappedQueryParam, ParamBasicValue];
     const mappedParamName = queryParamsMap[paramName];
     const mappedParamValue = paramValue || defaultParams[paramName];

packages/checkout-storefront/src/lib/utils/utils.ts

@@ -33,11 +33,11 @@ export const extractMutationErrors = <TData extends FormDataBase, TVars extends
   result: OperationResult<TData, TVars> | any // any to cover apollo client
   // mutations, to be removed once we remove apollo client from sdk
 ): [boolean, ApiErrors<TData>] => {
-  const urqlErrors = result.error ? [result.error] : [];
+  const urqlErrors = result?.error ? [result.error] : [];
 
   const graphqlErrors = reduce(
-    result.data as object,
-    (result, { errors }) => {
+    (result?.data || {}) as object,
+    (result, { errors = [] }) => {
       return [...result, ...errors];
     },
     []