Skip to content

Commit

Permalink
Merge pull request #64 from Ilya-dobri/main
Browse files Browse the repository at this point in the history
Removed sequence number loading warning, changed data in assets and changed logic for TransactionSequenceNumber appearance
  • Loading branch information
grandmotivator authored Nov 23, 2024
2 parents bd6298f + 66a2cd0 commit 0e5d92a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
20 changes: 10 additions & 10 deletions src/entities/AccountInfo/TransactionIcon/ui/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const TransactionIcon: FC<Props> = ({
baseFee,
lowerTime,
upperTime,
TransactionSequenceNumber,
// TransactionSequenceNumber,
typeOp,
style,
processedKey,
Expand Down Expand Up @@ -99,18 +99,18 @@ const TransactionIcon: FC<Props> = ({
}


if (lowerTime !== undefined && lowerTime !== previousLowerTime.current) {
params.lowerTime = lowerTime.toString();
}
// if (lowerTime !== undefined && lowerTime !== previousLowerTime.current) {
// params.lowerTime = lowerTime.toString();
// }

if (upperTime !== undefined && upperTime !== previousUpperTime.current) {
params.upperTime = upperTime.toString();
}
// if (upperTime !== undefined && upperTime !== previousUpperTime.current) {
// params.upperTime = upperTime.toString();
// }


if (TransactionSequenceNumber != null) {
params.TransactionSequenceNumber = TransactionSequenceNumber.toString();
}
// if (TransactionSequenceNumber !== null && TransactionSequenceNumber !== undefined && TransactionSequenceNumber !== 0) {
// params.TransactionSequenceNumber = TransactionSequenceNumber.toString();
// }

return `/${net}/build-transaction?${new URLSearchParams(params).toString()}`;
};
Expand Down
2 changes: 1 addition & 1 deletion src/views/BuildTransaction/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ const BuildTransaction: FC = () => {
return (
<MainLayout>
{isLoadingSequence ? (
<div>Loading sequence number...</div>
<div></div>
) : (
<div className="container">
<div
Expand Down
3 changes: 2 additions & 1 deletion src/views/Layout/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,14 @@ const PageLayout: FC<Props> = ({ children }) => {
console.warn("Unauthorized domain. Skipping commit hash fetch.");
return;
}


if (!process.env.NEXT_PUBLIC_GITHUB_TOKEN) {
console.warn(
"You have not set the NEXT_PUBLIC_GITHUB_TOKEN environment variable. Skipping commit hash fetch."
);
return;
}
}

try {
const response = await axios.get(
Expand Down
4 changes: 2 additions & 2 deletions src/views/assets/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React, { useState, useEffect, useRef, FC, FormEvent } from "react";
import { useSearchParams } from "next/navigation";
import { MainLayout } from "@/widgets";
import AssetsListItem, { AssetsItem } from "./AssetsListItem";
import assets from "@/shared/configs/assets.json";
import assets from "@/shared/configs/trusted-mtl-assets.json";
import Link from "next/link";

const ITEMS_PER_PAGE = 20;
Expand Down Expand Up @@ -79,7 +79,7 @@ const Assets: FC = () => {
<h2>Trusted MTL Assets</h2>
<div className="text-right mobile-left" style={{ marginTop: "-2.2em" }}>
<a
href="https://github.com/montelibero-org/stellar-multisig/blob/main/src/shared/configs/assets.json"
href="https://github.com/montelibero-org/stellar-multisig/blob/main/src/shared/configs/trusted-mtl-assets.json"
className="icon icon-github"
title="Log in with Github"
style={{ fontSize: "1.4em" }}
Expand Down

0 comments on commit 0e5d92a

Please sign in to comment.