Fix condition to check pending plugin (#16)

* Fix condition to check pending plugin

* Adjusted width of svg

* PRESS4-90 Send country only if state is skipped

Co-authored-by: Ashritha <[email protected]>

src/components/GeneralSettings.js

@@ -84,9 +84,9 @@ function useOnBoardingStatus() {
 function isSelectedThirdPartyPending(key, plugins) {
   switch (key) {
     case YithOptions.paypal:
-      return plugins?.status?.yith_paypal_payments === "Active";
+      return plugins?.status?.yith_paypal_payments !== "Active";
     case YithOptions.shippo:
-      return plugins?.status?.yith_shippo_shipping_for_woocommerce === "Active";
+      return plugins?.status?.yith_shippo_shipping_for_woocommerce !== "Active";
     default:
       return false;
   }

src/components/StoreAddress.js

@@ -38,11 +38,17 @@ export function StoreAddress({ onComplete, isMandatory = false }) {
       onSubmit={async (event) => {
         event.preventDefault();
         event.stopPropagation();
-        let { country, state = defaultContact.state, ...wcAddress } = address;
+        let { country, state, ...wcAddress } = address;
+        let selectedState;
+        if (selectedCountry === defaultContact.country && state === undefined) {
+          selectedState = defaultContact.state;
+        }
         await updateWPSettings({
           ...defaultContact,
           ...wcAddress,
-          woocommerce_default_country: `${selectedCountry}:${state}`,
+          woocommerce_default_country: selectedState
+            ? `${selectedCountry}:${selectedState}`
+            : selectedCountry,
         });
         await updateWCOnboarding({ completed: true });
         await onComplete();