diff --git a/apps/pay/app/globals.css b/apps/pay/app/globals.css index 757eb76be7..dc5a7f7f81 100644 --- a/apps/pay/app/globals.css +++ b/apps/pay/app/globals.css @@ -168,13 +168,12 @@ body { .print-paycode-button { padding: 9px 32px; border-radius: 10em; - background: var(--primary); + background: var(--primaryColor); border: none; color: #fff; font-weight: 600; } - :root { --transparent: rgba(0, 0, 0, 0); --white: #ffffff; @@ -186,7 +185,7 @@ body { --blue: #3050c4; --orange: #ff7e1c; --sky: #c3ccff; - --primary: #fc5805; + --primaryColor: #fc5805; --primaryColorDisabled: #c54404; --primary3: #010101; --primary4: #fe990d; @@ -205,4 +204,4 @@ body { --error: #dc2626; --error9: #fee2e2; --warning: #f59e0b; -} \ No newline at end of file +} diff --git a/apps/pay/app/layout.tsx b/apps/pay/app/layout.tsx index 49d8293ac7..4c8cf83a53 100644 --- a/apps/pay/app/layout.tsx +++ b/apps/pay/app/layout.tsx @@ -2,10 +2,10 @@ import type { Metadata } from "next" import { Inter_Tight } from "next/font/google" // eslint-disable-next-line import/no-unassigned-import -import "bootstrap/dist/css/bootstrap.css" +import "./globals.css" // eslint-disable-next-line import/no-unassigned-import -import "./globals.css" +import "bootstrap/dist/css/bootstrap.css" import Head from "next/head" import Script from "next/script" diff --git a/apps/pay/app/ssr-client.ts b/apps/pay/app/ssr-client.ts index 7ff1a97a61..9f83fbcd93 100644 --- a/apps/pay/app/ssr-client.ts +++ b/apps/pay/app/ssr-client.ts @@ -14,6 +14,7 @@ export const { getClient } = registerApolloClient(() => { uri: getClientSideGqlConfig().coreGqlUrl, fetchOptions: { cache: "no-store" }, + // TODO uncomment this we start using otel // fetch: (uri, options) => { // const headersWithTrace = options?.headers || {} // propagation.inject(context.active(), headersWithTrace) diff --git a/apps/pay/components/input/index.tsx b/apps/pay/components/input/index.tsx deleted file mode 100644 index 165b65b67f..0000000000 --- a/apps/pay/components/input/index.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import React, { InputHTMLAttributes } from "react" - -interface InputProps extends InputHTMLAttributes { - label?: string - id: string -} - -const InputComponent: React.FC = ({ label, id, ...inputProps }) => { - return ( -
- {label ? ( - - ) : null} - -
- ) -} - -export default InputComponent diff --git a/apps/pay/components/layouts/app-layout.module.css b/apps/pay/components/layouts/app-layout.module.css index 031dce0484..f3cc685341 100644 --- a/apps/pay/components/layouts/app-layout.module.css +++ b/apps/pay/components/layouts/app-layout.module.css @@ -12,11 +12,11 @@ top: 0; left: 0; width: 100%; - border-bottom: 1.5px solid var(--primary); + border-bottom: 1.5px solid var(--lightGrey); display: flex; justify-content: space-between; align-items: center; - z-index: 1; + z-index: 1; } .nav_home_content { @@ -41,7 +41,7 @@ box-sizing: border-box; } -@media (max-width: 768px) { +@media (max-width: 768px), (max-height: 720px) { .nav_bar { border-bottom: none; } diff --git a/apps/pay/components/memo/index.tsx b/apps/pay/components/memo/index.tsx index bc6bfdd14d..b43ec40a81 100644 --- a/apps/pay/components/memo/index.tsx +++ b/apps/pay/components/memo/index.tsx @@ -3,6 +3,8 @@ import { Modal } from "react-bootstrap" import { useSearchParams } from "next/navigation" +import Image from "next/image" + import { ACTIONS, ACTION_TYPE } from "../../app/reducer" import styles from "./memo.module.css" @@ -53,42 +55,7 @@ const Memo = ({ state, dispatch }: Props) => { disabled={state.createdInvoice} > {!state.createdInvoice && !state.memo ? "Add note" : null} - - - - - - - - - - - - + Add note {openModal && ( diff --git a/apps/pay/components/memo/memo.module.css b/apps/pay/components/memo/memo.module.css index cdb9025e95..905b2bf086 100644 --- a/apps/pay/components/memo/memo.module.css +++ b/apps/pay/components/memo/memo.module.css @@ -76,7 +76,7 @@ width: 100%; padding: 0.5rem 1.5rem; font-weight: 500; - background: var(--primary); + background: var(--primaryColor); color: #fff; } diff --git a/apps/pay/components/parse-pos-payment/index.tsx b/apps/pay/components/parse-pos-payment/index.tsx index 435ac895dc..06c7ee9820 100644 --- a/apps/pay/components/parse-pos-payment/index.tsx +++ b/apps/pay/components/parse-pos-payment/index.tsx @@ -75,14 +75,7 @@ function ParsePayment({ // Update Params From Current Amount const handleAmountChange = (skipRouterPush?: boolean) => { - let amount = state.currentAmount - if (currencyMetadata.fractionDigits === 0) { - const safeAmt = safeAmount(amount) - amount = - currencyMetadata.fractionDigits === 0 - ? safeAmt.toFixed() - : safeAmt.toFixed(currencyMetadata.fractionDigits) - } + const amount = state.currentAmount if (isNaN(Number(amount))) return const formattedValue = formatValue({ diff --git a/apps/pay/components/parse-pos-payment/parse-payment.module.css b/apps/pay/components/parse-pos-payment/parse-payment.module.css index 42fd9a93f5..86eb03accb 100644 --- a/apps/pay/components/parse-pos-payment/parse-payment.module.css +++ b/apps/pay/components/parse-pos-payment/parse-payment.module.css @@ -103,7 +103,7 @@ .pay_btn, .pay_new_btn { - background: var(--primary); + background: var(--primaryColor); color: #fff; font-weight: 600; width: 220px; diff --git a/apps/pay/components/payment-outcome/payment-outcome.module.css b/apps/pay/components/payment-outcome/payment-outcome.module.css index fffd3582f5..39a650f40d 100644 --- a/apps/pay/components/payment-outcome/payment-outcome.module.css +++ b/apps/pay/components/payment-outcome/payment-outcome.module.css @@ -32,7 +32,7 @@ display: flex; justify-content: center; align-items: center; - background: var(--primary); + background: var(--primaryColor); border-radius: 10em; border: none; outline: none; diff --git a/apps/pay/components/share/share-pop-up.tsx b/apps/pay/components/share/share-pop-up.tsx index 5449cb205c..37a5254ece 100644 --- a/apps/pay/components/share/share-pop-up.tsx +++ b/apps/pay/components/share/share-pop-up.tsx @@ -1,5 +1,6 @@ import copy from "copy-to-clipboard" import React, { type FC, useState } from "react" +import Image from "next/image" import styles from "./share.module.css" @@ -88,22 +89,7 @@ const SharePopup: FC = ({ ) : (
diff --git a/apps/pay/components/sidebar/index.tsx b/apps/pay/components/sidebar/index.tsx index 35478e3031..50ca7570e3 100644 --- a/apps/pay/components/sidebar/index.tsx +++ b/apps/pay/components/sidebar/index.tsx @@ -162,7 +162,7 @@ export function SideBar({ username }: { username: string }) {