- add error event

- show error modal when back-end swap fails - remove px value
GoodDollar · Nov 8, 2023 · cfb84f0 · cfb84f0
1 parent 462d1c8
commit cfb84f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/packages/good-design/package.json b/packages/good-design/package.json
@@ -56,7 +56,6 @@
     "cpx": "^1.5.0",
     "css-loader": "^6.7.1",
     "ctix": "^1.4.0",
-    "ethers": "5.7.2",
     "lodash": "^4.17.21",
     "raw-loader": "^4.0.2",
     "react-device-detect": "^2.2.3",

diff --git a/packages/good-design/src/apps/onramp/GdOnramperWidget.tsx b/packages/good-design/src/apps/onramp/GdOnramperWidget.tsx
@@ -12,13 +12,13 @@ import { useSignWalletModal } from "../../hooks/useSignWalletModal";
 
 const ErrorModal = () => (
   <View>
-    <Text>Error</Text>
+    <Text>Something went wrong.</Text>
   </View>
 );
 
 interface IGdOnramperProps {
   isTesting?: boolean;
-  onEvents: (action: string) => void;
+  onEvents: (action: string, error?: string) => void;
 }
 
 export const GdOnramperWidget = ({ isTesting = false, onEvents = noop }: IGdOnramperProps) => {
@@ -47,7 +47,6 @@ export const GdOnramperWidget = ({ isTesting = false, onEvents = noop }: IGdOnra
    */
   const callback = useCallback((event: WebViewMessageEvent) => {
     if ((event.nativeEvent.data as any).title === "success") {
-      console.log("User succesfully bought CELO/CUSD -- awaiting arrival in sc wallet...");
       //start the stepper
       setStep(1);
     }
@@ -90,6 +89,7 @@ export const GdOnramperWidget = ({ isTesting = false, onEvents = noop }: IGdOnra
     } catch (e: any) {
       console.log("swap error:", e.message, e);
       showModal();
+      onEvents("buygd_swap_failed", e.message);
       setStep(-1);
     }
   };
@@ -99,7 +99,8 @@ export const GdOnramperWidget = ({ isTesting = false, onEvents = noop }: IGdOnra
     if (cusdBalance?.gt(0) || celoBalance?.gt(0)) {
       console.log("starting swap:", cusdBalance?.toString(), celoBalance?.toString());
       triggerSwap().catch(e => {
-        console.log(e);
+        showModal();
+        onEvents("buygd_swap_failed", e.message);
       });
     }
   }, [celoBalance, cusdBalance]);

diff --git a/packages/good-design/src/apps/onramp/Onramper.tsx b/packages/good-design/src/apps/onramp/Onramper.tsx
@@ -95,7 +95,6 @@ export const Onramper = ({
   // SO fiddle: http://jsfiddle.net/wk1yv6q3/
   useEffect(() => {
     const checkFocus = (e: any) => {
-      console.log("checkFocus", { e, step });
       if (document.activeElement === document.querySelector("iframe") && step === -1) {
         onGdEvent("buy_start");
         setStep(0);
@@ -112,7 +111,6 @@ export const Onramper = ({
   }, [step]);
 
   const devNextStep = useCallback(() => {
-    console.log("devNextStep", { step });
     setStep(step + 1);
   }, [step]);
 

diff --git a/packages/good-design/src/core/animated/AnimatedProgress.tsx b/packages/good-design/src/core/animated/AnimatedProgress.tsx
@@ -23,7 +23,7 @@ export const theme = {
     },
     progressStyles: {
       width: "80%",
-      height: "4px",
+      height: 1,
       backgroundColor: "goodGrey.300",
       borderRadius: 5,
       overflow: "hidden"