fix

package.json

@@ -56,7 +56,7 @@
     "@rabby-wallet/eth-watch-keyring": "1.0.0",
     "@rabby-wallet/gnosis-sdk": "1.3.6",
     "@rabby-wallet/page-provider": "0.3.5",
-    "@rabby-wallet/rabby-api": "0.7.14-beta.2",
+    "@rabby-wallet/rabby-api": "0.7.15-beta-0",
     "@rabby-wallet/rabby-security-engine": "1.1.20",
     "@rabby-wallet/rabby-swap": "0.0.36",
     "@rabby-wallet/widgets": "1.0.9",

src/ui/views/Dashboard/components/Settings/index.tsx

@@ -222,6 +222,7 @@ const ResetAccountModal = ({
 
   const handleCancel = () => {
     setIsVisible(false);
+    setClearNonce(false);
     setTimeout(() => {
       onCancel();
     }, 500);

src/ui/views/RabbyPoints/index.tsx

@@ -49,6 +49,7 @@ const Wrapper = styled.div`
       position: sticky;
       top: -16px;
       background: var(--r-neutral-bg1, #fff);
+      z-index: 10;
     }
     .ant-tabs-tab + .ant-tabs-tab {
       margin: 0;
@@ -228,7 +229,7 @@ const RabbyPoints = () => {
     [wallet.openapi, account?.address, signature]
   );
 
-  const ended = campaignIsEnded ?? true;
+  const ended = useMemo(() => !!campaignIsEnded, [campaignIsEnded]);
 
   useEffect(() => {
     if (
@@ -289,7 +290,7 @@ const RabbyPoints = () => {
             className={clsx(
               ' relative transition-opacity',
               ended && !snapshot?.claimed
-                ? 'text-20 font-black mt-20 mb-[25px] inline-block'
+                ? 'text-20 font-bold mt-20 mb-[25px] inline-block'
                 : 'text-[40px] font-extrabold mt-[8px] mb-[12px]',
               userLoading && 'opacity-80'
             )}
@@ -361,9 +362,11 @@ const RabbyPoints = () => {
             }
             key={'1'}
           >
-            <div className="mx-20 mt-20 mb-4 flex justify-center rounded-[6px] bg-r-neutral-card-2 py-12 text-13 text-r-neutral-title-1 font-medium">
-              {t('page.rabbyPoints.firstRoundEnded')}
-            </div>
+            {ended && (
+              <div className="mx-20 mt-20 mb-4 flex justify-center rounded-[6px] bg-r-neutral-card-2 py-12 text-13 text-r-neutral-title-1 font-medium">
+                {t('page.rabbyPoints.firstRoundEnded')}
+              </div>
+            )}
             <div className="flex flex-col gap-[12px] py-[16px] px-[20px] ">
               {activitiesLoading ? (
                 <ClaimLoading />

yarn.lock

@@ -4627,10 +4627,10 @@
     sinon-chrome "^3.0.1"
     webextension-polyfill "0.7.0"
 
-"@rabby-wallet/[email protected].14-beta.2":
-  version "0.7.14-beta.2"
-  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-api/-/rabby-api-0.7.14-beta.2.tgz#e0e02f36ca7ce96d301f1bebfa99753ed8c7abd4"
-  integrity sha512-qSdc61Ll4PIi0ALUsQzbpMkp9TRcA0qz8mwtuGDnhtBdmTCnKmvM3Qoms0fpKR4UY7jL9LgBsrwcBgZRHjJwzA==
+"@rabby-wallet/[email protected].15-beta-0":
+  version "0.7.15-beta-0"
+  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-api/-/rabby-api-0.7.15-beta-0.tgz#ee91b591410a8b0bcb42d26bb548324f72c74eec"
+  integrity sha512-vQ0Bn2frLnnMYllMwwoT8RsRLmGbqJWxbtI0WlmCCk9IjVxqwBcpvz7+azqk+r92YMkLpE5hvIrmuCjGZoyX2g==
   dependencies:
     "@rabby-wallet/rabby-sign" "^0.3.3"
     axios "^0.27.2"